15 files changed, 16 insertions, 21 deletions
diff --git a/src/Language/Haskell/Stylish.hs b/lib/Language/Haskell/Stylish.hs
index b8620ae..103306c 100644
--- a/src/Language/Haskell/Stylish.hs
+++ b/lib/Language/Haskell/Stylish.hs
@@ -25,22 +25,21 @@ module Language.Haskell.Stylish
 
 
 --------------------------------------------------------------------------------
-import Control.Applicative ((<$>))
-import Control.Monad (foldM)
+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           Language.Haskell.Stylish.Config
+import           Language.Haskell.Stylish.Parse
+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 qualified Language.Haskell.Stylish.Step.UnicodeSyntax      as UnicodeSyntax
+import           Language.Haskell.Stylish.Verbose
+import           Paths_stylish_haskell                            (version)
 
 
 --------------------------------------------------------------------------------
diff --git a/src/Language/Haskell/Stylish/Block.hs b/lib/Language/Haskell/Stylish/Block.hs
index fd680a8..fd680a8 100644
--- a/src/Language/Haskell/Stylish/Block.hs
+++ b/lib/Language/Haskell/Stylish/Block.hs
diff --git a/src/Language/Haskell/Stylish/Config.hs b/lib/Language/Haskell/Stylish/Config.hs
index 556002d..b7353aa 100644
--- a/src/Language/Haskell/Stylish/Config.hs
+++ b/lib/Language/Haskell/Stylish/Config.hs
@@ -10,8 +10,6 @@ module Language.Haskell.Stylish.Config
 
 
 --------------------------------------------------------------------------------
-import           Control.Applicative                              (pure, (<$>),
-                                                                   (<*>))
 import           Control.Monad                                    (forM, mzero)
 import           Data.Aeson                                       (FromJSON (..))
 import qualified Data.Aeson                                       as A
diff --git a/src/Language/Haskell/Stylish/Editor.hs b/lib/Language/Haskell/Stylish/Editor.hs
index 5d5a864..5d5a864 100644
--- a/src/Language/Haskell/Stylish/Editor.hs
+++ b/lib/Language/Haskell/Stylish/Editor.hs
diff --git a/src/Language/Haskell/Stylish/Parse.hs b/lib/Language/Haskell/Stylish/Parse.hs
index f8e24a6..f8e24a6 100644
--- a/src/Language/Haskell/Stylish/Parse.hs
+++ b/lib/Language/Haskell/Stylish/Parse.hs
diff --git a/src/Language/Haskell/Stylish/Step.hs b/lib/Language/Haskell/Stylish/Step.hs
index f053f8b..f053f8b 100644
--- a/src/Language/Haskell/Stylish/Step.hs
+++ b/lib/Language/Haskell/Stylish/Step.hs
diff --git a/src/Language/Haskell/Stylish/Step/Imports.hs b/lib/Language/Haskell/Stylish/Step/Imports.hs
index 14bb818..82ba96f 100644
--- a/src/Language/Haskell/Stylish/Step/Imports.hs
+++ b/lib/Language/Haskell/Stylish/Step/Imports.hs
@@ -10,10 +10,8 @@ module Language.Haskell.Stylish.Step.Imports
 
 
 --------------------------------------------------------------------------------
-
 import           Control.Arrow                   ((&&&))
 import           Data.Char                       (toLower)
-import           Data.Functor                    ((<$>))
 import           Data.List                       (intercalate, sortBy)
 import           Data.Maybe                      (isJust, maybeToList)
 import           Data.Ord                        (comparing)
