Move modules

26 files changed, 168 insertions, 159 deletions

diff --git a/src/Language/Haskell/Stylish.hs b/src/Language/Haskell/Stylish.hs
index ccad070..d8ee3df 100644
--- a/src/Language/Haskell/Stylish.hs
+++ b/src/Language/Haskell/Stylish.hs
@@ -1,3 +1,4 @@
+--------------------------------------------------------------------------------
 module Language.Haskell.Stylish
     ( -- * Run
       runSteps
@@ -14,41 +15,55 @@ module Language.Haskell.Stylish
       -- ** Helpers
     , stepName
       -- * Config
-    , module StylishHaskell.Config
+    , module Language.Haskell.Stylish.Config
       -- * Misc
-    , module StylishHaskell.Verbose
+    , module Language.Haskell.Stylish.Verbose
     , version
     , Lines
     , Step
     ) where
 
-import StylishHaskell
-import StylishHaskell.Config
-import StylishHaskell.Step
-import StylishHaskell.Verbose
+
+--------------------------------------------------------------------------------
+import Control.Applicative ((<$>))
+import Control.Monad (foldM)
+
+
+--------------------------------------------------------------------------------
+import Language.Haskell.Stylish.Config
+import Language.Haskell.Stylish.Step
+import Language.Haskell.Stylish.Verbose
+import Language.Haskell.Stylish.Parse
 import Paths_stylish_haskell  (version)
+import qualified Language.Haskell.Stylish.Step.Imports as Imports
+import qualified Language.Haskell.Stylish.Step.LanguagePragmas as LanguagePragmas
+import qualified Language.Haskell.Stylish.Step.Records as Records
+import qualified Language.Haskell.Stylish.Step.Tabs as Tabs
+import qualified Language.Haskell.Stylish.Step.TrailingWhitespace as TrailingWhitespace
+import qualified Language.Haskell.Stylish.Step.UnicodeSyntax as UnicodeSyntax
 
-import qualified StylishHaskell.Step.Imports as Imports
-import qualified StylishHaskell.Step.LanguagePragmas as LanguagePragmas
-import qualified StylishHaskell.Step.Records as Records
-import qualified StylishHaskell.Step.Tabs as Tabs
-import qualified StylishHaskell.Step.TrailingWhitespace as TrailingWhitespace
-import qualified StylishHaskell.Step.UnicodeSyntax as UnicodeSyntax
 
+--------------------------------------------------------------------------------
 imports :: Int -- ^ columns
         -> Imports.Align
         -> Step
 imports = Imports.step
 
+
+--------------------------------------------------------------------------------
 languagePragmas :: Int -- ^ columns
                 -> LanguagePragmas.Style
                 -> Bool -- ^ remove redundant?
                 -> Step
 languagePragmas = LanguagePragmas.step
 
+
+--------------------------------------------------------------------------------
 records :: Step
 records = Records.step
 
+
+--------------------------------------------------------------------------------
 tabs :: Int -- ^ number of spaces
      -> Step
 tabs = Tabs.step
@@ -56,6 +71,20 @@ tabs = Tabs.step
 trailingWhitespace :: Step
 trailingWhitespace = TrailingWhitespace.step
 
+
+--------------------------------------------------------------------------------
 unicodeSyntax :: Bool -- ^ add language pragma?
               -> Step
 unicodeSyntax = UnicodeSyntax.step
