Fixed module names and imports after giant file move.

13 files changed, 239 insertions, 239 deletions

diff --git a/src/GF/UseGrammar/Custom.hs b/src/GF/UseGrammar/Custom.hs
index f237f92ad..81bb2afed 100644
--- a/src/GF/UseGrammar/Custom.hs
+++ b/src/GF/UseGrammar/Custom.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/20 20:09:19 $ 
--- > CVS $Author: aarne $
--- > CVS $Revision: 1.57 $
+-- > CVS $Date: 2005/04/21 16:23:44 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.58 $
 --
 -- A database for customizable GF shell commands. 
 --
@@ -25,48 +25,48 @@
 --  - additions are made to the end of the database
 -----------------------------------------------------------------------------
 
-module Custom where
-
-import Operations
-import Text
-import Tokenize
-import Values
-import qualified Grammar as G
-import qualified AbsGFC as A
-import qualified GFC as C
-import qualified AbsGF as GF
-import qualified MMacros as MM
-import AbsCompute
-import TypeCheck
-import Generate
+module GF.UseGrammar.Custom where
+
+import GF.Data.Operations
+import GF.Text.Text
+import GF.UseGrammar.Tokenize
+import GF.Grammar.Values
+import qualified GF.Grammar.Grammar as G
+import qualified GF.Canon.AbsGFC as A
+import qualified GF.Canon.GFC as C
+import qualified GF.Source.AbsGF as GF
+import qualified GF.Grammar.MMacros as MM
+import GF.Grammar.AbsCompute
+import GF.Grammar.TypeCheck
+import GF.UseGrammar.Generate
 ------import Compile
-import ShellState
-import Editing
-import Paraphrases
-import Option
-import CF
-import CFIdent
-
-import CanonToGrammar
-import PPrCF
-import PrLBNF
-import PrGrammar
-import PrOld
-import MkGFC
-import CFtoSRG
-import PrGSL (gslPrinter)
-import PrJSGF (jsgfPrinter)
-
-import Zipper
-
-import Morphology
-import GrammarToHaskell
+import GF.Compile.ShellState
+import GF.UseGrammar.Editing
+import GF.UseGrammar.Paraphrases
+import GF.Infra.Option
+import GF.CF.CF
+import GF.CF.CFIdent
+
+import GF.Canon.CanonToGrammar
+import GF.CF.PPrCF
+import GF.CF.PrLBNF
+import GF.Grammar.PrGrammar
+import GF.Compile.PrOld
+import GF.Canon.MkGFC
+import GF.CF.CFtoSRG
+import GF.Speech.PrGSL (gslPrinter)
+import GF.Speech.PrJSGF (jsgfPrinter)
+
+import GF.Data.Zipper
+
+import GF.UseGrammar.Morphology
+import GF.API.GrammarToHaskell
 -----import GrammarToCanon (showCanon, showCanonOpt)
 -----import qualified GrammarToGFC as GFC
 
 -- the cf parsing algorithms
-import ChartParser -- OBSOLETE
-import qualified GF.NewParsing.CF as PCF
+import GF.CF.ChartParser -- OBSOLETE
+import qualified GF.Parsing.CF as PCF
 import qualified GF.OldParsing.ParseCF as PCFOld -- OBSOLETE
 
 -- grammar conversions -- peb 19/4-04
@@ -76,34 +76,34 @@ import qualified GF.Printing.PrintParser as PrtOld -- OBSOLETE
 import qualified GF.Infra.Print as Prt
 import qualified GF.Conversion.GFC as Cnv
 
-import GFC
-import qualified MkGFC as MC
-import PrintCFGrammar (prCanonAsCFGM)
-import VisualizeGrammar (visualizeCanonGrammar, visualizeSourceGrammar)
+import GF.Canon.GFC
+import qualified GF.Canon.MkGFC as MC
+import GF.CFGM.PrintCFGrammar (prCanonAsCFGM)
+import GF.Visualization.VisualizeGrammar (visualizeCanonGrammar, visualizeSourceGrammar)
 
