Fixed module names and imports after giant file move.

27 files changed, 203 insertions, 203 deletions

diff --git a/src/GF/OldParsing/CFGrammar.hs b/src/GF/OldParsing/CFGrammar.hs
index 6c6269626..5a71fe0ab 100644
--- a/src/GF/OldParsing/CFGrammar.hs
+++ b/src/GF/OldParsing/CFGrammar.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:52 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:41 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Definitions of context-free grammars,
 -- parser information and chart conversion
@@ -30,11 +30,11 @@ module GF.OldParsing.CFGrammar
 import GF.System.Tracing 
 
 -- haskell modules:
-import Array 
+import Data.Array
 -- gf modules:
 import GF.Data.SortedList
 import GF.Data.Assoc
-import qualified CF 
+import qualified GF.CF.CF as CF
 -- parser modules:
 import GF.OldParsing.Utilities
 import GF.Printing.PrintParser
diff --git a/src/GF/OldParsing/ConvertFiniteGFC.hs b/src/GF/OldParsing/ConvertFiniteGFC.hs
index 61486023e..25ed3fdb3 100644
--- a/src/GF/OldParsing/ConvertFiniteGFC.hs
+++ b/src/GF/OldParsing/ConvertFiniteGFC.hs
@@ -4,20 +4,20 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:52 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:42 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Calculating the finiteness of each type in a grammar
 -----------------------------------------------------------------------------
 
 module GF.OldParsing.ConvertFiniteGFC where
 
-import Operations
-import GFC
-import MkGFC
-import AbsGFC
-import Ident (Ident(..))
+import GF.Data.Operations
+import GF.Canon.GFC
+import GF.Canon.MkGFC
+import GF.Canon.AbsGFC
+import GF.Infra.Ident (Ident(..))
 import GF.System.Tracing
 import GF.Printing.PrintParser
 import GF.Printing.PrintSimplifiedTerm
diff --git a/src/GF/OldParsing/ConvertFiniteSimple.hs b/src/GF/OldParsing/ConvertFiniteSimple.hs
index 7aac39cb2..a05092550 100644
--- a/src/GF/OldParsing/ConvertFiniteSimple.hs
+++ b/src/GF/OldParsing/ConvertFiniteSimple.hs
@@ -4,22 +4,22 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:52 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:43 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Calculating the finiteness of each type in a grammar
 -----------------------------------------------------------------------------
 
-module GF.OldParsing.ConvertFiniteSimple 
+module GF.OldParsing.ConvertFiniteSimple
     (convertGrammar) where
 
 import GF.System.Tracing
 import GF.Printing.PrintParser
 import GF.Printing.PrintSimplifiedTerm
 
-import Operations
-import Ident (Ident(..))
+import GF.Data.Operations
+import GF.Infra.Ident (Ident(..))
 import GF.OldParsing.SimpleGFC
 import GF.Data.SortedList
 import GF.Data.Assoc
diff --git a/src/GF/OldParsing/ConvertGFCtoMCFG.hs b/src/GF/OldParsing/ConvertGFCtoMCFG.hs
index 1a9bc1a75..c32812eb2 100644
--- a/src/GF/OldParsing/ConvertGFCtoMCFG.hs
+++ b/src/GF/OldParsing/ConvertGFCtoMCFG.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:52 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:44 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- All different conversions from GFC to MCFG
 -----------------------------------------------------------------------------
@@ -16,10 +16,10 @@
 module GF.OldParsing.ConvertGFCtoMCFG
     (convertGrammar) where
 
-import GFC (CanonGrammar)
+import GF.Canon.GFC (CanonGrammar)
 import GF.OldParsing.GrammarTypes
-import Ident (Ident(..))
-import Option
+import GF.Infra.Ident (Ident(..))
+import GF.Infra.Option
 import GF.System.Tracing
 
 import qualified GF.OldParsing.ConvertGFCtoMCFG.Old as Old
