diff --git a/src-3.0/GF/Compile.hs b/src-3.0/GF/Compile.hs
index 80f5c0fd4..d09527982 100644
--- a/src-3.0/GF/Compile.hs
+++ b/src-3.0/GF/Compile.hs
@@ -5,13 +5,13 @@ import GF.Compile.GetGrammar
 import GF.Compile.Extend
 import GF.Compile.Rebuild
 import GF.Compile.Rename
-import GF.Grammar.Refresh
 import GF.Devel.CheckGrammar
-import GF.Devel.Optimize
+import GF.Compile.Optimize
 import GF.Devel.OptimizeGF
 import GF.Devel.GrammarToGFCC
 
 import GF.Grammar.Grammar
+import GF.Grammar.Refresh
 import GF.Infra.Ident
 import GF.Infra.Option
 import GF.Infra.CompactPrint
diff --git a/src-3.0/GF/Devel/Optimize.hs b/src-3.0/GF/Compile/Optimize.hs
similarity index 99%
rename from src-3.0/GF/Devel/Optimize.hs
rename to src-3.0/GF/Compile/Optimize.hs
index 73da712a5..909b8fda8 100644
--- a/src-3.0/GF/Devel/Optimize.hs
+++ b/src-3.0/GF/Compile/Optimize.hs
@@ -13,7 +13,7 @@
 -- Top-level partial evaluation for GF source modules.
 -----------------------------------------------------------------------------
 
-module GF.Devel.Optimize (optimizeModule) where
+module GF.Compile.Optimize (optimizeModule) where
 
 import GF.Grammar.Grammar
 import GF.Infra.Ident