4 files changed, 20 insertions, 20 deletions
diff --git a/src/GF/Speech/PrGSL.hs b/src/GF/Speech/PrGSL.hs
index 024fc9f31..537bce960 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/21 14:17:44 $ 
+-- > CVS $Date: 2005/03/21 22:40:04 $ 
 -- > CVS $Author: peb $
--- > CVS $Revision: 1.13 $
+-- > CVS $Revision: 1.14 $
 --
 -- This module prints a CFG as a Nuance GSL 2.0 grammar.
 --
@@ -19,9 +19,9 @@ module PrGSL (gslPrinter) where
 
 import SRG
 import Ident
-import GF.Conversion.CFGrammar
-import GF.Parsing.Parser (Symbol(..))
-import GF.Conversion.GrammarTypes
+import GF.Parsing.CFGrammar
+import GF.Parsing.Utilities (Symbol(..))
+import GF.Parsing.GrammarTypes
 import GF.Printing.PrintParser
 import Option
 
diff --git a/src/GF/Speech/PrJSGF.hs b/src/GF/Speech/PrJSGF.hs
index ade23da91..f6dd7d0c3 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/21 14:17:44 $ 
+-- > CVS $Date: 2005/03/21 22:40:05 $ 
 -- > CVS $Author: peb $
--- > CVS $Revision: 1.7 $
+-- > CVS $Revision: 1.8 $
 --
 -- This module prints a CFG as a JSGF grammar.
 --
@@ -21,9 +21,9 @@ module PrJSGF (jsgfPrinter) where
 
 import SRG
 import Ident
-import GF.Conversion.CFGrammar
-import GF.Parsing.Parser (Symbol(..))
-import GF.Conversion.GrammarTypes
+import GF.Parsing.CFGrammar
+import GF.Parsing.Utilities (Symbol(..))
+import GF.Parsing.GrammarTypes
 import GF.Printing.PrintParser
 import Option
 
diff --git a/src/GF/Speech/SRG.hs b/src/GF/Speech/SRG.hs
index c2f8fc33c..1e71d983a 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/21 14:17:44 $ 
+-- > CVS $Date: 2005/03/21 22:40:06 $ 
 -- > CVS $Author: peb $
--- > CVS $Revision: 1.9 $
+-- > CVS $Revision: 1.10 $
 --
 -- Representation of, conversion to, and utilities for 
 -- printing of a general Speech Recognition Grammar. 
@@ -21,9 +21,9 @@
 module SRG where
 
 import Ident
-import GF.Conversion.CFGrammar
-import GF.Parsing.Parser (Symbol(..))
-import GF.Conversion.GrammarTypes
+import GF.Parsing.CFGrammar
+import GF.Parsing.Utilities (Symbol(..))
+import GF.Parsing.GrammarTypes
 import GF.Printing.PrintParser
 import TransformCFG
 import Option
diff --git a/src/GF/Speech/TransformCFG.hs b/src/GF/Speech/TransformCFG.hs
index 6c6f5091b..7c481f5c0 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/21 14:17:45 $ 
+-- > CVS $Date: 2005/03/21 22:40:06 $ 
 -- > CVS $Author: peb $
--- > CVS $Revision: 1.7 $
+-- > CVS $Revision: 1.8 $
 --
 --  This module does some useful transformations on CFGs.
 --
@@ -17,9 +17,9 @@
 module TransformCFG (makeNice, CFRule_) where
 
 import Ident
-import GF.Conversion.CFGrammar
-import GF.Parsing.Parser (Symbol(..))
-import GF.Conversion.GrammarTypes
+import GF.Parsing.CFGrammar
+import GF.Parsing.Utilities (Symbol(..))
+import GF.Parsing.GrammarTypes
 import GF.Printing.PrintParser
 
 import Data.FiniteMap