diff --git a/fswatch.cabal b/fswatch.cabal
--- a/fswatch.cabal
+++ b/fswatch.cabal
@@ -1,6 +1,6 @@
 
 name:                fswatch
-version:             0.1.0.0
+version:             0.1.0.1
 synopsis:            File System watching tool with cli and slave functionalities.
 description:         File System watching tool with cli and slave lib (with os process) functionalities.
 category:            Filesystem
diff --git a/src/System/FSWatch.hs b/src/System/FSWatch.hs
--- a/src/System/FSWatch.hs
+++ b/src/System/FSWatch.hs
@@ -3,7 +3,7 @@
            , RecordWildCards
            #-}
 
-module System.FSWatch where
+module System.FSWatch (watchMain, getOpts) where
 
 import Data.List
 import Data.Semigroup ((<>))
@@ -11,13 +11,10 @@
 import Control.Monad
 import Control.Monad.IO.Class
 import Control.Concurrent
-import Control.Concurrent.Chan
-import Control.Concurrent.MVar
 import Options.Applicative hiding (defaultPrefs)
 
 import System.Console.Haskeline
 import System.Console.Haskeline.History
-import System.Console.Haskeline.Completion
 import System.Directory
 import System.FSNotify
 import System.IO
@@ -58,8 +55,8 @@
     printFormat <- newMVar MultiRecord
     buffering <- newMVar $ case (oFixBufferMode opts, oDelayedBufferMode opts) of
       (0,0) -> NoNotifyBuffer
-      (i,0) -> FixTimeBuffer i
       (0,i) -> DelayedBuffer i
+      (i,_) -> FixTimeBuffer i
     mode <- newMVar CLI
     case oSlave opts of
         True -> do
diff --git a/src/System/FSWatch/Repr.hs b/src/System/FSWatch/Repr.hs
--- a/src/System/FSWatch/Repr.hs
+++ b/src/System/FSWatch/Repr.hs
@@ -1,20 +1,10 @@
 module System.FSWatch.Repr where
 
-import Data.List
 
-import Control.Monad
-import Control.Monad.IO.Class
 import Control.Concurrent
-import Control.Concurrent.Chan
-import Control.Concurrent.MVar
 
-import System.Console.Haskeline
-import System.Console.Haskeline.History
-import System.Console.Haskeline.Completion
-import System.Directory
 import System.FSNotify
 import System.IO
-import System.Environment
 import System.Process
 
 
diff --git a/src/System/FSWatch/Slave.hs b/src/System/FSWatch/Slave.hs
--- a/src/System/FSWatch/Slave.hs
+++ b/src/System/FSWatch/Slave.hs
@@ -4,23 +4,19 @@
            , RecordWildCards
            #-}
 
-module System.FSWatch.Slave where
-
-import Data.List
-import Data.Semigroup ((<>))
+module System.FSWatch.Slave ( createWatchProcess
+                            , createWatchProcessWithListener
+                            , createWatchProcessWL
+                            , watch
+                            , stop
+                            , getNotifies
+                            , waitNotifies
+                            ) where
 
 import Control.Monad
 import Control.Monad.IO.Class
 import Control.Concurrent
-import Control.Concurrent.Chan
-import Control.Concurrent.MVar
-import Options.Applicative hiding (defaultPrefs)
 
-import System.Console.Haskeline
-import System.Console.Haskeline.History
-import System.Console.Haskeline.Completion
-import System.Directory
-import System.FSNotify
 import System.IO
 import System.Process