diff --git a/ihaskell.cabal b/ihaskell.cabal
index 7386af53..bab739ba 100644
--- a/ihaskell.cabal
+++ b/ihaskell.cabal
@@ -54,10 +54,10 @@ library
   default-language:    Haskell2010
   build-depends:       
                        base                 ==4.6.*,
-                       aeson                >=0.7,
+                       aeson                >=0.6 && < 0.8,
                        base64-bytestring    >=1.0,
                        bytestring           >=0.10,
-                       cereal               >=0.3,
+                       cereal               ==0.3.*,
                        classy-prelude       >=0.7,
                        cmdargs              >=0.10,
                        containers           >=0.5,
@@ -87,9 +87,17 @@ library
                        tar                  -any,
                        transformers         -any,
                        unix                 >= 2.6,
-                       utf8-string          -any
+                       unordered-containers -any,
+                       stm                  -any,
+                       text                 -any,
+                       utf8-string          -any,
+                       vector               -any
 
   exposed-modules: IHaskell.Display
+                   IHaskell.Convert
+                   IHaskell.Convert.Args
+                   IHaskell.Convert.IpynbToLhs
+                   IHaskell.Convert.LhsToIpynb
                    IHaskell.Eval.Completion
                    IHaskell.Eval.Evaluate
                    IHaskell.Eval.Info
@@ -107,26 +115,7 @@ library
 
 executable IHaskell
   -- .hs or .lhs file containing the Main module.
-  hs-source-dirs:      src
-  main-is:             Main.hs
-
-  build-tools:         happy, cpphs
-  
-  -- Modules included in this executable, other than Main.
-  other-modules:       
-             IHaskell.Eval.Lint
-             IHaskell.Eval.Completion
-             IHaskell.Eval.Info
-             IHaskell.Eval.Evaluate
-             IHaskell.Eval.Parser
-             IHaskell.Eval.Hoogle
-             IHaskell.Eval.ParseShell
-             IHaskell.Eval.Util
-             IHaskell.IPython
-             IHaskell.Flags
-             IHaskell.Types
-             IHaskell.Display
-             IHaskell.BrokenPackages
+  main-is:             src/Main.hs
 
   default-extensions: DoAndIfThenElse
   
@@ -134,40 +123,18 @@ executable IHaskell
   default-language:    Haskell2010
   build-depends:       
                        base                 ==4.6.*,
-                       aeson                >=0.7,
-                       base64-bytestring    >=1.0,
+                       aeson                >=0.6 && < 0.8,
                        bytestring           >=0.10,
-                       cereal               >=0.3,
+                       cereal               ==0.3.*,
                        classy-prelude       >=0.7,
-                       cmdargs              >=0.10,
                        containers           >=0.5,
                        directory            -any,
-                       filepath             -any,
                        ghc                  ==7.6.*,
-                       ghc-parser           >=0.1.1,
-                       ghci-lib             >=0.1,
-                       ghc-paths            ==0.1.*,
-                       haskeline            -any,
-                       here                 -any,
-                       hlint                -any,
-                       hspec                -any,
-                       HTTP                 -any,
-                       HUnit                -any,
+                       ihaskell             -any,
                        ipython-kernel       -any,
                        MissingH             >=1.2,
-                       mtl                  >=2.1,
-                       parsec               -any,
-                       process              >=1.1,
-                       random               >=1.0,
-                       shelly               ==1.3.* || >= 1.4.4.2,
-                       split                >= 0.2,
-                       strict               >=0.3,
-                       system-argv0         -any,
-                       system-filepath      -any,
-                       tar                  -any,
-                       transformers         -any,
-                       unix                 >= 2.6,
-                       utf8-string          -any
+                       text                 -any,
+                       unix                 >= 2.6
 
 Test-Suite hspec
   hs-source-dirs:      src
@@ -177,10 +144,10 @@ Test-Suite hspec
   default-language:    Haskell2010
   build-depends:       
                        base                 ==4.6.*,
-                       aeson                >=0.7,
+                       aeson                >=0.6 && < 0.8,
                        base64-bytestring    >=1.0,
                        bytestring           >=0.10,
-                       cereal               >=0.3,
+                       cereal               ==0.3.*,
                        classy-prelude       >=0.7,
                        cmdargs              >=0.10,
                        containers           >=0.5,