diff --git a/src/GF-embed.cabal b/src/GF-embed.cabal
index 9da6f73cf..4fcc8b54c 100644
--- a/src/GF-embed.cabal
+++ b/src/GF-embed.cabal
@@ -18,35 +18,35 @@ Library
   Exposed-Modules: 
     GF.GFCC.API
     -- needed by code generated by -haskell
-    GF.GFCC.AbsGFCC
     GF.GFCC.DataGFCC
+    GF.GFCC.Raw.AbsGFCCRaw
   Other-modules:
     GF.Conversion.SimpleToFCFG
+    GF.Data.Assoc
     GF.Data.Utilities
     GF.Data.SortedList
     GF.Data.BacktrackM
+    GF.Data.ErrM
+    GF.Data.GeneralDeduction
+    GF.Data.RedBlackSet
     GF.Text.UTF8
     GF.Infra.CompactPrint
-    GF.GFCC.PrintGFCC
-    GF.GFCC.Macros
-    GF.Formalism.FCFG
     GF.Infra.PrintClass
+    GF.Formalism.FCFG
     GF.Formalism.Utilities
-    GF.Data.Assoc
     GF.Parsing.FCFG
-    GF.GFCC.ErrM
     GF.Parsing.FCFG.PInfo
     GF.Parsing.FCFG.Range
     GF.Parsing.FCFG.Active
-    GF.Data.GeneralDeduction
-    GF.Data.RedBlackSet
     GF.Command.PPrTree
-    GF.Command.ErrM
     GF.Command.AbsGFShell
     GF.Command.PrintGFShell
     GF.Command.ParGFShell
     GF.Command.LexGFShell
-    GF.GFCC.ParGFCC
-    GF.GFCC.LexGFCC
+    GF.GFCC.CId
+    GF.GFCC.Macros
     GF.GFCC.Generate
     GF.GFCC.Linearize
+    GF.GFCC.Raw.LexGFCCRaw
+    GF.GFCC.Raw.ParGFCCRaw
+    GF.GFCC.Raw.ConvertGFCC