diff --git a/ShellCheck.cabal b/ShellCheck.cabal
index e0c9db0..215e226 100644
--- a/ShellCheck.cabal
+++ b/ShellCheck.cabal
@@ -31,14 +31,21 @@ Extra-Source-Files:
     -- tests
     test/shellcheck.hs
 
+custom-setup
+  setup-depends:
+    base    >= 4    && <5,
+    process >= 1.0  && <1.7,
+    Cabal   >= 1.10 && <2.3
+
 source-repository head
     type: git
     location: git://github.com/koalaman/shellcheck.git
 
 library
+    hs-source-dirs: src
     build-depends:
       base >= 4 && < 5,
-      containers,
+      containers >= 0.5,
       directory,
       json,
       mtl >= 2.2.1,
@@ -71,11 +78,12 @@ library
 executable shellcheck
     build-depends:
       base >= 4 && < 5,
+      ShellCheck, 
       containers,
       directory,
-      json,
+      json >= 0.3.6,
       mtl >= 2.2.1,
-      parsec,
+      parsec >= 3.0,
       regex-tdfa,
       QuickCheck >= 2.7.4
     main-is: shellcheck.hs
@@ -84,6 +92,7 @@ test-suite test-shellcheck
     type: exitcode-stdio-1.0
     build-depends:
       base >= 4 && < 5,
+      ShellCheck, 
       containers,
       directory,
       json,
diff --git a/ShellCheck/AST.hs b/src/ShellCheck/AST.hs
similarity index 100%
rename from ShellCheck/AST.hs
rename to src/ShellCheck/AST.hs
diff --git a/ShellCheck/ASTLib.hs b/src/ShellCheck/ASTLib.hs
similarity index 100%
rename from ShellCheck/ASTLib.hs
rename to src/ShellCheck/ASTLib.hs
diff --git a/ShellCheck/Analytics.hs b/src/ShellCheck/Analytics.hs
similarity index 100%
rename from ShellCheck/Analytics.hs
rename to src/ShellCheck/Analytics.hs
diff --git a/ShellCheck/Analyzer.hs b/src/ShellCheck/Analyzer.hs
similarity index 100%
rename from ShellCheck/Analyzer.hs
rename to src/ShellCheck/Analyzer.hs
diff --git a/ShellCheck/AnalyzerLib.hs b/src/ShellCheck/AnalyzerLib.hs
similarity index 100%
rename from ShellCheck/AnalyzerLib.hs
rename to src/ShellCheck/AnalyzerLib.hs
diff --git a/ShellCheck/Checker.hs b/src/ShellCheck/Checker.hs
similarity index 100%
rename from ShellCheck/Checker.hs
rename to src/ShellCheck/Checker.hs
diff --git a/ShellCheck/Checks/Commands.hs b/src/ShellCheck/Checks/Commands.hs
similarity index 100%
rename from ShellCheck/Checks/Commands.hs
rename to src/ShellCheck/Checks/Commands.hs
diff --git a/ShellCheck/Checks/ShellSupport.hs b/src/ShellCheck/Checks/ShellSupport.hs
similarity index 100%
rename from ShellCheck/Checks/ShellSupport.hs
rename to src/ShellCheck/Checks/ShellSupport.hs
diff --git a/ShellCheck/Data.hs b/src/ShellCheck/Data.hs
similarity index 100%
rename from ShellCheck/Data.hs
rename to src/ShellCheck/Data.hs
diff --git a/ShellCheck/Formatter/CheckStyle.hs b/src/ShellCheck/Formatter/CheckStyle.hs
similarity index 100%
rename from ShellCheck/Formatter/CheckStyle.hs
rename to src/ShellCheck/Formatter/CheckStyle.hs
diff --git a/ShellCheck/Formatter/Format.hs b/src/ShellCheck/Formatter/Format.hs
similarity index 100%
rename from ShellCheck/Formatter/Format.hs
rename to src/ShellCheck/Formatter/Format.hs
diff --git a/ShellCheck/Formatter/GCC.hs b/src/ShellCheck/Formatter/GCC.hs
similarity index 100%
rename from ShellCheck/Formatter/GCC.hs
rename to src/ShellCheck/Formatter/GCC.hs
diff --git a/ShellCheck/Formatter/JSON.hs b/src/ShellCheck/Formatter/JSON.hs
similarity index 100%
rename from ShellCheck/Formatter/JSON.hs
rename to src/ShellCheck/Formatter/JSON.hs
diff --git a/ShellCheck/Formatter/TTY.hs b/src/ShellCheck/Formatter/TTY.hs
similarity index 100%
rename from ShellCheck/Formatter/TTY.hs
rename to src/ShellCheck/Formatter/TTY.hs
diff --git a/ShellCheck/Interface.hs b/src/ShellCheck/Interface.hs
similarity index 100%
rename from ShellCheck/Interface.hs
rename to src/ShellCheck/Interface.hs
diff --git a/ShellCheck/Parser.hs b/src/ShellCheck/Parser.hs
similarity index 100%
rename from ShellCheck/Parser.hs
rename to src/ShellCheck/Parser.hs
diff --git a/ShellCheck/Regex.hs b/src/ShellCheck/Regex.hs
similarity index 100%
rename from ShellCheck/Regex.hs
rename to src/ShellCheck/Regex.hs