-import MyParser
+import GF.API.MyParser
 
-import UseIO
+import GF.Infra.UseIO
 
-import Monad
-import Char
+import Control.Monad
+import Data.Char
 
 -- character codings
-import Unicode
-import UTF8 (decodeUTF8)
-import Greek (mkGreek)
-import Arabic (mkArabic)
-import Hebrew (mkHebrew)
-import Russian (mkRussian, mkRusKOI8)
-import Ethiopic (mkEthiopic)
-import Tamil (mkTamil)
-import OCSCyrillic (mkOCSCyrillic)
-import LatinASupplement (mkLatinASupplement)
-import Devanagari (mkDevanagari)
-import Hiragana (mkJapanese)
-import ExtendedArabic (mkArabic0600)
-import ExtendedArabic (mkExtendedArabic)
-import ExtraDiacritics (mkExtraDiacritics)
+import GF.Text.Unicode
+import GF.Text.UTF8 (decodeUTF8)
+import GF.Text.Greek (mkGreek)
+import GF.Text.Arabic (mkArabic)
+import GF.Text.Hebrew (mkHebrew)
+import GF.Text.Russian (mkRussian, mkRusKOI8)
+import GF.Text.Ethiopic (mkEthiopic)
+import GF.Text.Tamil (mkTamil)
+import GF.Text.OCSCyrillic (mkOCSCyrillic)
+import GF.Text.LatinASupplement (mkLatinASupplement)
+import GF.Text.Devanagari (mkDevanagari)
+import GF.Text.Hiragana (mkJapanese)
+import GF.Text.ExtendedArabic (mkArabic0600)
+import GF.Text.ExtendedArabic (mkExtendedArabic)
+import GF.Text.ExtraDiacritics (mkExtraDiacritics)
 
 -- minimal version also used in Hugs. AR 2/12/2002. 
 
diff --git a/src/GF/UseGrammar/Editing.hs b/src/GF/UseGrammar/Editing.hs
index a816d85ef..762562eb0 100644
--- a/src/GF/UseGrammar/Editing.hs
+++ b/src/GF/UseGrammar/Editing.hs
@@ -5,25 +5,25 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/03/02 14:25:45 $ 
--- > CVS $Author: aarne $
--- > CVS $Revision: 1.13 $
+-- > CVS $Date: 2005/04/21 16:23:45 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.14 $
 --
 -- generic tree editing, with some grammar notions assumed. AR 18\/8\/2001.
 -- 19\/6\/2003 for GFC
 -----------------------------------------------------------------------------
 
-module Editing where
+module GF.UseGrammar.Editing where
 
-import Abstract
-import qualified GFC
-import TypeCheck
-import LookAbs
-import AbsCompute
-import Macros (errorCat)
+import GF.Grammar.Abstract
+import qualified GF.Canon.GFC as GFC
+import GF.Grammar.TypeCheck
+import GF.Grammar.LookAbs
+import GF.Grammar.AbsCompute
+import GF.Grammar.Macros (errorCat)
 
-import Operations
-import Zipper
+import GF.Data.Operations
+import GF.Data.Zipper
 
 -- generic tree editing, with some grammar notions assumed. AR 18/8/2001 
 -- 19/6/2003 for GFC
diff --git a/src/GF/UseGrammar/Generate.hs b/src/GF/UseGrammar/Generate.hs
index c83b7bbb3..ee7419fb5 100644
--- a/src/GF/UseGrammar/Generate.hs
+++ b/src/GF/UseGrammar/Generate.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/03/04 12:05:10 $ 
--- > CVS $Author: aarne $
--- > CVS $Revision: 1.13 $
+-- > CVS $Date: 2005/04/21 16:23:46 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.14 $
 --
 -- Generate all trees of given category and depth. AR 30\/4\/2004
 --
