diff --git a/src-3.0/GF.hs b/src-3.0/GF.hs
index 70fddcd67..038d034d6 100644
--- a/src-3.0/GF.hs
+++ b/src-3.0/GF.hs
@@ -1,14 +1,13 @@
 module Main where
 
-import GF.Devel.GFC
-import GF.Devel.GFI
+import GFC
+import GFI
 
-import System (getArgs)
+import System.Environment (getArgs)
 
 main :: IO ()
 main = do
-  xx <- getArgs
-  case xx of
+  args <- getArgs
+  case args of
     "--batch":args -> mainGFC args
-    _ -> mainGFI xx
-
+    _              -> mainGFI args
diff --git a/src-3.0/GF/Devel/GFC.hs b/src-3.0/GFC.hs
similarity index 98%
rename from src-3.0/GF/Devel/GFC.hs
rename to src-3.0/GFC.hs
index 562570f14..9273117b7 100644
--- a/src-3.0/GF/Devel/GFC.hs
+++ b/src-3.0/GFC.hs
@@ -1,4 +1,4 @@
-module GF.Devel.GFC (mainGFC) where
+module GFC (mainGFC) where
 -- module Main where
 
 import GF.Compile
diff --git a/src-3.0/GF/Devel/GFI.hs b/src-3.0/GFI.hs
similarity index 98%
rename from src-3.0/GF/Devel/GFI.hs
rename to src-3.0/GFI.hs
index f78e576cf..0efbd420e 100644
--- a/src-3.0/GF/Devel/GFI.hs
+++ b/src-3.0/GFI.hs
@@ -1,4 +1,4 @@
-module GF.Devel.GFI (mainGFI) where
+module GFI (mainGFI) where
 
 import GF.Command.Interpreter
 import GF.Command.Importing