diff --git a/src/GF/OldParsing/ConvertGFCtoMCFG/Coercions.hs b/src/GF/OldParsing/ConvertGFCtoMCFG/Coercions.hs
index 650f8b646..3ed6a3f48 100644
--- a/src/GF/OldParsing/ConvertGFCtoMCFG/Coercions.hs
+++ b/src/GF/OldParsing/ConvertGFCtoMCFG/Coercions.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:55 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:54 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Adding coercion functions to a MCFG if necessary.
 -----------------------------------------------------------------------------
@@ -21,12 +21,12 @@ import GF.Printing.PrintSimplifiedTerm
 -- import PrintGFC
 -- import qualified PrGrammar as PG
 
-import qualified Ident
+import qualified GF.Infra.Ident as Ident
 import GF.OldParsing.Utilities
 import GF.OldParsing.GrammarTypes 
 import GF.OldParsing.MCFGrammar (Rule(..), Lin(..))
 import GF.Data.SortedList
-import List (groupBy) -- , transpose)
+import Data.List (groupBy) -- , transpose)
 
 ----------------------------------------------------------------------
 
diff --git a/src/GF/OldParsing/ConvertGFCtoMCFG/Nondet.hs b/src/GF/OldParsing/ConvertGFCtoMCFG/Nondet.hs
index d27e240bc..ef9265d91 100644
--- a/src/GF/OldParsing/ConvertGFCtoMCFG/Nondet.hs
+++ b/src/GF/OldParsing/ConvertGFCtoMCFG/Nondet.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:55 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:55 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Converting GFC grammars to MCFG grammars, nondeterministically.
 --
@@ -26,21 +26,21 @@ import GF.Printing.PrintSimplifiedTerm
 -- import PrintGFC
 -- import qualified PrGrammar as PG
 
-import Monad
-import Ident (Ident(..))
-import AbsGFC
-import GFC
-import Look
-import Operations
-import qualified Modules as M
-import CMacros (defLinType)
-import MkGFC (grammar2canon)
+import Control.Monad
+import GF.Infra.Ident (Ident(..))
+import GF.Canon.AbsGFC
+import GF.Canon.GFC
+import GF.Canon.Look
+import GF.Data.Operations
+import qualified GF.Infra.Modules as M
+import GF.Canon.CMacros (defLinType)
+import GF.Canon.MkGFC (grammar2canon)
 import GF.OldParsing.Utilities
 import GF.OldParsing.GrammarTypes 
 import GF.OldParsing.MCFGrammar (Grammar, Rule(..), Lin(..))
 import GF.Data.SortedList
 -- import Maybe (listToMaybe)
-import List (groupBy) -- , transpose)
+import Data.List (groupBy) -- , transpose)
 
 import GF.Data.BacktrackM
 
diff --git a/src/GF/OldParsing/ConvertGFCtoMCFG/Old.hs b/src/GF/OldParsing/ConvertGFCtoMCFG/Old.hs
index d0869c8f5..b9fbf3b8c 100644
--- a/src/GF/OldParsing/ConvertGFCtoMCFG/Old.hs
+++ b/src/GF/OldParsing/ConvertGFCtoMCFG/Old.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:55 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:56 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Converting GFC grammars to MCFG grammars. (Old variant)
 --
@@ -24,24 +24,24 @@ import GF.System.Tracing
 import GF.Printing.PrintParser
 import GF.Printing.PrintSimplifiedTerm
 --import PrintGFC
-import qualified PrGrammar as PG
+import qualified GF.Grammar.PrGrammar as PG
 
-import Monad (liftM, liftM2, guard)
+import Control.Monad (liftM, liftM2, guard)
 -- import Maybe (listToMaybe)