diff --git a/src/Language/Haskell/Stylish/Step/LanguagePragmas.hs b/lib/Language/Haskell/Stylish/Step/LanguagePragmas.hs
index 0239736..0239736 100644
--- a/src/Language/Haskell/Stylish/Step/LanguagePragmas.hs
+++ b/lib/Language/Haskell/Stylish/Step/LanguagePragmas.hs
diff --git a/src/Language/Haskell/Stylish/Step/Records.hs b/lib/Language/Haskell/Stylish/Step/Records.hs
index c8f6d19..c8f6d19 100644
--- a/src/Language/Haskell/Stylish/Step/Records.hs
+++ b/lib/Language/Haskell/Stylish/Step/Records.hs
diff --git a/src/Language/Haskell/Stylish/Step/Tabs.hs b/lib/Language/Haskell/Stylish/Step/Tabs.hs
index 0694cd9..0694cd9 100644
--- a/src/Language/Haskell/Stylish/Step/Tabs.hs
+++ b/lib/Language/Haskell/Stylish/Step/Tabs.hs
diff --git a/src/Language/Haskell/Stylish/Step/TrailingWhitespace.hs b/lib/Language/Haskell/Stylish/Step/TrailingWhitespace.hs
index dbc594c..dbc594c 100644
--- a/src/Language/Haskell/Stylish/Step/TrailingWhitespace.hs
+++ b/lib/Language/Haskell/Stylish/Step/TrailingWhitespace.hs
diff --git a/src/Language/Haskell/Stylish/Step/UnicodeSyntax.hs b/lib/Language/Haskell/Stylish/Step/UnicodeSyntax.hs
index 1e00275..1e00275 100644
--- a/src/Language/Haskell/Stylish/Step/UnicodeSyntax.hs
+++ b/lib/Language/Haskell/Stylish/Step/UnicodeSyntax.hs
diff --git a/src/Language/Haskell/Stylish/Util.hs b/lib/Language/Haskell/Stylish/Util.hs
index ed5de91..ed5de91 100644
--- a/src/Language/Haskell/Stylish/Util.hs
+++ b/lib/Language/Haskell/Stylish/Util.hs
diff --git a/src/Language/Haskell/Stylish/Verbose.hs b/lib/Language/Haskell/Stylish/Verbose.hs
index 5519e43..5519e43 100644
--- a/src/Language/Haskell/Stylish/Verbose.hs
+++ b/lib/Language/Haskell/Stylish/Verbose.hs
diff --git a/stylish-haskell.cabal b/stylish-haskell.cabal
index d5ed065..427fd6e 100644
--- a/stylish-haskell.cabal
+++ b/stylish-haskell.cabal
@@ -26,7 +26,7 @@ Extra-source-files:
 
 Library
   Exposed-modules: Language.Haskell.Stylish
-  Hs-source-dirs: src
+  Hs-source-dirs: lib
   Ghc-options:    -Wall
 
   Other-modules:
@@ -47,7 +47,7 @@ Library
 
   Build-depends:
     aeson            >= 0.6  && < 0.11,
-    base             >= 4    && < 5,
+    base             >= 4.8  && < 5,
     bytestring       >= 0.9  && < 0.11,
     containers       >= 0.3  && < 0.6,
     directory        >= 1.1  && < 1.3,
@@ -68,7 +68,7 @@ Executable stylish-haskell
     cmdargs          >= 0.9  && < 0.11,
     -- Copied from regular dependencies...
     aeson            >= 0.6  && < 0.11,
-    base             >= 4    && < 5,
+    base             >= 4.8  && < 5,
     bytestring       >= 0.9  && < 0.11,
     containers       >= 0.3  && < 0.6,
     directory        >= 1.1  && < 1.3,
@@ -80,7 +80,7 @@ Executable stylish-haskell
 
 Test-suite stylish-haskell-tests
   Ghc-options:    -Wall
-  Hs-source-dirs: src tests
+  Hs-source-dirs: tests lib
   Main-is:        TestSuite.hs
   Type:           exitcode-stdio-1.0
 
@@ -100,7 +100,7 @@ Test-suite stylish-haskell-tests
     test-framework-hunit >= 0.2 && < 0.4,
     -- Copied from regular dependencies...
     aeson            >= 0.6  && < 0.11,
-    base             >= 4    && < 5,
+    base             >= 4.8  && < 5,
     bytestring       >= 0.9  && < 0.11,
     cmdargs          >= 0.9  && < 0.11,
     containers       >= 0.3  && < 0.6,