diff --git a/src/GHCMod/Options/Commands.hs b/Language/Haskell/GhcMod/Options/Commands.hs
similarity index 98%
rename from src/GHCMod/Options/Commands.hs
rename to Language/Haskell/GhcMod/Options/Commands.hs
index 2e1f60a..b39663a 100644
--- a/src/GHCMod/Options/Commands.hs
+++ b/Language/Haskell/GhcMod/Options/Commands.hs
@@ -16,15 +16,15 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# OPTIONS_GHC -fno-warn-unused-do-bind #-}
 
-module GHCMod.Options.Commands where
+module Language.Haskell.GhcMod.Options.Commands where
 
 import Options.Applicative
 import Options.Applicative.Types
 import Options.Applicative.Builder.Internal
 import Language.Haskell.GhcMod.Types
 import Language.Haskell.GhcMod.Read
-import GHCMod.Options.DocUtils
-import GHCMod.Options.Help
+import Language.Haskell.GhcMod.Options.DocUtils
+import Language.Haskell.GhcMod.Options.Help
 
 type Symbol = String
 type Expr = String
diff --git a/src/GHCMod/Options/DocUtils.hs b/Language/Haskell/GhcMod/Options/DocUtils.hs
similarity index 96%
rename from src/GHCMod/Options/DocUtils.hs
rename to Language/Haskell/GhcMod/Options/DocUtils.hs
index 95fad26..c81dec8 100644
--- a/src/GHCMod/Options/DocUtils.hs
+++ b/Language/Haskell/GhcMod/Options/DocUtils.hs
@@ -14,7 +14,7 @@
 -- You should have received a copy of the GNU Affero General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-module GHCMod.Options.DocUtils (
+module Language.Haskell.GhcMod.Options.DocUtils (
   ($$),
   ($$$),
   (<=>),
diff --git a/src/GHCMod/Options/Help.hs b/Language/Haskell/GhcMod/Options/Help.hs
similarity index 97%
rename from src/GHCMod/Options/Help.hs
rename to Language/Haskell/GhcMod/Options/Help.hs
index 9e33194..d43b6fb 100644
--- a/src/GHCMod/Options/Help.hs
+++ b/Language/Haskell/GhcMod/Options/Help.hs
@@ -15,7 +15,7 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 {-# LANGUAGE OverloadedStrings, FlexibleInstances, GeneralizedNewtypeDeriving #-}
 
-module GHCMod.Options.Help where
+module Language.Haskell.GhcMod.Options.Help where
 
 import Options.Applicative
 import Options.Applicative.Help.Pretty (Doc)
diff --git a/src/GHCMod/Options.hs b/Language/Haskell/GhcMod/Options/Options.hs
similarity index 95%
rename from src/GHCMod/Options.hs
rename to Language/Haskell/GhcMod/Options/Options.hs
index 0a2a73e..6f95e02 100644
--- a/src/GHCMod/Options.hs
+++ b/Language/Haskell/GhcMod/Options/Options.hs
@@ -16,7 +16,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# OPTIONS_GHC -fno-warn-unused-do-bind #-}
 
-module GHCMod.Options (
+module Language.Haskell.GhcMod.Options.Options (
   parseArgs,
   parseArgsInteractive,
   GhcModCommands(..)
@@ -29,11 +29,11 @@ import Control.Arrow
 import Data.Char (toUpper, toLower)
 import Data.List (intercalate)
 import Language.Haskell.GhcMod.Read
-import GHCMod.Options.Commands
-import GHCMod.Version
-import GHCMod.Options.DocUtils
-import GHCMod.Options.Help
-import GHCMod.Options.ShellParse
+import Language.Haskell.GhcMod.Options.Commands
+import Language.Haskell.GhcMod.Options.Version
+import Language.Haskell.GhcMod.Options.DocUtils
+import Language.Haskell.GhcMod.Options.Help
+import Language.Haskell.GhcMod.Options.ShellParse
 
 parseArgs :: IO (Options, GhcModCommands)
 parseArgs =
diff --git a/src/GHCMod/Options/ShellParse.hs b/Language/Haskell/GhcMod/Options/ShellParse.hs
similarity index 95%
rename from src/GHCMod/Options/ShellParse.hs
rename to Language/Haskell/GhcMod/Options/ShellParse.hs
index acd609b..a807932 100644
--- a/src/GHCMod/Options/ShellParse.hs
+++ b/Language/Haskell/GhcMod/Options/ShellParse.hs
@@ -13,7 +13,7 @@
 --
 -- You should have received a copy of the GNU Affero General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-module GHCMod.Options.ShellParse (parseCmdLine) where
+module Language.Haskell.GhcMod.Options.ShellParse (parseCmdLine) where
 
 import Data.Char
 import Data.List
diff --git a/src/GHCMod/Version.hs b/Language/Haskell/GhcMod/Options/Version.hs
similarity index 95%
rename from src/GHCMod/Version.hs
rename to Language/Haskell/GhcMod/Options/Version.hs
index 2bf6db2..72d7371 100644
--- a/src/GHCMod/Version.hs
+++ b/Language/Haskell/GhcMod/Options/Version.hs
@@ -14,7 +14,7 @@
 -- You should have received a copy of the GNU Affero General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-module GHCMod.Version where
+module Language.Haskell.GhcMod.Options.Version where
 
 import Paths_ghc_mod
 import Data.Version (showVersion)
diff --git a/ghc-mod.cabal b/ghc-mod.cabal
index 01358b5..def5ce7 100644
--- a/ghc-mod.cabal
+++ b/ghc-mod.cabal
@@ -152,6 +152,13 @@ Library
                         Language.Haskell.GhcMod.Types
                         Language.Haskell.GhcMod.Utils
                         Language.Haskell.GhcMod.World
+
+                        Language.Haskell.GhcMod.Options.Options
+                        Language.Haskell.GhcMod.Options.Commands
+                        Language.Haskell.GhcMod.Options.Version
+                        Language.Haskell.GhcMod.Options.DocUtils
+                        Language.Haskell.GhcMod.Options.ShellParse
+                        Language.Haskell.GhcMod.Options.Help
   Other-Modules:        Paths_ghc_mod
                         Utils
                         Data.Binary.Generic
@@ -187,6 +194,7 @@ Library
                       , extra             == 1.4.*
                       , pipes             == 4.1.*
                       , safe              < 0.4 && >= 0.3.9
+                      , optparse-applicative >=0.11.0 && <0.13.0
   if impl(ghc < 7.8)
     Build-Depends:      convertible
   if impl(ghc < 7.5)
@@ -198,12 +206,6 @@ Executable ghc-mod
   Default-Language:     Haskell2010
   Main-Is:              GHCMod.hs
   Other-Modules:        Paths_ghc_mod
-                      , GHCMod.Options
-                      , GHCMod.Options.Commands
-                      , GHCMod.Version
-                      , GHCMod.Options.DocUtils
-                      , GHCMod.Options.ShellParse
-                      , GHCMod.Options.Help
   GHC-Options:          -Wall -fno-warn-deprecations -threaded
   Default-Extensions:   ConstraintKinds, FlexibleContexts
   HS-Source-Dirs:       src
@@ -217,7 +219,6 @@ Executable ghc-mod
                       , ghc       < 7.11
                       , monad-control ==1.0.*
                       , fclabels  ==2.0.*
-                      , optparse-applicative >=0.11.0 && <0.13.0
                       , ghc-mod
 
 Executable ghc-modi
diff --git a/src/GHCMod.hs b/src/GHCMod.hs
index fdade72..23e40d4 100644
--- a/src/GHCMod.hs
+++ b/src/GHCMod.hs
@@ -19,7 +19,7 @@ import System.Directory (setCurrentDirectory, getAppUserDataDirectory,
 import System.IO
 import System.Exit
 import Text.PrettyPrint hiding ((<>))
-import GHCMod.Options
+import Language.Haskell.GhcMod.Options.Options
 import Prelude
 
 ghcModStyle :: Style