-import Ident (Ident(..))
-import AbsGFC
-import GFC
-import Look
-import Operations
-import qualified Modules as M
-import CMacros (defLinType)
-import MkGFC (grammar2canon)
+import GF.Infra.Ident (Ident(..))
+import GF.Canon.AbsGFC
+import GF.Canon.GFC
+import GF.Canon.Look
+import GF.Data.Operations
+import qualified GF.Infra.Modules as M
+import GF.Canon.CMacros (defLinType)
+import GF.Canon.MkGFC (grammar2canon)
 import GF.OldParsing.Utilities
 import GF.OldParsing.GrammarTypes 
 import GF.OldParsing.MCFGrammar (Rule(..), Lin(..))
 import GF.Data.SortedList (nubsort, groupPairs)
-import Maybe (listToMaybe)
-import List (groupBy, transpose)
+import Data.Maybe (listToMaybe)
+import Data.List (groupBy, transpose)
 
 ----------------------------------------------------------------------
 -- old style types
diff --git a/src/GF/OldParsing/ConvertGFCtoMCFG/Strict.hs b/src/GF/OldParsing/ConvertGFCtoMCFG/Strict.hs
index 604fb460b..d1e5c5b20 100644
--- a/src/GF/OldParsing/ConvertGFCtoMCFG/Strict.hs
+++ b/src/GF/OldParsing/ConvertGFCtoMCFG/Strict.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:56 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:56 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Converting GFC grammars to MCFG grammars, nondeterministically.
 --
@@ -27,21 +27,21 @@ import GF.Printing.PrintSimplifiedTerm
 -- import PrintGFC
 -- import qualified PrGrammar as PG
 
-import Monad
-import Ident (Ident(..))
-import AbsGFC
-import GFC
-import Look
-import Operations
-import qualified Modules as M
-import CMacros (defLinType)
-import MkGFC (grammar2canon)
+import Control.Monad
+import GF.Infra.Ident (Ident(..))
+import GF.Canon.AbsGFC
+import GF.Canon.GFC
+import GF.Canon.Look
+import GF.Data.Operations
+import qualified GF.Infra.Modules as M
+import GF.Canon.CMacros (defLinType)
+import GF.Canon.MkGFC (grammar2canon)
 import GF.OldParsing.Utilities
 import GF.OldParsing.GrammarTypes 
 import GF.OldParsing.MCFGrammar (Grammar, Rule(..), Lin(..))
 import GF.Data.SortedList
 -- import Maybe (listToMaybe)
-import List (groupBy) -- , transpose)
+import Data.List (groupBy) -- , transpose)
 
 import GF.Data.BacktrackM
 
diff --git a/src/GF/OldParsing/ConvertGFCtoSimple.hs b/src/GF/OldParsing/ConvertGFCtoSimple.hs
index a14fa90b6..343f1f056 100644
--- a/src/GF/OldParsing/ConvertGFCtoSimple.hs
+++ b/src/GF/OldParsing/ConvertGFCtoSimple.hs
@@ -4,9 +4,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:52 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:45 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Converting GFC to SimpleGFC
 --
@@ -15,16 +15,16 @@
 
 module GF.OldParsing.ConvertGFCtoSimple where
 
-import qualified AbsGFC as A
-import qualified Ident as I
+import qualified GF.Canon.AbsGFC as A
+import qualified GF.Infra.Ident as I
 import GF.OldParsing.SimpleGFC 
 
-import GFC
-import MkGFC (grammar2canon)
-import qualified Look (lookupLin, allParamValues, lookupLincat)
-import qualified CMacros (defLinType)
-import Operations (err, errVal)
-import qualified Modules as M
+import GF.Canon.GFC
+import GF.Canon.MkGFC (grammar2canon)
+import qualified GF.Canon.Look as Look (lookupLin, allParamValues, lookupLincat)
+import qualified GF.Canon.CMacros as CMacros (defLinType)
+import GF.Data.Operations (err, errVal)
+import qualified GF.Infra.Modules as M
 
 import GF.System.Tracing
 import GF.Printing.PrintParser