@@ -17,19 +17,19 @@
 -- guarantee the correctness of bindings\/dependences.
 -----------------------------------------------------------------------------
 
-module Generate (generateTrees) where
+module GF.UseGrammar.Generate (generateTrees) where
 
-import GFC
-import LookAbs
-import PrGrammar
-import Macros
-import Values
-import Grammar (Cat)
+import GF.Canon.GFC
+import GF.Grammar.LookAbs
+import GF.Grammar.PrGrammar
+import GF.Grammar.Macros
+import GF.Grammar.Values
+import GF.Grammar.Grammar (Cat)
 
-import Operations
-import Zipper
+import GF.Data.Operations
+import GF.Data.Zipper
 
-import List
+import Data.List
 
 -- Generate all trees of given category and depth. AR 30/4/2004
 -- (c) Aarne Ranta 2004 under GNU GPL
diff --git a/src/GF/UseGrammar/GetTree.hs b/src/GF/UseGrammar/GetTree.hs
index b755ec7f3..a8d5fcab2 100644
--- a/src/GF/UseGrammar/GetTree.hs
+++ b/src/GF/UseGrammar/GetTree.hs
@@ -5,31 +5,31 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/24 11:46:38 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.6 $
+-- > CVS $Date: 2005/04/21 16:23:47 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.7 $
 --
 -- how to form linearizable trees from strings and from terms of different levels
 --
 -- 'String' --> raw 'Term' --> annot, qualif 'Term' --> 'Tree'
 -----------------------------------------------------------------------------
 
-module GetTree where
+module GF.UseGrammar.GetTree where
 
-import GFC
-import Values
-import qualified Grammar as G
-import Ident
-import MMacros
-import Macros
-import Rename
-import TypeCheck
-import PGrammar
-import ShellState
+import GF.Canon.GFC
+import GF.Grammar.Values
+import qualified GF.Grammar.Grammar as G
+import GF.Infra.Ident
+import GF.Grammar.MMacros
+import GF.Grammar.Macros
+import GF.Compile.Rename
+import GF.Grammar.TypeCheck
+import GF.Compile.PGrammar
+import GF.Compile.ShellState
 
-import Operations
+import GF.Data.Operations
 
-import Char
+import Data.Char
 
 -- how to form linearizable trees from strings and from terms of different levels
 --
diff --git a/src/GF/UseGrammar/Information.hs b/src/GF/UseGrammar/Information.hs
index ea94d1270..37cacbb1a 100644
--- a/src/GF/UseGrammar/Information.hs
+++ b/src/GF/UseGrammar/Information.hs
@@ -5,31 +5,31 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/24 11:46:38 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.4 $
+-- > CVS $Date: 2005/04/21 16:23:47 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.5 $
 --
 -- information on module, category, function, operation, parameter,... 
 -- AR 16\/9\/2003.
 -- uses source grammar
 -----------------------------------------------------------------------------
 
-module Information (showInformation) where
+module GF.UseGrammar.Information (showInformation) where
 
-import Grammar
-import Ident
-import Modules
-import Option
-import CF
-import PPrCF
-import ShellState
-import PrGrammar
-import Lookup
-import qualified GFC
-import qualified AbsGFC
+import GF.Grammar.Grammar
+import GF.Infra.Ident
+import GF.Infra.Modules
+import GF.Infra.Option
+import GF.CF.CF
+import GF.CF.PPrCF
+import GF.Compile.ShellState
+import GF.Grammar.PrGrammar
+import GF.Grammar.Lookup
+import qualified GF.Canon.GFC as GFC
+import qualified GF.Canon.AbsGFC as AbsGFC
 
-import Operations
-import UseIO
+import GF.Data.Operations
+import GF.Infra.UseIO
 
 -- information on module, category, function, operation, parameter,... AR 16/9/2003
 -- uses source grammar
