diff --git a/driver/Client.hs b/driver/Client.hs
deleted file mode 100644
--- a/driver/Client.hs
+++ /dev/null
@@ -1,13 +0,0 @@
-module Main (main) where
-
-import           System.Exit
-import           Control.Monad
-import qualified Data.ByteString.Lazy as L
-
-import           Client
-
-main :: IO ()
-main = do
-  (success, output) <- client
-  L.putStr output
-  unless success exitFailure
diff --git a/driver/Main.hs b/driver/Main.hs
deleted file mode 100644
--- a/driver/Main.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-module Main (main) where
-
-import           System.Environment
-
-import           Run
-
-main :: IO ()
-main = getArgs >>= run
diff --git a/driver/Web.hs b/driver/Web.hs
deleted file mode 100644
--- a/driver/Web.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-module Main (main) where
-
-import           System.Environment
-
-import           Run
-
-main :: IO ()
-main = getArgs >>= runWeb
diff --git a/driver/seito.hs b/driver/seito.hs
new file mode 100644
--- /dev/null
+++ b/driver/seito.hs
@@ -0,0 +1,13 @@
+module Main (main) where
+
+import           System.Exit
+import           Control.Monad
+import qualified Data.ByteString.Lazy as L
+
+import           Client
+
+main :: IO ()
+main = do
+  (success, output) <- client
+  L.putStr output
+  unless success exitFailure
diff --git a/driver/sensei-web.hs b/driver/sensei-web.hs
new file mode 100644
--- /dev/null
+++ b/driver/sensei-web.hs
@@ -0,0 +1,8 @@
+module Main (main) where
+
+import           System.Environment
+
+import           Run
+
+main :: IO ()
+main = getArgs >>= runWeb
diff --git a/driver/sensei.hs b/driver/sensei.hs
new file mode 100644
--- /dev/null
+++ b/driver/sensei.hs
@@ -0,0 +1,8 @@
+module Main (main) where
+
+import           System.Environment
+
+import           Run
+
+main :: IO ()
+main = getArgs >>= run
diff --git a/sensei.cabal b/sensei.cabal
--- a/sensei.cabal
+++ b/sensei.cabal
@@ -1,9 +1,9 @@
--- This file has been generated from package.yaml by hpack version 0.8.0.
+-- This file has been generated from package.yaml by hpack version 0.11.0.
 --
 -- see: https://github.com/sol/hpack
 
 name:           sensei
-version:        0.0.0
+version:        0.1.0
 synopsis:       Automatically run Hspec tests on file modifications
 category:       Development
 homepage:       https://github.com/hspec/sensei#readme
@@ -18,10 +18,12 @@
   type: git
   location: https://github.com/hspec/sensei
 
-library
+executable seito
+  main-is: seito.hs
   hs-source-dirs:
       src
     , doctest/ghci-wrapper/src/
+    , driver
   ghc-options: -Wall
   build-depends:
       base >= 4.7 && < 5
@@ -41,7 +43,7 @@
     , bytestring
     , filepath
     , unix
-  exposed-modules:
+  other-modules:
       Client
       EventQueue
       HTTP
@@ -53,32 +55,12 @@
       Language.Haskell.GhciWrapper
   default-language: Haskell2010
 
-executable sensei-web
-  main-is: driver/Web.hs
-  ghc-options: -Wall
-  build-depends:
-      base >= 4.7 && < 5
-    , base-compat >= 0.8
-    , process
-    , fsnotify
-    , time
-    , wai
-    , warp
-    , http-types
-    , stm
-    , text
-    , network
-    , ansi-terminal
-    , directory
-    , http-client
-    , bytestring
-    , filepath
-    , unix
-    , sensei
-  default-language: Haskell2010
-
-executable seito
-  main-is: driver/Client.hs
+executable sensei
+  main-is: sensei.hs
+  hs-source-dirs:
+      src
+    , doctest/ghci-wrapper/src/
+    , driver
   ghc-options: -Wall
   build-depends:
       base >= 4.7 && < 5
@@ -98,11 +80,24 @@
     , bytestring
     , filepath
     , unix
-    , sensei
+  other-modules:
+      Client
+      EventQueue
+      HTTP
+      Options
+      Run
+      Session
+      Trigger
+      Util
+      Language.Haskell.GhciWrapper
   default-language: Haskell2010
 
-executable sensei
-  main-is: driver/Main.hs
+executable sensei-web
+  main-is: sensei-web.hs
+  hs-source-dirs:
+      src
+    , doctest/ghci-wrapper/src/
+    , driver
   ghc-options: -Wall
   build-depends:
       base >= 4.7 && < 5
@@ -122,14 +117,25 @@
     , bytestring
     , filepath
     , unix
-    , sensei
+  other-modules:
+      Client
+      EventQueue
+      HTTP
+      Options
+      Run
+      Session
+      Trigger
+      Util
+      Language.Haskell.GhciWrapper
   default-language: Haskell2010
 
 test-suite spec
   type: exitcode-stdio-1.0
   main-is: Spec.hs
   hs-source-dirs:
-      test
+      src
+    , doctest/ghci-wrapper/src/
+    , test
   ghc-options: -Wall
   build-depends:
       base >= 4.7 && < 5
@@ -149,13 +155,21 @@
     , bytestring
     , filepath
     , unix
-    , sensei
     , hspec >= 2.2.1
     , hspec-wai
     , mockery
     , silently
     , interpolate
   other-modules:
+      Client
+      EventQueue
+      HTTP
+      Options
+      Run
+      Session
+      Trigger
+      Util
+      Language.Haskell.GhciWrapper
       ClientSpec
       Helper
       HTTPSpec