diff --git a/gf.cabal b/gf.cabal
index 5d57e24f4..9aaa85d75 100644
--- a/gf.cabal
+++ b/gf.cabal
@@ -121,12 +121,12 @@ executable gf
     GF.Compile.Rename
     GF.Compile.ReadFiles
     GF.Compile.GrammarToPGF
-    GF.Compile.Concrete.TypeCheck
-    GF.Compile.Concrete.Compute
-    GF.Compile.Concrete.AppPredefined
-    GF.Compile.Abstract.TC
-    GF.Compile.Abstract.TypeCheck
-    GF.Compile.Abstract.Compute
+    GF.Compile.TypeCheck.Abstract
+    GF.Compile.TypeCheck.Concrete
+    GF.Compile.TypeCheck.TC
+    GF.Compile.Compute.Abstract
+    GF.Compile.Compute.Concrete
+    GF.Compile.Compute.AppPredefined
     GF.Compile.Optimize
     GF.Compile.SubExOpt
     GF.Compile.ModDeps
diff --git a/src/compiler/GF/Compile/CheckGrammar.hs b/src/compiler/GF/Compile/CheckGrammar.hs
index 9f0625357..b6fb796d7 100644
--- a/src/compiler/GF/Compile/CheckGrammar.hs
+++ b/src/compiler/GF/Compile/CheckGrammar.hs
@@ -25,8 +25,8 @@ module GF.Compile.CheckGrammar(checkModule) where
 import GF.Infra.Ident
 import GF.Infra.Modules
 
-import GF.Compile.Abstract.TypeCheck
-import GF.Compile.Concrete.TypeCheck
+import GF.Compile.TypeCheck.Abstract
+import GF.Compile.TypeCheck.Concrete
 
 import GF.Grammar
 import GF.Grammar.Lexer
diff --git a/src/compiler/GF/Compile/Abstract/Compute.hs b/src/compiler/GF/Compile/Compute/Abstract.hs
similarity index 99%
rename from src/compiler/GF/Compile/Abstract/Compute.hs
rename to src/compiler/GF/Compile/Compute/Abstract.hs
index 3ca9fe432..ef7974314 100644
--- a/src/compiler/GF/Compile/Abstract/Compute.hs
+++ b/src/compiler/GF/Compile/Compute/Abstract.hs
@@ -14,7 +14,7 @@
 -- old GF computation; to be updated
 -----------------------------------------------------------------------------
 