diff --git a/src/GF/UseGrammar/Linear.hs b/src/GF/UseGrammar/Linear.hs
index 4b2a4d9bb..794db670c 100644
--- a/src/GF/UseGrammar/Linear.hs
+++ b/src/GF/UseGrammar/Linear.hs
@@ -5,35 +5,35 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/24 11:46:38 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.14 $
+-- > CVS $Date: 2005/04/21 16:23:48 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.15 $
 --
 -- Linearization for canonical GF. AR 7\/6\/2003
 -----------------------------------------------------------------------------
 
-module Linear where
-
-import GFC
-import AbsGFC
-import qualified Abstract as A
-import MkGFC (rtQIdent) ----
-import Ident
-import PrGrammar
-import CMacros
-import Look
-import LookAbs
-import MMacros
-import TypeCheck (annotate) ----
-import Str
-import Text
+module GF.UseGrammar.Linear where
+
+import GF.Canon.GFC
+import GF.Canon.AbsGFC
+import qualified GF.Grammar.Abstract as A
+import GF.Canon.MkGFC (rtQIdent) ----
+import GF.Infra.Ident
+import GF.Grammar.PrGrammar
+import GF.Canon.CMacros
+import GF.Canon.Look
+import GF.Grammar.LookAbs
+import GF.Grammar.MMacros
+import GF.Grammar.TypeCheck (annotate) ----
+import GF.Data.Str
+import GF.Text.Text
 ----import TypeCheck -- to annotate
 
-import Operations
-import Zipper
+import GF.Data.Operations
+import GF.Data.Zipper
 
-import Monad
-import List (intersperse)
+import Control.Monad
+import Data.List (intersperse)
 
 -- Linearization for canonical GF. AR 7/6/2003
 
diff --git a/src/GF/UseGrammar/Morphology.hs b/src/GF/UseGrammar/Morphology.hs
index 62aeb7725..626269836 100644
--- a/src/GF/UseGrammar/Morphology.hs
+++ b/src/GF/UseGrammar/Morphology.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/24 11:46:39 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.7 $
+-- > CVS $Date: 2005/04/21 16:23:49 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.8 $
 --
 -- Morphological analyser constructed from a GF grammar.
 --
@@ -17,24 +17,24 @@
 -- for decompositions and also want to use it in the parser
 -----------------------------------------------------------------------------
 
-module Morphology where
+module GF.UseGrammar.Morphology where
 
-import AbsGFC
-import GFC
-import PrGrammar
-import CMacros
-import LookAbs
-import Ident
-import qualified Macros as M
-import Linear
+import GF.Canon.AbsGFC
+import GF.Canon.GFC
+import GF.Grammar.PrGrammar
+import GF.Canon.CMacros
+import GF.Grammar.LookAbs
+import GF.Infra.Ident
+import qualified GF.Grammar.Macros as M
+import GF.UseGrammar.Linear
 
-import Operations
-import Glue
+import GF.Data.Operations
+import GF.Data.Glue
 
-import Char
-import List (sortBy, intersperse)
-import Monad (liftM)
-import Trie2
+import Data.Char
+import Data.List (sortBy, intersperse)
+import Control.Monad (liftM)
+import GF.Data.Trie2
 
 -- construct a morphological analyser from a GF grammar. AR 11/4/2001
 
diff --git a/src/GF/UseGrammar/Paraphrases.hs b/src/GF/UseGrammar/Paraphrases.hs
index 2946c3625..d04f22aa6 100644
--- a/src/GF/UseGrammar/Paraphrases.hs
+++ b/src/GF/UseGrammar/Paraphrases.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/24 11:46:39 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.5 $
+-- > CVS $Date: 2005/04/21 16:23:49 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.6 $
 --
 -- paraphrases of GF terms. AR 6\/10\/1998 -- 24\/9\/1999 -- 5\/7\/2000 -- 5\/6\/2002
 --
@@ -16,16 +16,16 @@
 -- thus inherited from the old GF. Incomplete and inefficient...
 -----------------------------------------------------------------------------
 
