Move modules around

11 files changed, 38 insertions, 38 deletions

diff --git a/src/Main.hs b/src/Main.hs
index 78dff11..23672aa 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -12,9 +12,9 @@ import           System.Console.CmdArgs
 
 --------------------------------------------------------------------------------
 import           StylishHaskell
-import qualified StylishHaskell.Imports
-import qualified StylishHaskell.LanguagePragmas
-import qualified StylishHaskell.TrailingWhitespace
+import qualified StylishHaskell.Stylish.Imports
+import qualified StylishHaskell.Stylish.LanguagePragmas
+import qualified StylishHaskell.Stylish.TrailingWhitespace
 
 
 --------------------------------------------------------------------------------
@@ -41,8 +41,8 @@ main = do
     putStr $ unlines $ chainStylish filePath filters $ lines contents
   where
     filters =
-        [ StylishHaskell.Imports.stylish
-        , StylishHaskell.LanguagePragmas.stylish
+        [ StylishHaskell.Stylish.Imports.stylish
+        , StylishHaskell.Stylish.LanguagePragmas.stylish
         -- , StylishHaskell.Tabs.stylish
-        , StylishHaskell.TrailingWhitespace.stylish
+        , StylishHaskell.Stylish.TrailingWhitespace.stylish
         ]
diff --git a/src/StylishHaskell/Imports.hs b/src/StylishHaskell/Stylish/Imports.hs
index bb9ca48..5229d48 100644
--- a/src/StylishHaskell/Imports.hs
+++ b/src/StylishHaskell/Stylish/Imports.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.Imports
+module StylishHaskell.Stylish.Imports
     ( stylish
     ) where
 
diff --git a/src/StylishHaskell/LanguagePragmas.hs b/src/StylishHaskell/Stylish/LanguagePragmas.hs
index c701471..c819050 100644
--- a/src/StylishHaskell/LanguagePragmas.hs
+++ b/src/StylishHaskell/Stylish/LanguagePragmas.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.LanguagePragmas
+module StylishHaskell.Stylish.LanguagePragmas
     ( stylish
     ) where
 
diff --git a/src/StylishHaskell/Tabs.hs b/src/StylishHaskell/Stylish/Tabs.hs
index 2f3c529..b9df6f4 100644
--- a/src/StylishHaskell/Tabs.hs
+++ b/src/StylishHaskell/Stylish/Tabs.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.Tabs
+module StylishHaskell.Stylish.Tabs
     ( stylish
     ) where
 
diff --git a/src/StylishHaskell/TrailingWhitespace.hs b/src/StylishHaskell/Stylish/TrailingWhitespace.hs
index 6470a3d..92301d4 100644
--- a/src/StylishHaskell/TrailingWhitespace.hs
+++ b/src/StylishHaskell/Stylish/TrailingWhitespace.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.TrailingWhitespace
+module StylishHaskell.Stylish.TrailingWhitespace
     ( stylish
     ) where
 
diff --git a/stylish-haskell.cabal b/stylish-haskell.cabal
index 0fd7451..6652260 100644
--- a/stylish-haskell.cabal
+++ b/stylish-haskell.cabal
@@ -28,12 +28,12 @@ Executable stylish-haskell
     StylishHaskell.Block
     StylishHaskell.Config
     StylishHaskell.Editor
-    StylishHaskell.Imports
-    StylishHaskell.LanguagePragmas
     StylishHaskell.Parse
     StylishHaskell.Stylish
-    StylishHaskell.Tabs
-    StylishHaskell.TrailingWhitespace
+    StylishHaskell.Stylish.Imports
+    StylishHaskell.Stylish.LanguagePragmas
+    StylishHaskell.Stylish.Tabs
+    StylishHaskell.Stylish.TrailingWhitespace
     StylishHaskell.Util
 
   Build-depends:
@@ -48,11 +48,11 @@ Test-suite stylish-haskell-tests
   Type:           exitcode-stdio-1.0
 
   Other-modules:
-    StylishHaskell.Imports.Tests
-    StylishHaskell.LanguagePragmas.Tests
+    StylishHaskell.Stylish.Imports.Tests
+    StylishHaskell.Stylish.LanguagePragmas.Tests
+    StylishHaskell.Stylish.Tabs.Tests
+    StylishHaskell.Stylish.TrailingWhitespace.Tests
     StylishHaskell.Tests.Util
-    StylishHaskell.Tabs.Tests
-    StylishHaskell.TrailingWhitespace.Tests
 
   Build-depends:
     HUnit                >= 1.2 && < 1.3,
diff --git a/tests/StylishHaskell/Imports/Tests.hs b/tests/StylishHaskell/Stylish/Imports/Tests.hs
index b15fe4a..2a14775 100644
--- a/tests/StylishHaskell/Imports/Tests.hs
+++ b/tests/StylishHaskell/Stylish/Imports/Tests.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.Imports.Tests
+module StylishHaskell.Stylish.Imports.Tests
     ( tests
     ) where
 
@@ -11,13 +11,13 @@ import           Test.HUnit                     ((@=?))
 
 
 --------------------------------------------------------------------------------
-import           StylishHaskell.Imports
+import           StylishHaskell.Stylish.Imports
 import           StylishHaskell.Tests.Util
 
 
 --------------------------------------------------------------------------------
 tests :: Test
-tests = testGroup "StylishHaskell.Imports.Tests"
+tests = testGroup "StylishHaskell.Stylish.Imports.Tests"
     [ case01
     ]
 
diff --git a/tests/StylishHaskell/LanguagePragmas/Tests.hs b/tests/StylishHaskell/Stylish/LanguagePragmas/Tests.hs
index 5e9d59e..80a50bc 100644
--- a/tests/StylishHaskell/LanguagePragmas/Tests.hs
+++ b/tests/StylishHaskell/Stylish/LanguagePragmas/Tests.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.LanguagePragmas.Tests
+module StylishHaskell.Stylish.LanguagePragmas.Tests
     ( tests
     ) where
 
@@ -11,13 +11,13 @@ import           Test.HUnit                     ((@=?))
 
 
 --------------------------------------------------------------------------------
-import           StylishHaskell.LanguagePragmas
+import           StylishHaskell.Stylish.LanguagePragmas
 import           StylishHaskell.Tests.Util
 
 
 --------------------------------------------------------------------------------
 tests :: Test
-tests = testGroup "StylishHaskell.LanguagePragmas.Tests"
+tests = testGroup "StylishHaskell.Stylish.LanguagePragmas.Tests"
     [ case01
     ]
 
diff --git a/tests/StylishHaskell/Tabs/Tests.hs b/tests/StylishHaskell/Stylish/Tabs/Tests.hs
index 9e66d6b..bd332c5 100644
--- a/tests/StylishHaskell/Tabs/Tests.hs
+++ b/tests/StylishHaskell/Stylish/Tabs/Tests.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.Tabs.Tests
+module StylishHaskell.Stylish.Tabs.Tests
     ( tests
     ) where
 
@@ -11,13 +11,13 @@ import           Test.HUnit                     ((@=?))
 
 
 --------------------------------------------------------------------------------
-import           StylishHaskell.Tabs
+import           StylishHaskell.Stylish.Tabs
 import           StylishHaskell.Tests.Util
 
 
 --------------------------------------------------------------------------------
 tests :: Test
-tests = testGroup "StylishHaskell.Tabs.Tests" [case01]
+tests = testGroup "StylishHaskell.Stylish.Tabs.Tests" [case01]
 
 
 --------------------------------------------------------------------------------
diff --git a/tests/StylishHaskell/TrailingWhitespace/Tests.hs b/tests/StylishHaskell/Stylish/TrailingWhitespace/Tests.hs
index 2f12113..32efd66 100644
--- a/tests/StylishHaskell/TrailingWhitespace/Tests.hs
+++ b/tests/StylishHaskell/Stylish/TrailingWhitespace/Tests.hs
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-module StylishHaskell.TrailingWhitespace.Tests
+module StylishHaskell.Stylish.TrailingWhitespace.Tests
     ( tests
     ) where
 
@@ -11,13 +11,13 @@ import           Test.HUnit                     ((@=?))
 
 
 --------------------------------------------------------------------------------
-import           StylishHaskell.TrailingWhitespace
+import           StylishHaskell.Stylish.TrailingWhitespace
 import           StylishHaskell.Tests.Util
 
 
 --------------------------------------------------------------------------------
 tests :: Test
-tests = testGroup "StylishHaskell.TrailingWhitespace.Tests" [case01]
+tests = testGroup "StylishHaskell.Stylish.TrailingWhitespace.Tests" [case01]
 
 
 --------------------------------------------------------------------------------
diff --git a/tests/TestSuite.hs b/tests/TestSuite.hs
index 71a1bec..38b84ff 100644
--- a/tests/TestSuite.hs
+++ b/tests/TestSuite.hs
@@ -9,17 +9,17 @@ import           Test.Framework               (defaultMain)
 
 
 --------------------------------------------------------------------------------
-import qualified StylishHaskell.Imports.Tests
-import qualified StylishHaskell.LanguagePragmas.Tests
-import qualified StylishHaskell.Tabs.Tests
-import qualified StylishHaskell.TrailingWhitespace.Tests
+import qualified StylishHaskell.Stylish.Imports.Tests
+import qualified StylishHaskell.Stylish.LanguagePragmas.Tests
+import qualified StylishHaskell.Stylish.Tabs.Tests
+import qualified StylishHaskell.Stylish.TrailingWhitespace.Tests
 
 
 --------------------------------------------------------------------------------
 main :: IO ()
 main = defaultMain
-    [ StylishHaskell.Imports.Tests.tests
-    , StylishHaskell.LanguagePragmas.Tests.tests
-    , StylishHaskell.Tabs.Tests.tests
-    , StylishHaskell.TrailingWhitespace.Tests.tests
+    [ StylishHaskell.Stylish.Imports.Tests.tests
+    , StylishHaskell.Stylish.LanguagePragmas.Tests.tests
+    , StylishHaskell.Stylish.Tabs.Tests.tests
+    , StylishHaskell.Stylish.TrailingWhitespace.Tests.tests
     ]