diff --git a/src-3.0/GF/Devel/GFCCtoHaskell.hs b/src-3.0/GF/GFCC/GFCCtoHaskell.hs
similarity index 98%
rename from src-3.0/GF/Devel/GFCCtoHaskell.hs
rename to src-3.0/GF/GFCC/GFCCtoHaskell.hs
index 4b042d9ec..c29d88b1a 100644
--- a/src-3.0/GF/Devel/GFCCtoHaskell.hs
+++ b/src-3.0/GF/GFCC/GFCCtoHaskell.hs
@@ -14,7 +14,7 @@
 -- AR 11/11/1999 -- 7/12/2000 -- 18/5/2004
 -----------------------------------------------------------------------------
 
-module GF.Devel.GFCCtoHaskell (grammar2haskell, grammar2haskellGADT) where
+module GF.GFCC.GFCCtoHaskell (grammar2haskell, grammar2haskellGADT) where
 
 import GF.GFCC.Macros
 import GF.GFCC.DataGFCC
diff --git a/src-3.0/GF/Devel/GFCCtoJS.hs b/src-3.0/GF/GFCC/GFCCtoJS.hs
similarity index 99%
rename from src-3.0/GF/Devel/GFCCtoJS.hs
rename to src-3.0/GF/GFCC/GFCCtoJS.hs
index 80a4115d2..d32133ab2 100644
--- a/src-3.0/GF/Devel/GFCCtoJS.hs
+++ b/src-3.0/GF/GFCC/GFCCtoJS.hs
@@ -1,4 +1,4 @@
-module GF.Devel.GFCCtoJS (gfcc2js) where
+module GF.GFCC.GFCCtoJS (gfcc2js) where
 
 import qualified GF.GFCC.Macros as M
 import qualified GF.GFCC.DataGFCC as D
diff --git a/src-3.0/GF/GFCC/PrintGFCC.hs b/src-3.0/GF/GFCC/PrintGFCC.hs
index d0dde05f4..aea34fb68 100644
--- a/src-3.0/GF/GFCC/PrintGFCC.hs
+++ b/src-3.0/GF/GFCC/PrintGFCC.hs
@@ -3,8 +3,8 @@ module GF.GFCC.PrintGFCC where
 import GF.GFCC.DataGFCC (GFCC)
 import GF.GFCC.Raw.ConvertGFCC (fromGFCC)
 import GF.GFCC.Raw.PrintGFCCRaw (printTree)
-import GF.Devel.GFCCtoHaskell
-import GF.Devel.GFCCtoJS
+import GF.GFCC.GFCCtoHaskell
+import GF.GFCC.GFCCtoJS
 import GF.Text.UTF8
 
 -- top-level access to code generation