-module Paraphrases (mkParaphrases) where
+module GF.UseGrammar.Paraphrases (mkParaphrases) where
 
-import Abstract
-import PrGrammar
-import LookAbs
-import AbsCompute
+import GF.Grammar.Abstract
+import GF.Grammar.PrGrammar
+import GF.Grammar.LookAbs
+import GF.Grammar.AbsCompute
 
-import Operations
+import GF.Data.Operations
 
-import List (nub)
+import Data.List (nub)
 
 -- paraphrases of GF terms. AR 6/10/1998 -- 24/9/1999 -- 5/7/2000 -- 5/6/2002
 -- Copyright (c) Aarne Ranta 1998--99, under GNU General Public License (see GPL)
diff --git a/src/GF/UseGrammar/Parsing.hs b/src/GF/UseGrammar/Parsing.hs
index b546c04b6..5edf8a124 100644
--- a/src/GF/UseGrammar/Parsing.hs
+++ b/src/GF/UseGrammar/Parsing.hs
@@ -5,43 +5,43 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/20 12:49:45 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.19 $
+-- > CVS $Date: 2005/04/21 16:23:50 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.20 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module Parsing where
-
-import CheckM
-import qualified AbsGFC as C
-import GFC
-import MkGFC (trExp) ----
-import CMacros
-import MMacros (refreshMetas)
-import Linear
-import Str
-import CF
-import CFIdent
-import Ident
-import TypeCheck
-import Values
+module GF.UseGrammar.Parsing where
+
+import GF.Infra.CheckM
+import qualified GF.Canon.AbsGFC as C
+import GF.Canon.GFC
+import GF.Canon.MkGFC (trExp) ----
+import GF.Canon.CMacros
+import GF.Grammar.MMacros (refreshMetas)
+import GF.UseGrammar.Linear
+import GF.Data.Str
+import GF.CF.CF
+import GF.CF.CFIdent
+import GF.Infra.Ident
+import GF.Grammar.TypeCheck
+import GF.Grammar.Values
 --import CFMethod
-import Tokenize
-import Profile
-import Option
-import Custom
-import ShellState
+import GF.UseGrammar.Tokenize
+import GF.CF.Profile
+import GF.Infra.Option
+import GF.UseGrammar.Custom
+import GF.Compile.ShellState
 
-import PPrCF (prCFTree)
+import GF.CF.PPrCF (prCFTree)
 import qualified GF.OldParsing.ParseGFC as NewOld -- OBSOLETE
-import qualified GF.NewParsing.GFC as New
+import qualified GF.Parsing.GFC as New
 
-import Operations
+import GF.Data.Operations
 
-import List (nub)
-import Monad (liftM)
+import Data.List (nub)
+import Control.Monad (liftM)
 
 -- AR 26/1/2000 -- 8/4 -- 28/1/2001 -- 9/12/2002
 
diff --git a/src/GF/UseGrammar/Randomized.hs b/src/GF/UseGrammar/Randomized.hs
index d893e663b..c1c77edb2 100644
--- a/src/GF/UseGrammar/Randomized.hs
+++ b/src/GF/UseGrammar/Randomized.hs
@@ -5,24 +5,24 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/24 11:46:39 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.7 $
+-- > CVS $Date: 2005/04/21 16:23:51 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.8 $
 --
 -- random generation and refinement. AR 22\/8\/2001.
 -- implemented as sequence of refinement menu selecsions, encoded as integers
 -----------------------------------------------------------------------------
 
-module Randomized where
+module GF.UseGrammar.Randomized where
 
-import Abstract
-import Editing
+import GF.Grammar.Abstract
+import GF.UseGrammar.Editing
 
-import Operations
-import Zipper
+import GF.Data.Operations
+import GF.Data.Zipper
 
 --- import Arch (myStdGen) --- circular for hbc