+
+
+--------------------------------------------------------------------------------
+runStep :: Extensions -> Maybe FilePath -> Lines -> Step -> Either String Lines
+runStep exts mfp ls step =
+    stepFilter step ls <$> parseModule exts mfp (unlines ls)
+
+
+--------------------------------------------------------------------------------
+runSteps :: Extensions -> Maybe FilePath -> [Step] -> Lines
+         -> Either String Lines
+runSteps exts mfp steps ls = foldM (runStep exts mfp) ls steps
diff --git a/src/StylishHaskell/Block.hs b/src/Language/Haskell/Stylish/Block.hs
index 3d9e25c..bc47d18 100644
--- a/src/StylishHaskell/Block.hs
+++ b/src/Language/Haskell/Stylish/Block.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.Block
+module Language.Haskell.Stylish.Block
     ( Block (..)
     , LineBlock
     , SpanBlock
diff --git a/src/StylishHaskell/Config.hs b/src/Language/Haskell/Stylish/Config.hs
index 9d39ccd..4c28a3f 100644
--- a/src/StylishHaskell/Config.hs
+++ b/src/Language/Haskell/Stylish/Config.hs
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 {-# LANGUAGE OverloadedStrings #-}
-module StylishHaskell.Config
+module Language.Haskell.Stylish.Config
     ( Extensions
     , Config (..)
     , defaultConfigFilePath
@@ -26,14 +26,14 @@ import           System.FilePath                        ((</>))
 
 --------------------------------------------------------------------------------
 import           Paths_stylish_haskell                  (getDataFileName)
-import           StylishHaskell.Step
-import qualified StylishHaskell.Step.Imports            as Imports
-import qualified StylishHaskell.Step.LanguagePragmas    as LanguagePragmas
-import qualified StylishHaskell.Step.Records            as Records
-import qualified StylishHaskell.Step.Tabs               as Tabs
-import qualified StylishHaskell.Step.TrailingWhitespace as TrailingWhitespace
-import qualified StylishHaskell.Step.UnicodeSyntax      as UnicodeSyntax
-import           StylishHaskell.Verbose
+import           Language.Haskell.Stylish.Step
+import qualified Language.Haskell.Stylish.Step.Imports            as Imports
+import qualified Language.Haskell.Stylish.Step.LanguagePragmas    as LanguagePragmas
+import qualified Language.Haskell.Stylish.Step.Records            as Records
+import qualified Language.Haskell.Stylish.Step.Tabs               as Tabs
+import qualified Language.Haskell.Stylish.Step.TrailingWhitespace as TrailingWhitespace
+import qualified Language.Haskell.Stylish.Step.UnicodeSyntax      as UnicodeSyntax
+import           Language.Haskell.Stylish.Verbose
 
 
 --------------------------------------------------------------------------------
@@ -101,7 +101,7 @@ loadConfig verbose mfp = do
             bs <- B.readFile fp
             case decodeEither bs of
                 Left err     -> error $
-                    "StylishHaskell.Config.loadConfig: " ++ err
+                    "Language.Haskell.Stylish.Config.loadConfig: " ++ err
                 Right config -> return config
 
 
diff --git a/src/StylishHaskell/Editor.hs b/src/Language/Haskell/Stylish/Editor.hs
index 072cb10..5d5a864 100644
--- a/src/StylishHaskell/Editor.hs
+++ b/src/Language/Haskell/Stylish/Editor.hs
@@ -6,7 +6,7 @@
 --
 -- when this is evaluated, we take into account that 4th line will become the
 -- 3rd line before it needs changing.
-module StylishHaskell.Editor
+module Language.Haskell.Stylish.Editor
     ( Change
     , applyChanges
 
@@ -19,7 +19,7 @@ module StylishHaskell.Editor
 
 
 --------------------------------------------------------------------------------
-import           StylishHaskell.Block
+import           Language.Haskell.Stylish.Block
 
 
 --------------------------------------------------------------------------------
@@ -39,7 +39,7 @@ moveChange offset (Change block ls) = Change (moveBlock offset block) ls
 applyChanges :: [Change a] -> [a] -> [a]
 applyChanges changes
     | overlapping blocks = error $
-        "StylishHaskell.Editor.applyChanges: " ++
+        "Language.Haskell.Stylish.Editor.applyChanges: " ++
         "refusing to make overlapping changes"
     | otherwise          = go 1 changes
   where
diff --git a/src/StylishHaskell/Parse.hs b/src/Language/Haskell/Stylish/Parse.hs
index 97e9044..84b47c2 100644
--- a/src/StylishHaskell/Parse.hs
+++ b/src/Language/Haskell/Stylish/Parse.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.Parse
+module Language.Haskell.Stylish.Parse
     ( parseModule
     ) where
 
@@ -11,8 +11,8 @@ import qualified Language.Haskell.Exts.Annotated as H
 
 
 --------------------------------------------------------------------------------
-import           StylishHaskell.Config
-import           StylishHaskell.Step
+import           Language.Haskell.Stylish.Config
+import           Language.Haskell.Stylish.Step
 
 
 --------------------------------------------------------------------------------
@@ -60,5 +60,5 @@ parseModule extraExts mfp string = do
     case H.parseModuleWithComments mode string' of
         H.ParseOk md -> return md
         err          -> throwError $
-            "StylishHaskell.Parse.parseModule: could not parse " ++
+            "Language.Haskell.Stylish.Parse.parseModule: could not parse " ++
             fp ++ ": " ++ show err
diff --git a/src/StylishHaskell/Step.hs b/src/Language/Haskell/Stylish/Step.hs
index ed8c3c4..f053f8b 100644
--- a/src/StylishHaskell/Step.hs
+++ b/src/Language/Haskell/Stylish/Step.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.Step
+module Language.Haskell.Stylish.Step
     ( Lines
     , Module
     , Step (..)
diff --git a/src/StylishHaskell/Step/Imports.hs b/src/Language/Haskell/Stylish/Step/Imports.hs
index b5a2899..9699627 100644
--- a/src/StylishHaskell/Step/Imports.hs
+++ b/src/Language/Haskell/Stylish/Step/Imports.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.Step.Imports
+module Language.Haskell.Stylish.Step.Imports
     ( Align (..)
     , step
     ) where
@@ -15,10 +15,10 @@ import qualified Language.Haskell.Exts.Annotated as H
 
 
 --------------------------------------------------------------------------------
-import           StylishHaskell.Block
-import           StylishHaskell.Editor
-import           StylishHaskell.Step
-import           StylishHaskell.Util
+import           Language.Haskell.Stylish.Block
+import           Language.Haskell.Stylish.Editor
+import           Language.Haskell.Stylish.Step
+import           Language.Haskell.Stylish.Util
 
 
 --------------------------------------------------------------------------------
diff --git a/src/StylishHaskell/Step/LanguagePragmas.hs b/src/Language/Haskell/Stylish/Step/LanguagePragmas.hs
index 9a99b6b..8d71c68 100644
--- a/src/StylishHaskell/Step/LanguagePragmas.hs
+++ b/src/Language/Haskell/Stylish/Step/LanguagePragmas.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.Step.LanguagePragmas
+module Language.Haskell.Stylish.Step.LanguagePragmas
     ( Style (..)
     , step
 
@@ -14,10 +14,10 @@ import qualified Language.Haskell.Exts.Annotated as H
 
 
 --------------------------------------------------------------------------------
-import           StylishHaskell.Block
-import           StylishHaskell.Editor
-import           StylishHaskell.Step
-import           StylishHaskell.Util
+import           Language.Haskell.Stylish.Block
+import           Language.Haskell.Stylish.Editor
+import           Language.Haskell.Stylish.Step
+import           Language.Haskell.Stylish.Util
 
 
 --------------------------------------------------------------------------------
diff --git a/src/StylishHaskell/Step/Records.hs b/src/Language/Haskell/Stylish/Step/Records.hs
index 3b65e31..c6c48f7 100644
--- a/src/StylishHaskell/Step/Records.hs
+++ b/src/Language/Haskell/Stylish/Step/Records.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.Step.Records
+module Language.Haskell.Stylish.Step.Records
     ( step
     ) where
 
@@ -11,9 +11,9 @@ import qualified Language.Haskell.Exts.Annotated as H
 
 
 --------------------------------------------------------------------------------
-import           StylishHaskell.Editor
-import           StylishHaskell.Step
-import           StylishHaskell.Util
+import           Language.Haskell.Stylish.Editor
+import           Language.Haskell.Stylish.Step
+import           Language.Haskell.Stylish.Util
 
 
 --------------------------------------------------------------------------------
diff --git a/src/StylishHaskell/Step/Tabs.hs b/src/Language/Haskell/Stylish/Step/Tabs.hs
index e3da549..0694cd9 100644
--- a/src/StylishHaskell/Step/Tabs.hs
+++ b/src/Language/Haskell/Stylish/Step/Tabs.hs
@@ -1,11 +1,11 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.Step.Tabs
+module Language.Haskell.Stylish.Step.Tabs
     ( step
     ) where
 
 
 --------------------------------------------------------------------------------
-import           StylishHaskell.Step
+import           Language.Haskell.Stylish.Step
 
 
 --------------------------------------------------------------------------------
diff --git a/src/StylishHaskell/Step/TrailingWhitespace.hs b/src/Language/Haskell/Stylish/Step/TrailingWhitespace.hs
index 52e03e1..dbc594c 100644
--- a/src/StylishHaskell/Step/TrailingWhitespace.hs
+++ b/src/Language/Haskell/Stylish/Step/TrailingWhitespace.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.Step.TrailingWhitespace
+module Language.Haskell.Stylish.Step.TrailingWhitespace
     ( step
     ) where
 
@@ -9,7 +9,7 @@ import           Data.Char           (isSpace)
 
 
 --------------------------------------------------------------------------------
-import           StylishHaskell.Step
+import           Language.Haskell.Stylish.Step
 
 
 --------------------------------------------------------------------------------
diff --git a/src/StylishHaskell/Step/UnicodeSyntax.hs b/src/Language/Haskell/Stylish/Step/UnicodeSyntax.hs
index c866c5f..1e00275 100644
--- a/src/StylishHaskell/Step/UnicodeSyntax.hs
+++ b/src/Language/Haskell/Stylish/Step/UnicodeSyntax.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.Step.UnicodeSyntax
+module Language.Haskell.Stylish.Step.UnicodeSyntax
     ( step
     ) where
 
@@ -13,11 +13,11 @@ import qualified Language.Haskell.Exts.Annotated     as H
 
 
 --------------------------------------------------------------------------------
-import           StylishHaskell.Block
-import           StylishHaskell.Editor
-import           StylishHaskell.Step
-import           StylishHaskell.Step.LanguagePragmas (addLanguagePragma)
-import           StylishHaskell.Util
+import           Language.Haskell.Stylish.Block
+import           Language.Haskell.Stylish.Editor
+import           Language.Haskell.Stylish.Step
+import           Language.Haskell.Stylish.Step.LanguagePragmas (addLanguagePragma)
+import           Language.Haskell.Stylish.Util
 
 
 --------------------------------------------------------------------------------
diff --git a/src/StylishHaskell/Util.hs b/src/Language/Haskell/Stylish/Util.hs
index 2dde009..bd0a466 100644
--- a/src/StylishHaskell/Util.hs
+++ b/src/Language/Haskell/Stylish/Util.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.Util
+module Language.Haskell.Stylish.Util
     ( nameToString
     , indent
     , padRight
@@ -23,7 +23,7 @@ import qualified Language.Haskell.Exts.Annotated as H
 
 
 --------------------------------------------------------------------------------
-import           StylishHaskell.Step
+import           Language.Haskell.Stylish.Step
 
 
 --------------------------------------------------------------------------------
diff --git a/src/StylishHaskell/Verbose.hs b/src/Language/Haskell/Stylish/Verbose.hs
index bd88843..5519e43 100644
--- a/src/StylishHaskell/Verbose.hs
+++ b/src/Language/Haskell/Stylish/Verbose.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.Verbose
+module Language.Haskell.Stylish.Verbose
     ( Verbose
     , makeVerbose
     ) where
diff --git a/app/Main.hs b/src/Main.hs
index f97d45d..f97d45d 100644
--- a/app/Main.hs
+++ b/src/Main.hs
diff --git a/src/StylishHaskell.hs b/src/StylishHaskell.hs
deleted file mode 100644
index e588655..0000000
--- a/src/StylishHaskell.hs
+++ /dev/null
@@ -1,28 +0,0 @@
---------------------------------------------------------------------------------
-module StylishHaskell
-    ( runStep
-    , runSteps
-    ) where
-
-
---------------------------------------------------------------------------------
-import           Control.Applicative   ((<$>))
-import           Control.Monad         (foldM)
-
-
---------------------------------------------------------------------------------
-import           StylishHaskell.Config
-import           StylishHaskell.Parse
-import           StylishHaskell.Step
-
-
---------------------------------------------------------------------------------
-runStep :: Extensions -> Maybe FilePath -> Lines -> Step -> Either String Lines
-runStep exts mfp ls step =
-    stepFilter step ls <$> parseModule exts mfp (unlines ls)
-
-
---------------------------------------------------------------------------------
-runSteps :: Extensions -> Maybe FilePath -> [Step] -> Lines
-         -> Either String Lines
-runSteps exts mfp steps ls = foldM (runStep exts mfp) ls steps
diff --git a/stylish-haskell.cabal b/stylish-haskell.cabal
index 88ce3e3..bc1a02d 100644
--- a/stylish-haskell.cabal
+++ b/stylish-haskell.cabal
@@ -25,22 +25,21 @@ Library
   Exposed-modules: Language.Haskell.Stylish
   Hs-source-dirs: src
   Ghc-options:    -Wall
-  other-modules:
-    Paths_stylish_haskell
-    StylishHaskell
-    StylishHaskell.Block
-    StylishHaskell.Config
-    StylishHaskell.Editor
-    StylishHaskell.Parse
-    StylishHaskell.Step
-    StylishHaskell.Step.Imports
-    StylishHaskell.Step.LanguagePragmas
-    StylishHaskell.Step.Records
-    StylishHaskell.Step.Tabs
-    StylishHaskell.Step.TrailingWhitespace
-    StylishHaskell.Step.UnicodeSyntax
-    StylishHaskell.Util
-    StylishHaskell.Verbose
+
+  Other-modules:
+    Language.Haskell.Stylish.Block
+    Language.Haskell.Stylish.Config
+    Language.Haskell.Stylish.Editor
+    Language.Haskell.Stylish.Parse
+    Language.Haskell.Stylish.Step
+    Language.Haskell.Stylish.Step.Imports
+    Language.Haskell.Stylish.Step.LanguagePragmas
+    Language.Haskell.Stylish.Step.Records
+    Language.Haskell.Stylish.Step.Tabs
+    Language.Haskell.Stylish.Step.TrailingWhitespace
+    Language.Haskell.Stylish.Step.UnicodeSyntax
+    Language.Haskell.Stylish.Util
+    Language.Haskell.Stylish.Verbose
 
   Build-depends:
     aeson            >= 0.6  && < 0.7,
@@ -56,14 +55,24 @@ Library
 
 Executable stylish-haskell
   Ghc-options:    -Wall
-  Hs-source-dirs: app
+  Hs-source-dirs: src
   Main-is:        Main.hs
 
   Build-depends:
-    base             >= 4    && < 5,
-    cmdargs          >= 0.9  && < 0.11,
+    stylish-haskell,
     strict           >= 0.3  && < 0.4,
-    stylish-haskell
+    cmdargs          >= 0.9  && < 0.11,
+    -- Copied from regular dependencies...
+    aeson            >= 0.6  && < 0.7,
+    base             >= 4    && < 5,
+    bytestring       >= 0.9  && < 0.10,
+    containers       >= 0.3  && < 0.6,
+    directory        >= 1.1  && < 1.2,
+    filepath         >= 1.1  && < 1.4,
+    haskell-src-exts >= 1.13 && < 1.14,
+    mtl              >= 2.0  && < 2.2,
+    syb              >= 0.3  && < 0.4,
+    yaml             >= 0.7  && < 0.9
 
 Test-suite stylish-haskell-tests
   Ghc-options:    -Wall
@@ -72,14 +81,14 @@ Test-suite stylish-haskell-tests
   Type:           exitcode-stdio-1.0
 
   Other-modules:
-    StylishHaskell.Parse.Tests
-    StylishHaskell.Step.Imports.Tests
-    StylishHaskell.Step.LanguagePragmas.Tests
-    StylishHaskell.Step.Records.Tests
-    StylishHaskell.Step.Tabs.Tests
-    StylishHaskell.Step.TrailingWhitespace.Tests
-    StylishHaskell.Step.UnicodeSyntax.Tests
-    StylishHaskell.Tests.Util
+    Language.Haskell.Stylish.Parse.Tests
+    Language.Haskell.Stylish.Step.Imports.Tests
+    Language.Haskell.Stylish.Step.LanguagePragmas.Tests
+    Language.Haskell.Stylish.Step.Records.Tests
+    Language.Haskell.Stylish.Step.Tabs.Tests
+    Language.Haskell.Stylish.Step.TrailingWhitespace.Tests
+    Language.Haskell.Stylish.Step.UnicodeSyntax.Tests
+    Language.Haskell.Stylish.Tests.Util
 
   Build-depends:
     HUnit                >= 1.2 && < 1.3,
@@ -95,7 +104,6 @@ Test-suite stylish-haskell-tests
     filepath         >= 1.1  && < 1.4,
     haskell-src-exts >= 1.13 && < 1.14,
     mtl              >= 2.0  && < 2.2,
-    strict           >= 0.3  && < 0.4,
     syb              >= 0.3  && < 0.4,
     yaml             >= 0.7  && < 0.9
 
diff --git a/tests/StylishHaskell/Parse/Tests.hs b/tests/Language/Haskell/Stylish/Parse/Tests.hs
index 87febd9..19f4fe1 100644
--- a/tests/StylishHaskell/Parse/Tests.hs
+++ b/tests/Language/Haskell/Stylish/Parse/Tests.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.Parse.Tests
+module Language.Haskell.Stylish.Parse.Tests
     ( tests
     ) where
 
@@ -11,12 +11,12 @@ import           Test.HUnit                     (Assertion, assert)
 
 
 --------------------------------------------------------------------------------
-import           StylishHaskell.Parse
+import           Language.Haskell.Stylish.Parse
 
 
 --------------------------------------------------------------------------------
 tests :: Test
-tests = testGroup "StylishHaskell.Parse"
+tests = testGroup "Language.Haskell.Stylish.Parse"
     [ testCase "UTF-8 Byte Order Mark" testBom
     , testCase "Extra extensions"      testExtraExtensions
     ]
diff --git a/tests/StylishHaskell/Step/Imports/Tests.hs b/tests/Language/Haskell/Stylish/Step/Imports/Tests.hs
index d4bef8a..ab0e437 100644
--- a/tests/StylishHaskell/Step/Imports/Tests.hs
+++ b/tests/Language/Haskell/Stylish/Step/Imports/Tests.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.Step.Imports.Tests
+module Language.Haskell.Stylish.Step.Imports.Tests
     ( tests
     ) where
 
@@ -11,13 +11,13 @@ import           Test.HUnit                     (Assertion, (@=?))
 
 
 --------------------------------------------------------------------------------
-import           StylishHaskell.Step.Imports
-import           StylishHaskell.Tests.Util
+import           Language.Haskell.Stylish.Step.Imports
+import           Language.Haskell.Stylish.Tests.Util
 
 
 --------------------------------------------------------------------------------
 tests :: Test
-tests = testGroup "StylishHaskell.Step.Imports.Tests"
+tests = testGroup "Language.Haskell.Stylish.Step.Imports.Tests"
     [ testCase "case 01" case01
     , testCase "case 02" case02
     , testCase "case 03" case03
diff --git a/tests/StylishHaskell/Step/LanguagePragmas/Tests.hs b/tests/Language/Haskell/Stylish/Step/LanguagePragmas/Tests.hs
index 1b6043f..716d56a 100644
--- a/tests/StylishHaskell/Step/LanguagePragmas/Tests.hs
+++ b/tests/Language/Haskell/Stylish/Step/LanguagePragmas/Tests.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.Step.LanguagePragmas.Tests
+module Language.Haskell.Stylish.Step.LanguagePragmas.Tests
     ( tests
     ) where
 
@@ -11,13 +11,13 @@ import           Test.HUnit                          (Assertion, (@=?))
 
 
 --------------------------------------------------------------------------------
-import           StylishHaskell.Step.LanguagePragmas
-import           StylishHaskell.Tests.Util
+import           Language.Haskell.Stylish.Step.LanguagePragmas
+import           Language.Haskell.Stylish.Tests.Util
 
 
 --------------------------------------------------------------------------------
 tests :: Test
-tests = testGroup "StylishHaskell.Step.LanguagePragmas.Tests"
+tests = testGroup "Language.Haskell.Stylish.Step.LanguagePragmas.Tests"
     [ testCase "case 01" case01
     , testCase "case 02" case02
     , testCase "case 03" case03
diff --git a/tests/StylishHaskell/Step/Records/Tests.hs b/tests/Language/Haskell/Stylish/Step/Records/Tests.hs
index 4a1f92d..2001300 100644
--- a/tests/StylishHaskell/Step/Records/Tests.hs
+++ b/tests/Language/Haskell/Stylish/Step/Records/Tests.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.Step.Records.Tests
+module Language.Haskell.Stylish.Step.Records.Tests
     ( tests
     ) where
 
@@ -11,13 +11,13 @@ import           Test.HUnit                     (Assertion, (@=?))
 
 
 --------------------------------------------------------------------------------
-import           StylishHaskell.Step.Records
-import           StylishHaskell.Tests.Util
+import           Language.Haskell.Stylish.Step.Records
+import           Language.Haskell.Stylish.Tests.Util
 
 
 --------------------------------------------------------------------------------
 tests :: Test
-tests = testGroup "StylishHaskell.Step.Records.Tests"
+tests = testGroup "Language.Haskell.Stylish.Step.Records.Tests"
     [ testCase "case 01" case01
     ]
 
diff --git a/tests/StylishHaskell/Step/Tabs/Tests.hs b/tests/Language/Haskell/Stylish/Step/Tabs/Tests.hs
index 6ad0607..1127a87 100644
--- a/tests/StylishHaskell/Step/Tabs/Tests.hs
+++ b/tests/Language/Haskell/Stylish/Step/Tabs/Tests.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.Step.Tabs.Tests
+module Language.Haskell.Stylish.Step.Tabs.Tests
     ( tests
     ) where
 
@@ -11,13 +11,13 @@ import           Test.HUnit                     (Assertion, (@=?))
 
 
 --------------------------------------------------------------------------------
-import           StylishHaskell.Step.Tabs
-import           StylishHaskell.Tests.Util
+import           Language.Haskell.Stylish.Step.Tabs
+import           Language.Haskell.Stylish.Tests.Util
 
 
 --------------------------------------------------------------------------------
 tests :: Test
-tests = testGroup "StylishHaskell.Step.Tabs.Tests"
+tests = testGroup "Language.Haskell.Stylish.Step.Tabs.Tests"
     [ testCase "case 01" case01
     ]
 
diff --git a/tests/StylishHaskell/Step/TrailingWhitespace/Tests.hs b/tests/Language/Haskell/Stylish/Step/TrailingWhitespace/Tests.hs
index 2d78b08..1394edb 100644
--- a/tests/StylishHaskell/Step/TrailingWhitespace/Tests.hs
+++ b/tests/Language/Haskell/Stylish/Step/TrailingWhitespace/Tests.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.Step.TrailingWhitespace.Tests
+module Language.Haskell.Stylish.Step.TrailingWhitespace.Tests
     ( tests
     ) where
 
@@ -11,13 +11,13 @@ import           Test.HUnit                             (Assertion, (@=?))
 
 
 --------------------------------------------------------------------------------
-import           StylishHaskell.Step.TrailingWhitespace
-import           StylishHaskell.Tests.Util
+import           Language.Haskell.Stylish.Step.TrailingWhitespace
+import           Language.Haskell.Stylish.Tests.Util
 
 
 --------------------------------------------------------------------------------
 tests :: Test
-tests = testGroup "StylishHaskell.Step.TrailingWhitespace.Tests"
+tests = testGroup "Language.Haskell.Stylish.Step.TrailingWhitespace.Tests"
     [ testCase "case 01" case01
     ]
 
diff --git a/tests/StylishHaskell/Step/UnicodeSyntax/Tests.hs b/tests/Language/Haskell/Stylish/Step/UnicodeSyntax/Tests.hs
index ae401b2..9652350 100644
--- a/tests/StylishHaskell/Step/UnicodeSyntax/Tests.hs
+++ b/tests/Language/Haskell/Stylish/Step/UnicodeSyntax/Tests.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.Step.UnicodeSyntax.Tests
+module Language.Haskell.Stylish.Step.UnicodeSyntax.Tests
     ( tests
     ) where
 
@@ -11,13 +11,13 @@ import           Test.HUnit                        (Assertion, (@=?))
 
 
 --------------------------------------------------------------------------------
-import           StylishHaskell.Step.UnicodeSyntax
-import           StylishHaskell.Tests.Util
+import           Language.Haskell.Stylish.Step.UnicodeSyntax
+import           Language.Haskell.Stylish.Tests.Util
 
 
 --------------------------------------------------------------------------------
 tests :: Test
-tests = testGroup "StylishHaskell.Step.UnicodeSyntax.Tests"
+tests = testGroup "Language.Haskell.Stylish.Step.UnicodeSyntax.Tests"
     [ testCase "case 01" case01
     ]
 
diff --git a/tests/StylishHaskell/Tests/Util.hs b/tests/Language/Haskell/Stylish/Tests/Util.hs
index 49cc421..40b5629 100644
--- a/tests/StylishHaskell/Tests/Util.hs
+++ b/tests/Language/Haskell/Stylish/Tests/Util.hs
@@ -1,11 +1,11 @@
-module StylishHaskell.Tests.Util
+module Language.Haskell.Stylish.Tests.Util
     ( testStep
     ) where
 
 
 --------------------------------------------------------------------------------
-import           StylishHaskell.Parse
-import           StylishHaskell.Step
+import           Language.Haskell.Stylish.Parse
+import           Language.Haskell.Stylish.Step
 
 
 --------------------------------------------------------------------------------
diff --git a/tests/TestSuite.hs b/tests/TestSuite.hs
index f5a7bff..28c0603 100644
--- a/tests/TestSuite.hs
+++ b/tests/TestSuite.hs
@@ -9,23 +9,23 @@ import           Test.Framework                               (defaultMain)
 
 
 --------------------------------------------------------------------------------
-import qualified StylishHaskell.Parse.Tests
-import qualified StylishHaskell.Step.Imports.Tests
-import qualified StylishHaskell.Step.LanguagePragmas.Tests
-import qualified StylishHaskell.Step.Records.Tests
-import qualified StylishHaskell.Step.Tabs.Tests
-import qualified StylishHaskell.Step.TrailingWhitespace.Tests
-import qualified StylishHaskell.Step.UnicodeSyntax.Tests
+import qualified Language.Haskell.Stylish.Parse.Tests
+import qualified Language.Haskell.Stylish.Step.Imports.Tests
+import qualified Language.Haskell.Stylish.Step.LanguagePragmas.Tests
+import qualified Language.Haskell.Stylish.Step.Records.Tests
+import qualified Language.Haskell.Stylish.Step.Tabs.Tests
+import qualified Language.Haskell.Stylish.Step.TrailingWhitespace.Tests
+import qualified Language.Haskell.Stylish.Step.UnicodeSyntax.Tests
 
 
 --------------------------------------------------------------------------------
 main :: IO ()
 main = defaultMain
-    [ StylishHaskell.Parse.Tests.tests
-    , StylishHaskell.Step.Imports.Tests.tests
-    , StylishHaskell.Step.LanguagePragmas.Tests.tests
-    , StylishHaskell.Step.Records.Tests.tests
-    , StylishHaskell.Step.Tabs.Tests.tests
-    , StylishHaskell.Step.TrailingWhitespace.Tests.tests
-    , StylishHaskell.Step.UnicodeSyntax.Tests.tests
+    [ Language.Haskell.Stylish.Parse.Tests.tests
+    , Language.Haskell.Stylish.Step.Imports.Tests.tests
+    , Language.Haskell.Stylish.Step.LanguagePragmas.Tests.tests
+    , Language.Haskell.Stylish.Step.Records.Tests.tests
+    , Language.Haskell.Stylish.Step.Tabs.Tests.tests
+    , Language.Haskell.Stylish.Step.TrailingWhitespace.Tests.tests
+    , Language.Haskell.Stylish.Step.UnicodeSyntax.Tests.tests
     ]