4 files changed, 24 insertions, 24 deletions
diff --git a/src/GF/Speech/PrGSL.hs b/src/GF/Speech/PrGSL.hs
index ce55960ee..f69bd0956 100644
--- a/src/GF/Speech/PrGSL.hs
+++ b/src/GF/Speech/PrGSL.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/03/18 10:17:10 $ 
+-- > CVS $Date: 2005/03/21 13:54:44 $ 
 -- > CVS $Author: peb $
--- > CVS $Revision: 1.11 $
+-- > CVS $Revision: 1.12 $
 --
 -- This module prints a CFG as a Nuance GSL 2.0 grammar.
 --
@@ -19,10 +19,10 @@ module PrGSL (gslPrinter) where
 
 import SRG
 import Ident
-import CFGrammar
-import Parser (Symbol(..))
-import GrammarTypes
-import PrintParser
+import GF.Conversion.CFGrammar
+import GF.Parsing.Parser (Symbol(..))
+import GF.Conversion.GrammarTypes
+import GF.Parsing.PrintParser
 import Option
 
 import Data.Char (toUpper,toLower)
diff --git a/src/GF/Speech/PrJSGF.hs b/src/GF/Speech/PrJSGF.hs
index a5b81cfea..b8f36fed1 100644
--- a/src/GF/Speech/PrJSGF.hs
+++ b/src/GF/Speech/PrJSGF.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/03/18 10:17:11 $ 
+-- > CVS $Date: 2005/03/21 13:54:44 $ 
 -- > CVS $Author: peb $
--- > CVS $Revision: 1.5 $
+-- > CVS $Revision: 1.6 $
 --
 -- This module prints a CFG as a JSGF grammar.
 --
@@ -21,10 +21,10 @@ module PrJSGF (jsgfPrinter) where
 
 import SRG
 import Ident
-import CFGrammar
-import Parser (Symbol(..))
-import GrammarTypes
-import PrintParser
+import GF.Conversion.CFGrammar
+import GF.Parsing.Parser (Symbol(..))
+import GF.Conversion.GrammarTypes
+import GF.Parsing.PrintParser
 import Option
 
 jsgfPrinter :: Ident -- ^ Grammar name
diff --git a/src/GF/Speech/SRG.hs b/src/GF/Speech/SRG.hs
index cf474f6a1..ad2239202 100644
--- a/src/GF/Speech/SRG.hs
+++ b/src/GF/Speech/SRG.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/03/18 10:17:11 $ 
+-- > CVS $Date: 2005/03/21 13:54:44 $ 
 -- > CVS $Author: peb $
--- > CVS $Revision: 1.7 $
+-- > CVS $Revision: 1.8 $
 --
 -- Representation of, conversion to, and utilities for 
 -- printing of a general Speech Recognition Grammar. 
@@ -21,10 +21,10 @@
 module SRG where
 
 import Ident
-import CFGrammar
-import Parser (Symbol(..))
-import GrammarTypes
-import PrintParser
+import GF.Conversion.CFGrammar
+import GF.Parsing.Parser (Symbol(..))
+import GF.Conversion.GrammarTypes
+import GF.Parsing.PrintParser
 import TransformCFG
 import Option
 
diff --git a/src/GF/Speech/TransformCFG.hs b/src/GF/Speech/TransformCFG.hs
index 560687faf..ff804da11 100644
--- a/src/GF/Speech/TransformCFG.hs
+++ b/src/GF/Speech/TransformCFG.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/03/18 10:17:11 $ 
+-- > CVS $Date: 2005/03/21 13:54:44 $ 
 -- > CVS $Author: peb $
--- > CVS $Revision: 1.5 $
+-- > CVS $Revision: 1.6 $
 --
 --  This module does some useful transformations on CFGs.
 --
@@ -17,10 +17,10 @@
 module TransformCFG (makeNice, CFRule_) where
 
 import Ident
-import CFGrammar
-import Parser (Symbol(..))
-import GrammarTypes
-import PrintParser
+import GF.Conversion.CFGrammar
+import GF.Parsing.Parser (Symbol(..))
+import GF.Conversion.GrammarTypes
+import GF.Parsing.PrintParser
 
 import Data.FiniteMap
 import Data.List