diff --git a/src/GF/OldParsing/ConvertGrammar.hs b/src/GF/OldParsing/ConvertGrammar.hs
index 474834081..0dcd90770 100644
--- a/src/GF/OldParsing/ConvertGrammar.hs
+++ b/src/GF/OldParsing/ConvertGrammar.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:52 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:45 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- All (?) grammar conversions which are used in GF
 -----------------------------------------------------------------------------
@@ -18,11 +18,11 @@ module GF.OldParsing.ConvertGrammar
      module GF.OldParsing.GrammarTypes
     ) where
 
-import GFC (CanonGrammar)
-import MkGFC (grammar2canon)
+import GF.Canon.GFC (CanonGrammar)
+import GF.Canon.MkGFC (grammar2canon)
 import GF.OldParsing.GrammarTypes
-import Ident (Ident(..))
-import Option
+import GF.Infra.Ident (Ident(..))
+import GF.Infra.Option
 import GF.System.Tracing
 
 -- import qualified GF.OldParsing.FiniteTypes.Calc  as Fin
diff --git a/src/GF/OldParsing/ConvertMCFGtoCFG.hs b/src/GF/OldParsing/ConvertMCFGtoCFG.hs
index 06965994c..58d141166 100644
--- a/src/GF/OldParsing/ConvertMCFGtoCFG.hs
+++ b/src/GF/OldParsing/ConvertMCFGtoCFG.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:53 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:46 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Converting MCFG grammars to (possibly overgenerating) CFG
 -----------------------------------------------------------------------------
@@ -19,7 +19,7 @@ module GF.OldParsing.ConvertMCFGtoCFG
 import GF.System.Tracing
 import GF.Printing.PrintParser
 
-import Monad
+import Control.Monad
 import GF.OldParsing.Utilities
 import qualified GF.OldParsing.MCFGrammar as MCFG
 import qualified GF.OldParsing.CFGrammar as CFG
diff --git a/src/GF/OldParsing/ConvertSimpleToMCFG/Coercions.hs b/src/GF/OldParsing/ConvertSimpleToMCFG/Coercions.hs
index 1c107356b..adc42115a 100644
--- a/src/GF/OldParsing/ConvertSimpleToMCFG/Coercions.hs
+++ b/src/GF/OldParsing/ConvertSimpleToMCFG/Coercions.hs
@@ -4,9 +4,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/16 05:40:50 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.2 $
+-- > CVS $Date: 2005/04/21 16:22:57 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.3 $
 --
 -- Adding coercion functions to a MCFG if necessary.
 -----------------------------------------------------------------------------
@@ -20,12 +20,12 @@ import GF.Printing.PrintSimplifiedTerm
 -- import PrintGFC
 -- import qualified PrGrammar as PG
 
-import qualified Ident
+import qualified GF.Infra.Ident as Ident
 import GF.OldParsing.Utilities
 --import GF.OldParsing.GrammarTypes 
 import GF.OldParsing.MCFGrammar (Rule(..), Lin(..))
 import GF.Data.SortedList
-import List (groupBy) -- , transpose)
+import Data.List (groupBy) -- , transpose)
 
 ----------------------------------------------------------------------
 
diff --git a/src/GF/OldParsing/ConvertSimpleToMCFG/Nondet.hs b/src/GF/OldParsing/ConvertSimpleToMCFG/Nondet.hs
index da7511eaf..6627c5f2e 100644
--- a/src/GF/OldParsing/ConvertSimpleToMCFG/Nondet.hs
+++ b/src/GF/OldParsing/ConvertSimpleToMCFG/Nondet.hs
@@ -4,9 +4,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:56 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:58 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Converting SimpleGFC grammars to MCFG grammars, nondeterministically.
 --
@@ -24,14 +24,14 @@ import GF.Printing.PrintSimplifiedTerm
 -- import PrintGFC
 -- import qualified PrGrammar as PG
 