-import Random --- (mkStdGen, StdGen, randoms) --- bad import for hbc
+import System.Random --- (mkStdGen, StdGen, randoms) --- bad import for hbc
 
 -- random generation and refinement. AR 22/8/2001
 -- implemented as sequence of refinement menu selecsions, encoded as integers
diff --git a/src/GF/UseGrammar/Session.hs b/src/GF/UseGrammar/Session.hs
index 6e27d4971..34ffeed4a 100644
--- a/src/GF/UseGrammar/Session.hs
+++ b/src/GF/UseGrammar/Session.hs
@@ -5,22 +5,22 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/24 11:46:39 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.8 $
+-- > CVS $Date: 2005/04/21 16:23:51 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.9 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module Session where
+module GF.UseGrammar.Session where
 
-import Abstract
-import Option
-import Custom
-import Editing
-import ShellState ---- grammar
+import GF.Grammar.Abstract
+import GF.Infra.Option
+import GF.UseGrammar.Custom
+import GF.UseGrammar.Editing
+import GF.Compile.ShellState ---- grammar
 
-import Operations
+import GF.Data.Operations
 
 -- First version 8/2001. Adapted to GFC with modules 19/6/2003.
 -- Nothing had to be changed, which is a sign of good modularity.
diff --git a/src/GF/UseGrammar/Tokenize.hs b/src/GF/UseGrammar/Tokenize.hs
index da4d419b3..6a8119ac0 100644
--- a/src/GF/UseGrammar/Tokenize.hs
+++ b/src/GF/UseGrammar/Tokenize.hs
@@ -5,15 +5,15 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/04 17:29:18 $ 
--- > CVS $Author: aarne $
--- > CVS $Revision: 1.12 $
+-- > CVS $Date: 2005/04/21 16:23:52 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.13 $
 --
 -- lexers = tokenizers, to prepare input for GF grammars. AR 4\/1\/2002.
 -- an entry for each is included in 'Custom.customTokenizer'
 -----------------------------------------------------------------------------
 
-module Tokenize ( tokWords,
+module GF.UseGrammar.Tokenize ( tokWords,
 		  tokLits,
 		  tokVars,
 		  lexHaskell,
@@ -24,11 +24,11 @@ module Tokenize ( tokWords,
 		  lexTextLiteral,
 		) where
 
-import Operations
+import GF.Data.Operations
 ---- import UseGrammar (isLiteral,identC)
-import CFIdent
+import GF.CF.CFIdent
 
-import Char
+import Data.Char
 
 -- lexers = tokenizers, to prepare input for GF grammars. AR 4/1/2002
 -- an entry for each is included in Custom.customTokenizer
diff --git a/src/GF/UseGrammar/Transfer.hs b/src/GF/UseGrammar/Transfer.hs
index d0ac42688..3a4aadf96 100644
--- a/src/GF/UseGrammar/Transfer.hs
+++ b/src/GF/UseGrammar/Transfer.hs
@@ -5,27 +5,27 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/24 11:46:40 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.4 $
+-- > CVS $Date: 2005/04/21 16:23:53 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.5 $
 --
 -- linearize, parse, etc, by transfer. AR 9\/10\/2003
 -----------------------------------------------------------------------------
 
-module Transfer where
+module GF.UseGrammar.Transfer where
 
-import Grammar
-import Values
-import AbsCompute
-import qualified GFC
-import LookAbs
-import MMacros
-import TypeCheck
+import GF.Grammar.Grammar
+import GF.Grammar.Values
+import GF.Grammar.AbsCompute
+import qualified GF.Canon.GFC as GFC
+import GF.Grammar.LookAbs
+import GF.Grammar.MMacros
+import GF.Grammar.TypeCheck
 
-import Ident
-import Operations
+import GF.Infra.Ident
+import GF.Data.Operations
 
-import Monad
+import Control.Monad
 
 -- linearize, parse, etc, by transfer. AR 9/10/2003