diff --git a/gf.cabal b/gf.cabal
index 1fe930bf4..1fa979a60 100644
--- a/gf.cabal
+++ b/gf.cabal
@@ -158,7 +158,7 @@ Executable gf
     build-depends: httpd-shed>=0.4.0.2, network>=2.3 && <2.6, json, cgi
                    -- ,silently
     cpp-options: -DSERVER_MODE
-    other-modules: GFServer
+    other-modules: GF.Server
     hs-source-dirs: src/server src/server/transfer src/example-based
 
   if flag(c-runtime)
@@ -251,8 +251,8 @@ Executable gf
     GF.Compile.PGFtoJS
     GF.Compile
     GF.Quiz
-    GFC
-    GFI
+    GF.Compiler
+    GF.Interactive
 
   if flag(interrupt)
     cpp-options: -DUSE_INTERRUPT
diff --git a/src/compiler/GF.hs b/src/compiler/GF.hs
index 68e43b6ca..cb63cadbe 100644
--- a/src/compiler/GF.hs
+++ b/src/compiler/GF.hs
@@ -1,7 +1,7 @@
 module Main where
 
-import GFC
-import GFI
+import GF.Compiler
+import GF.Interactive
 import GF.Data.ErrM
 import GF.Infra.Option
 import GF.Infra.UseIO
diff --git a/src/compiler/GFC.hs b/src/compiler/GF/Compiler.hs
similarity index 99%
rename from src/compiler/GFC.hs
rename to src/compiler/GF/Compiler.hs
index 4b88bd998..3be8c6e14 100644
--- a/src/compiler/GFC.hs
+++ b/src/compiler/GF/Compiler.hs
@@ -1,5 +1,4 @@
-module GFC (mainGFC, writePGF) where
--- module Main where
+module GF.Compiler (mainGFC, writePGF) where
 
 import PGF
 import PGF.Internal(concretes,optimizePGF,unionPGF)
diff --git a/src/compiler/GFI.hs b/src/compiler/GF/Interactive.hs
similarity index 99%
rename from src/compiler/GFI.hs
rename to src/compiler/GF/Interactive.hs
index 44f978cb3..745f64f84 100644
--- a/src/compiler/GFI.hs
+++ b/src/compiler/GF/Interactive.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE ScopedTypeVariables, CPP #-}
 -- | GF interactive mode
-module GFI (mainGFI,mainRunGFI,mainServerGFI) where
+module GF.Interactive (mainGFI,mainRunGFI,mainServerGFI) where
 import Prelude hiding (putStrLn,print)
 import qualified Prelude as P(putStrLn)
 import GF.Command.Interpreter(CommandEnv(..),commands,mkCommandEnv,emptyCommandEnv,interpretCommandLine)
@@ -45,7 +45,7 @@ import Control.Monad
 import GF.Text.Pretty (render)
 import qualified GF.System.Signal as IO(runInterruptibly)
 #ifdef SERVER_MODE
-import GFServer(server)
+import GF.Server(server)
 #endif
 import GF.System.Console(changeConsoleEncoding)
 
diff --git a/src/compiler/GFServer.hs b/src/compiler/GF/Server.hs
similarity index 99%
rename from src/compiler/GFServer.hs
rename to src/compiler/GF/Server.hs
index fbcca3d94..0fc7f0388 100644
--- a/src/compiler/GFServer.hs
+++ b/src/compiler/GF/Server.hs
@@ -1,6 +1,6 @@
 -- | GF server mode
 {-# LANGUAGE CPP #-}
-module GFServer(server) where
+module GF.Server(server) where
 import Data.List(partition,stripPrefix,isInfixOf)
 import qualified Data.Map as M
 import Control.Monad(when)