-import Monad
+import Control.Monad
 -- import Ident (Ident(..))
-import qualified AbsGFC 
+import qualified GF.Canon.AbsGFC as AbsGFC
 -- import GFC
-import Look
-import Operations
+import GF.Canon.Look
+import GF.Data.Operations
 -- import qualified Modules as M
-import CMacros (defLinType)
+import GF.Canon.CMacros (defLinType)
 -- import MkGFC (grammar2canon)
 import GF.OldParsing.Utilities
 -- import GF.OldParsing.GrammarTypes 
@@ -39,7 +39,7 @@ import GF.Data.SortedList
 import qualified GF.OldParsing.MCFGrammar as MCF (Grammar, Rule(..), Lin(..)) 
 import GF.OldParsing.SimpleGFC 
 -- import Maybe (listToMaybe)
-import List (groupBy) -- , transpose)
+import Data.List (groupBy) -- , transpose)
 
 import GF.Data.BacktrackM
 
diff --git a/src/GF/OldParsing/ConvertSimpleToMCFG/Old.hs b/src/GF/OldParsing/ConvertSimpleToMCFG/Old.hs
index 88a459625..dd2ff0713 100644
--- a/src/GF/OldParsing/ConvertSimpleToMCFG/Old.hs
+++ b/src/GF/OldParsing/ConvertSimpleToMCFG/Old.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:56 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:59 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Converting GFC grammars to MCFG grammars. (Old variant)
 --
@@ -18,30 +18,30 @@
 -----------------------------------------------------------------------------
 
 
-module GF.OldParsing.ConvertGFCtoMCFG.Old (convertGrammar) where
+module GF.OldParsing.ConvertSimpleToMCFG.Old (convertGrammar) where
 
 import GF.System.Tracing
 import GF.Printing.PrintParser
 import GF.Printing.PrintSimplifiedTerm
 --import PrintGFC
-import qualified PrGrammar as PG
+import qualified GF.Grammar.PrGrammar as PG
 
-import Monad (liftM, liftM2, guard)
+import Control.Monad (liftM, liftM2, guard)
 -- import Maybe (listToMaybe)
-import Ident (Ident(..))
-import AbsGFC
-import GFC
-import Look
-import Operations
-import qualified Modules as M
-import CMacros (defLinType)
-import MkGFC (grammar2canon)
+import GF.Infra.Ident (Ident(..))
+import GF.Canon.AbsGFC
+import GF.Canon.GFC
+import GF.Canon.Look
+import GF.Data.Operations
+import qualified GF.Infra.Modules as M
+import GF.Canon.CMacros (defLinType)
+import GF.Canon.MkGFC (grammar2canon)
 import GF.OldParsing.Utilities
 import GF.OldParsing.GrammarTypes 
 import GF.OldParsing.MCFGrammar (Rule(..), Lin(..))
 import GF.Data.SortedList (nubsort, groupPairs)
-import Maybe (listToMaybe)
-import List (groupBy, transpose)
+import Data.Maybe (listToMaybe)
+import Data.List (groupBy, transpose)
 
 ----------------------------------------------------------------------
 -- old style types
diff --git a/src/GF/OldParsing/ConvertSimpleToMCFG/Strict.hs b/src/GF/OldParsing/ConvertSimpleToMCFG/Strict.hs
index a1be8af4e..aa741518a 100644
--- a/src/GF/OldParsing/ConvertSimpleToMCFG/Strict.hs
+++ b/src/GF/OldParsing/ConvertSimpleToMCFG/Strict.hs
@@ -4,9 +4,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:56 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:23:00 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Converting SimpleGFC grammars to MCFG grammars, deterministic.
 --
@@ -16,12 +16,12 @@
 -----------------------------------------------------------------------------
 
 
