8 files changed, 58 insertions, 58 deletions
diff --git a/src/GF/Source/AbsGF.hs b/src/GF/Source/AbsGF.hs
index 30f77b4cb..575cff48b 100644
--- a/src/GF/Source/AbsGF.hs
+++ b/src/GF/Source/AbsGF.hs
@@ -1,7 +1,7 @@
 
-module AbsGF where
+module GF.Source.AbsGF where
 
-import Ident --H
+import GF.Infra.Ident --H
 
 -- Haskell module generated by the BNF converter, except --H
 
diff --git a/src/GF/Source/GrammarToSource.hs b/src/GF/Source/GrammarToSource.hs
index bfbb815f7..e2f5f132e 100644
--- a/src/GF/Source/GrammarToSource.hs
+++ b/src/GF/Source/GrammarToSource.hs
@@ -5,26 +5,26 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/04 15:50:27 $ 
--- > CVS $Author: aarne $
--- > CVS $Revision: 1.18 $
+-- > CVS $Date: 2005/04/21 16:23:25 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.19 $
 --
 -- From internal source syntax to BNFC-generated (used for printing).
 -----------------------------------------------------------------------------
 
-module GrammarToSource ( trGrammar, 
+module GF.Source.GrammarToSource ( trGrammar,
 			 trModule,
 			 trAnyDef,
 			 trLabel,
 			 trt, tri, trp
 		       ) where
 
-import Operations
-import Grammar
-import Modules
-import Option
-import qualified AbsGF as P
-import Ident
+import GF.Data.Operations
+import GF.Grammar.Grammar
+import GF.Infra.Modules
+import GF.Infra.Option
+import qualified GF.Source.AbsGF as P
+import GF.Infra.Ident
 
 -- | AR 13\/5\/2003
 --
diff --git a/src/GF/Source/LexGF.hs b/src/GF/Source/LexGF.hs
index 1978273f9..9ea4c4a5b 100644
--- a/src/GF/Source/LexGF.hs
+++ b/src/GF/Source/LexGF.hs
@@ -1,16 +1,16 @@
 {-# OPTIONS -cpp #-}
 {-# LINE 3 "LexGF.x" #-}
-module LexGF where
+module GF.Source.LexGF where
 
-import ErrM
+import GF.Data.ErrM
 
 #if __GLASGOW_HASKELL__ >= 503
 import Data.Array
 import Data.Char (ord)
 import Data.Array.Base (unsafeAt)
 #else
-import Array
-import Char (ord)
+import Data.Array
+import Data.Char (ord)
 #endif
 alex_base :: Array Int Int
 alex_base = listArray (0,27) [1,21,57,58,24,25,26,0,68,69,27,28,29,66,0,38,19,39,0,44,45,156,364,0,279,487,213,51]
diff --git a/src/GF/Source/ParGF.hs b/src/GF/Source/ParGF.hs
index 5da21ac2f..dee189179 100644
--- a/src/GF/Source/ParGF.hs
+++ b/src/GF/Source/ParGF.hs
@@ -1,12 +1,12 @@
 {-# OPTIONS -fglasgow-exts -cpp #-}
 -- parser produced by Happy Version 1.13
 
-module ParGF where
-import AbsGF
-import LexGF
-import ErrM
-import Ident --H
-import Array
+module GF.Source.ParGF where
+import GF.Source.AbsGF
+import GF.Source.LexGF
+import GF.Data.ErrM
+import GF.Infra.Ident --H
+import Data.Array
 #if __GLASGOW_HASKELL__ >= 503
 import GHC.Exts
 #else
@@ -2904,7 +2904,7 @@ happyError ts =
 
 myLexer = tokens
 {-# LINE 1 "GenericTemplate.hs" #-}
--- $Id: ParGF.hs,v 1.9 2005/02/04 20:18:00 aarne Exp $
+-- $Id: ParGF.hs,v 1.10 2005/04/21 16:23:27 bringert Exp $
 
 
 
diff --git a/src/GF/Source/PrintGF.hs b/src/GF/Source/PrintGF.hs
index f51dbbdee..007ca7928 100644
--- a/src/GF/Source/PrintGF.hs
+++ b/src/GF/Source/PrintGF.hs
@@ -1,11 +1,11 @@
 
-module PrintGF where
+module GF.Source.PrintGF where
 
 -- pretty-printer generated by the BNF converter, except --H
 
-import Ident --H
-import AbsGF
-import Char
+import GF.Infra.Ident --H
+import GF.Source.AbsGF
+import Data.Char
 
 -- the top-level printing method
 printTree :: Print a => a -> String
diff --git a/src/GF/Source/SkelGF.hs b/src/GF/Source/SkelGF.hs
index 3283dd702..76e0bdc85 100644
--- a/src/GF/Source/SkelGF.hs
+++ b/src/GF/Source/SkelGF.hs
@@ -1,10 +1,10 @@
 
-module SkelGF where
+module GF.Source.SkelGF where
 
 -- Haskell module generated by the BNF converter
 
-import AbsGF
-import ErrM
+import GF.Source.AbsGF
+import GF.Data.ErrM
 type Result = Err String
 
 failure :: Show a => a -> Result
diff --git a/src/GF/Source/SourceToGrammar.hs b/src/GF/Source/SourceToGrammar.hs
index 259e4f9fe..75474200a 100644
--- a/src/GF/Source/SourceToGrammar.hs
+++ b/src/GF/Source/SourceToGrammar.hs
@@ -5,14 +5,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/24 11:46:38 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.21 $
+-- > CVS $Date: 2005/04/21 16:23:29 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.22 $
 --
 -- based on the skeleton Haskell module generated by the BNF converter
 -----------------------------------------------------------------------------
 
-module SourceToGrammar ( transGrammar,
+module GF.Source.SourceToGrammar ( transGrammar,
 			 transInclude,
 			 transModDef,
 			 transOldGrammar,
@@ -20,22 +20,22 @@ module SourceToGrammar ( transGrammar,
 			 newReservedWords
 		       ) where
 
-import qualified Grammar as G
-import qualified PrGrammar as GP
-import qualified Modules as GM
-import qualified Macros as M
-import qualified Update as U
-import qualified Option as GO
-import qualified ModDeps as GD
-import Ident
-import AbsGF
-import PrintGF
-import RemoveLiT --- for bw compat
-import Operations
-import Option
-
-import Monad
-import Char
+import qualified GF.Grammar.Grammar as G
+import qualified GF.Grammar.PrGrammar as GP
+import qualified GF.Infra.Modules as GM
+import qualified GF.Grammar.Macros as M
+import qualified GF.Compile.Update as U
+import qualified GF.Infra.Option as GO
+import qualified GF.Compile.ModDeps as GD
+import GF.Infra.Ident
+import GF.Source.AbsGF
+import GF.Source.PrintGF
+import GF.Compile.RemoveLiT --- for bw compat
+import GF.Data.Operations
+import GF.Infra.Option
+
+import Control.Monad
+import Data.Char
 
 -- based on the skeleton Haskell module generated by the BNF converter
 
diff --git a/src/GF/Source/TestGF.hs b/src/GF/Source/TestGF.hs
index 645f3a94b..65c238db2 100644
--- a/src/GF/Source/TestGF.hs
+++ b/src/GF/Source/TestGF.hs
@@ -1,19 +1,19 @@
 
 -- automatically generated by BNF Converter
-module Main where
+module GF.Source.TestGF where
 
 
-import IO ( stdin, hGetContents )
+import System.IO ( stdin, hGetContents )
 import System ( getArgs, getProgName )
 
-import LexGF
-import ParGF
-import SkelGF
-import PrintGF
-import AbsGF
+import GF.Source.LexGF
+import GF.Source.ParGF
+import GF.Source.SkelGF
+import GF.Source.PrintGF
+import GF.Source.AbsGF
 
 
-import ErrM
+import GF.Data.ErrM
 
 type ParseFun a = [Token] -> Err a