-module GF.Compile.Abstract.Compute (LookDef,
+module GF.Compile.Compute.Abstract (LookDef,
 		   compute, 
 		   computeAbsTerm, 
 		   computeAbsTermIn, 
diff --git a/src/compiler/GF/Compile/Concrete/AppPredefined.hs b/src/compiler/GF/Compile/Compute/AppPredefined.hs
similarity index 98%
rename from src/compiler/GF/Compile/Concrete/AppPredefined.hs
rename to src/compiler/GF/Compile/Compute/AppPredefined.hs
index 30f555b60..94dc67022 100644
--- a/src/compiler/GF/Compile/Concrete/AppPredefined.hs
+++ b/src/compiler/GF/Compile/Compute/AppPredefined.hs
@@ -12,7 +12,7 @@
 -- Predefined function type signatures and definitions.
 -----------------------------------------------------------------------------
 
-module GF.Compile.Concrete.AppPredefined (isInPredefined, typPredefined, appPredefined
+module GF.Compile.Compute.AppPredefined (isInPredefined, typPredefined, appPredefined
 		     ) where
 
 import GF.Infra.Ident
diff --git a/src/compiler/GF/Compile/Concrete/Compute.hs b/src/compiler/GF/Compile/Compute/Concrete.hs
similarity index 99%
rename from src/compiler/GF/Compile/Concrete/Compute.hs
rename to src/compiler/GF/Compile/Compute/Concrete.hs
index ce76479a6..535bb9fcd 100644
--- a/src/compiler/GF/Compile/Concrete/Compute.hs
+++ b/src/compiler/GF/Compile/Compute/Concrete.hs
@@ -12,7 +12,7 @@
 -- Computation of source terms. Used in compilation and in @cc@ command.
 -----------------------------------------------------------------------------
 
-module GF.Compile.Concrete.Compute (computeConcrete, computeTerm,computeConcreteRec) where
+module GF.Compile.Compute.Concrete (computeConcrete, computeTerm,computeConcreteRec) where
 
 import GF.Data.Operations
 import GF.Grammar.Grammar
@@ -28,7 +28,7 @@ import GF.Compile.Refresh
 import GF.Grammar.PatternMatch
 import GF.Grammar.Lockfield (isLockLabel,unlockRecord) ----
 
-import GF.Compile.Concrete.AppPredefined
+import GF.Compile.Compute.AppPredefined
 
 import Data.List (nub,intersperse)
 import Control.Monad (liftM2, liftM)
diff --git a/src/compiler/GF/Compile/GrammarToPGF.hs b/src/compiler/GF/Compile/GrammarToPGF.hs
index d0ce1a16d..9b0f9293d 100644
--- a/src/compiler/GF/Compile/GrammarToPGF.hs
+++ b/src/compiler/GF/Compile/GrammarToPGF.hs
@@ -15,7 +15,7 @@ import GF.Grammar.Grammar
 import qualified GF.Grammar.Lookup as Look
 import qualified GF.Grammar as A
 import qualified GF.Grammar.Macros as GM
-import qualified GF.Compile.Concrete.Compute as Compute ---- 
+import qualified GF.Compile.Compute.Concrete as Compute ---- 
 import qualified GF.Infra.Modules as M
 import qualified GF.Infra.Option as O
 
diff --git a/src/compiler/GF/Compile/Optimize.hs b/src/compiler/GF/Compile/Optimize.hs
index a8a45fd60..43d7cde95 100644
--- a/src/compiler/GF/Compile/Optimize.hs
+++ b/src/compiler/GF/Compile/Optimize.hs
@@ -23,7 +23,7 @@ import GF.Grammar.Macros
 import GF.Grammar.Lookup
 import GF.Grammar.Predef
 import GF.Compile.Refresh
-import GF.Compile.Concrete.Compute
+import GF.Compile.Compute.Concrete
 import GF.Compile.CheckGrammar
 import GF.Compile.Update
 
diff --git a/src/compiler/GF/Compile/Abstract/TypeCheck.hs b/src/compiler/GF/Compile/TypeCheck/Abstract.hs
similarity index 94%
rename from src/compiler/GF/Compile/Abstract/TypeCheck.hs
rename to src/compiler/GF/Compile/TypeCheck/Abstract.hs
index 74804983d..d6886b6ca 100644
--- a/src/compiler/GF/Compile/Abstract/TypeCheck.hs
+++ b/src/compiler/GF/Compile/TypeCheck/Abstract.hs
@@ -12,7 +12,7 @@
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module GF.Compile.Abstract.TypeCheck (-- * top-level type checking functions; TC should not be called directly.
+module GF.Compile.TypeCheck.Abstract (-- * top-level type checking functions; TC should not be called directly.
 		  checkContext,
 		  checkTyp,
 		  checkDef,
@@ -26,8 +26,8 @@ import GF.Grammar
 import GF.Grammar.Lookup
 import GF.Grammar.Unify
 import GF.Compile.Refresh
-import GF.Compile.Abstract.Compute
-import GF.Compile.Abstract.TC
+import GF.Compile.Compute.Abstract
+import GF.Compile.TypeCheck.TC
 
 import Text.PrettyPrint
 import Control.Monad (foldM, liftM, liftM2)
diff --git a/src/compiler/GF/Compile/Concrete/TypeCheck.hs b/src/compiler/GF/Compile/TypeCheck/Concrete.hs
similarity index 99%
rename from src/compiler/GF/Compile/Concrete/TypeCheck.hs
rename to src/compiler/GF/Compile/TypeCheck/Concrete.hs
index 04674103f..a36e17aad 100644
--- a/src/compiler/GF/Compile/Concrete/TypeCheck.hs
+++ b/src/compiler/GF/Compile/TypeCheck/Concrete.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE PatternGuards #-}
-module GF.Compile.Concrete.TypeCheck( checkLType, inferLType, computeLType, ppType ) where
+module GF.Compile.TypeCheck.Concrete( checkLType, inferLType, computeLType, ppType ) where
 
 import GF.Infra.CheckM
 import GF.Infra.Modules
@@ -10,7 +10,7 @@ import GF.Grammar.Lookup
 import GF.Grammar.Predef
 import GF.Grammar.PatternMatch
 import GF.Grammar.Lockfield (isLockLabel, lockRecType, unlockRecord)
-import GF.Compile.Concrete.AppPredefined
+import GF.Compile.Compute.AppPredefined
 
 import Data.List
 import Control.Monad
diff --git a/src/compiler/GF/Compile/Abstract/TC.hs b/src/compiler/GF/Compile/TypeCheck/TC.hs
similarity index 99%
rename from src/compiler/GF/Compile/Abstract/TC.hs
rename to src/compiler/GF/Compile/TypeCheck/TC.hs
index 68b1691ec..43e1a07e1 100644
--- a/src/compiler/GF/Compile/Abstract/TC.hs
+++ b/src/compiler/GF/Compile/TypeCheck/TC.hs
@@ -12,7 +12,7 @@
 -- Thierry Coquand's type checking algorithm that creates a trace
 -----------------------------------------------------------------------------
 
-module GF.Compile.Abstract.TC (AExp(..),
+module GF.Compile.TypeCheck.TC (AExp(..),
 	   Theory,
 	   checkExp,
 	   inferExp,
diff --git a/src/compiler/GFI.hs b/src/compiler/GFI.hs
index b844c4654..73aebc960 100644
--- a/src/compiler/GFI.hs
+++ b/src/compiler/GFI.hs
@@ -12,8 +12,8 @@ import GF.Grammar hiding (Ident)
 import GF.Grammar.Parser (runP, pExp)
 import GF.Grammar.ShowTerm
 import GF.Compile.Rename
-import GF.Compile.Concrete.Compute (computeConcrete)
-import GF.Compile.Concrete.TypeCheck (inferLType)
+import GF.Compile.Compute.Concrete (computeConcrete)
+import GF.Compile.TypeCheck.Concrete (inferLType)
 import GF.Infra.Dependencies
 import GF.Infra.CheckM
 import GF.Infra.UseIO