-module GF.OldParsing.ConvertGFCtoMCFG.Strict (convertGrammar) where
+module GF.OldParsing.ConvertSimpleToMCFG.Strict (convertGrammar) where
 
 import GF.System.Tracing
 import GF.Infra.Print
 
-import Monad
+import Control.Monad
 
 import GF.Formalism.Utilities
 import GF.Formalism.GCFG 
@@ -32,20 +32,20 @@ import GF.Conversion.Types
 import GF.Data.BacktrackM
 
 {-
-import Ident (Ident(..))
-import AbsGFC
-import GFC
-import Look
-import Operations
-import qualified Modules as M
-import CMacros (defLinType)
-import MkGFC (grammar2canon)
+import GF.Infra.Ident (Ident(..))
+import GF.Canon.AbsGFC
+import GF.Canon.GFC
+import GF.Canon.Look
+import GF.Data.Operations
+import qualified GF.Infra.Modules as M
+import GF.Canon.CMacros (defLinType)
+import GF.Canon.MkGFC (grammar2canon)
 import GF.OldParsing.Utilities
 import GF.OldParsing.GrammarTypes 
 import GF.OldParsing.MCFGrammar (Grammar, Rule(..), Lin(..))
 import GF.Data.SortedList
 -- import Maybe (listToMaybe)
-import List (groupBy) -- , transpose)
+import Data.List (groupBy) -- , transpose)
 
 import GF.Data.BacktrackM
 -}
diff --git a/src/GF/OldParsing/GrammarTypes.hs b/src/GF/OldParsing/GrammarTypes.hs
index af2832bdf..fc514fc75 100644
--- a/src/GF/OldParsing/GrammarTypes.hs
+++ b/src/GF/OldParsing/GrammarTypes.hs
@@ -4,9 +4,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:53 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:46 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- All possible instantiations of different grammar formats used for parsing
 --
@@ -33,8 +33,8 @@ module GF.OldParsing.GrammarTypes
      (++.), (++!)
     ) where
 
-import Ident (Ident(..))
-import AbsGFC
+import GF.Infra.Ident (Ident(..))
+import GF.Canon.AbsGFC
 -- import qualified GF.OldParsing.FiniteTypes.Calc as Fin
 import qualified GF.OldParsing.CFGrammar as CFG
 import qualified GF.OldParsing.MCFGrammar as MCFG
diff --git a/src/GF/OldParsing/IncrementalChart.hs b/src/GF/OldParsing/IncrementalChart.hs
index 2a941ec84..132ed4dc4 100644
--- a/src/GF/OldParsing/IncrementalChart.hs
+++ b/src/GF/OldParsing/IncrementalChart.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:53 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:47 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Implementation of /incremental/ deductive parsing,
 -- i.e. parsing one word at the time.
@@ -22,7 +22,7 @@ module GF.OldParsing.IncrementalChart
      chartList
     ) where
 
-import Array
+import Data.Array
 import GF.Data.SortedList
 import GF.Data.Assoc
 
diff --git a/src/GF/OldParsing/MCFGrammar.hs b/src/GF/OldParsing/MCFGrammar.hs
index 350c574a7..ff9d7de1b 100644
--- a/src/GF/OldParsing/MCFGrammar.hs
+++ b/src/GF/OldParsing/MCFGrammar.hs
@@ -5,15 +5,15 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:54 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:48 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Definitions of multiple context-free grammars,
 -- parser information and chart conversion
 -----------------------------------------------------------------------------
 
-module GF.OldParsing.MCFGrammar 
+module GF.OldParsing.MCFGrammar
     (-- * Type definitions
      Grammar,
      Rule(..),
diff --git a/src/GF/OldParsing/ParseCF.hs b/src/GF/OldParsing/ParseCF.hs
index 0ed19c786..e1ef32aee 100644
--- a/src/GF/OldParsing/ParseCF.hs
+++ b/src/GF/OldParsing/ParseCF.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:54 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:49 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Chart parsing of grammars in CF format
 -----------------------------------------------------------------------------
@@ -20,8 +20,8 @@ import GF.Printing.PrintSimplifiedTerm
 
 import GF.Data.SortedList (nubsort)
 import GF.Data.Assoc
-import qualified CF
-import qualified CFIdent as CFI
+import qualified GF.CF.CF as CF
+import qualified GF.CF.CFIdent as CFI
 import GF.OldParsing.Utilities
 import GF.OldParsing.CFGrammar
 import qualified GF.OldParsing.ParseCFG as P
diff --git a/src/GF/OldParsing/ParseCFG.hs b/src/GF/OldParsing/ParseCFG.hs
index 7cba41175..03c1d7dcc 100644
--- a/src/GF/OldParsing/ParseCFG.hs
+++ b/src/GF/OldParsing/ParseCFG.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:54 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:49 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Main parsing module for context-free grammars
 -----------------------------------------------------------------------------
@@ -15,7 +15,7 @@
 
 module GF.OldParsing.ParseCFG (parse) where
 
-import Char (toLower)
+import Data.Char (toLower)
 import GF.OldParsing.Utilities
 import GF.OldParsing.CFGrammar
 import qualified GF.OldParsing.ParseCFG.General as PGen
diff --git a/src/GF/OldParsing/ParseCFG/General.hs b/src/GF/OldParsing/ParseCFG/General.hs
index 7ac395ba3..438c89f1a 100644
--- a/src/GF/OldParsing/ParseCFG/General.hs
+++ b/src/GF/OldParsing/ParseCFG/General.hs
@@ -5,14 +5,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:57 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:23:00 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Several implementations of CFG chart parsing
 -----------------------------------------------------------------------------
 
-module GF.OldParsing.ParseCFG.General 
+module GF.OldParsing.ParseCFG.General
     (parse, Strategy) where
 
 import GF.System.Tracing
diff --git a/src/GF/OldParsing/ParseCFG/Incremental.hs b/src/GF/OldParsing/ParseCFG/Incremental.hs
index 882fad26e..f1bcde404 100644
--- a/src/GF/OldParsing/ParseCFG/Incremental.hs
+++ b/src/GF/OldParsing/ParseCFG/Incremental.hs
@@ -5,27 +5,27 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:57 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:23:01 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Incremental chart parsing for context-free grammars
 -----------------------------------------------------------------------------
 
  
 
-module GF.OldParsing.ParseCFG.Incremental 
+module GF.OldParsing.ParseCFG.Incremental
     (parse, Strategy) where
 
 import GF.System.Tracing
 import GF.Printing.PrintParser
 
 -- haskell modules:
-import Array
+import Data.Array
 -- gf modules:
 import GF.Data.SortedList
 import GF.Data.Assoc
-import Operations
+import GF.Data.Operations
 -- parser modules:
 import GF.OldParsing.Utilities
 import GF.OldParsing.CFGrammar
diff --git a/src/GF/OldParsing/ParseGFC.hs b/src/GF/OldParsing/ParseGFC.hs
index ebd4dc782..fbc6cff5a 100644
--- a/src/GF/OldParsing/ParseGFC.hs
+++ b/src/GF/OldParsing/ParseGFC.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:54 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:50 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- The main parsing module, parsing GFC grammars
 -- by translating to simpler formats, such as PMCFG and CFG
@@ -17,20 +17,20 @@ module GF.OldParsing.ParseGFC (newParser) where
 
 import GF.System.Tracing 
 import GF.Printing.PrintParser
-import qualified PrGrammar
+import qualified GF.Grammar.PrGrammar as PrGrammar
 
 -- Haskell modules
-import Monad
+import Control.Monad
 -- import Ratio ((%))
 -- GF modules
-import qualified Grammar as GF
-import Values
-import qualified Macros 
-import qualified Modules as Mods
-import qualified AbsGFC
-import qualified Ident
-import qualified ShellState as SS
-import Operations
+import qualified GF.Grammar.Grammar as GF
+import GF.Grammar.Values
+import qualified GF.Grammar.Macros as Macros
+import qualified GF.Infra.Modules as Mods
+import qualified GF.Canon.AbsGFC as AbsGFC
+import qualified GF.Infra.Ident as Ident
+import qualified GF.Compile.ShellState as SS
+import GF.Data.Operations
 import GF.Data.SortedList 
 -- Conversion and parser modules
 import GF.Data.Assoc
diff --git a/src/GF/OldParsing/ParseMCFG.hs b/src/GF/OldParsing/ParseMCFG.hs
index ad29e5f2f..c845a76b3 100644
--- a/src/GF/OldParsing/ParseMCFG.hs
+++ b/src/GF/OldParsing/ParseMCFG.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:54 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:52 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Main module for MCFG parsing
 -----------------------------------------------------------------------------
@@ -15,7 +15,7 @@
 
 module GF.OldParsing.ParseMCFG (parse) where
 
-import Char (toLower)
+import Data.Char (toLower)
 import GF.OldParsing.Utilities
 import GF.OldParsing.MCFGrammar
 import qualified GF.OldParsing.ParseMCFG.Basic as PBas
diff --git a/src/GF/OldParsing/ParseMCFG/Basic.hs b/src/GF/OldParsing/ParseMCFG/Basic.hs
index 7b0d01dde..baf7e4b2a 100644
--- a/src/GF/OldParsing/ParseMCFG/Basic.hs
+++ b/src/GF/OldParsing/ParseMCFG/Basic.hs
@@ -5,19 +5,19 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:57 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:23:03 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Simplest possible implementation of MCFG chart parsing
 -----------------------------------------------------------------------------
 
-module GF.OldParsing.ParseMCFG.Basic 
+module GF.OldParsing.ParseMCFG.Basic
     (parse) where
 
 import GF.System.Tracing
 
-import Ix
+import Data.Ix
 import GF.OldParsing.Utilities
 import GF.OldParsing.MCFGrammar
 import GF.OldParsing.GeneralChart 
diff --git a/src/GF/OldParsing/SimpleGFC.hs b/src/GF/OldParsing/SimpleGFC.hs
index 456c44685..59f379bb4 100644
--- a/src/GF/OldParsing/SimpleGFC.hs
+++ b/src/GF/OldParsing/SimpleGFC.hs
@@ -4,22 +4,22 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:54 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:52 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Simplistic GFC format
 -----------------------------------------------------------------------------
 
 module GF.OldParsing.SimpleGFC where
 
-import qualified AbsGFC 
-import qualified Ident 
+import qualified GF.Canon.AbsGFC as AbsGFC
+import qualified GF.Infra.Ident as Ident
 
 import GF.Printing.PrintParser
 import GF.Printing.PrintSimplifiedTerm
 
-import Operations (ifNull)
+import GF.Data.Operations (ifNull)
 
 ----------------------------------------------------------------------
 
diff --git a/src/GF/OldParsing/Utilities.hs b/src/GF/OldParsing/Utilities.hs
index 22d168973..6bacfe1fe 100644
--- a/src/GF/OldParsing/Utilities.hs
+++ b/src/GF/OldParsing/Utilities.hs
@@ -5,15 +5,15 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:55 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:54 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Basic type declarations and functions to be used when parsing
 -----------------------------------------------------------------------------
 
 
-module GF.OldParsing.Utilities 
+module GF.OldParsing.Utilities
     ( -- * Symbols
       Symbol(..), symbol, mapSymbol,
       -- * Edges
@@ -26,8 +26,8 @@ module GF.OldParsing.Utilities
     ) where
 
 -- haskell modules:
-import Monad
-import Array
+import Control.Monad
+import Data.Array
 -- gf modules:
 import GF.Data.SortedList
 import GF.Data.Assoc