diff --git a/hi.cabal b/hi.cabal
--- a/hi.cabal
+++ b/hi.cabal
@@ -1,5 +1,5 @@
 name:                hi
-version:             0.0.3
+version:             0.0.4
 synopsis:            Generate scaffold for cabal project
 license:             BSD3
 license-file:        LICENSE
diff --git a/src/Distribution/Hi.hs b/src/Distribution/Hi.hs
--- a/src/Distribution/Hi.hs
+++ b/src/Distribution/Hi.hs
@@ -2,7 +2,7 @@
 module Distribution.Hi where
 
 import           Distribution.Hi.Compiler (compile)
-import           Distribution.Hi.FilePath (toDestionationPath, toDir)
+import           Distribution.Hi.FilePath (toDestionationPath)
 import           Distribution.Hi.Context  (context)
 import           Distribution.Hi.Types
 import           Distribution.Hi.Template (withTemplatesFromRepo)
@@ -10,18 +10,18 @@
 import           Control.Monad
 import           System.Directory     (createDirectoryIfMissing,
                                        getCurrentDirectory)
-import           System.FilePath      (joinPath)
+import           System.FilePath      (joinPath, dropFileName)
 
 -- | Main function
 cli :: InitFlags -> IO ()
-cli initFlags@(InitFlags {moduleName, repository}) = do
+cli initFlags@(InitFlags {repository}) = do
     currentDirecotory <- getCurrentDirectory
 
-    withTemplatesFromRepo (repository) $ \templates -> do
+    withTemplatesFromRepo repository $ \templates -> do
 
       let sourceAndDestinations = map (id &&& toDestionationPath initFlags) templates
 
-      createDirectoryIfMissing True $ joinPath [currentDirecotory, "src",  toDir moduleName]
-      createDirectoryIfMissing True $ joinPath [currentDirecotory, "test", toDir moduleName]
-
-      forM_ sourceAndDestinations $ \(s,d) -> compile s (joinPath [currentDirecotory, d]) $ context initFlags
+      forM_ sourceAndDestinations $ \(src,dst) -> do
+        let dst' = joinPath [currentDirecotory, dst]
+        createDirectoryIfMissing True $ dropFileName dst'
+        compile src dst' $ context initFlags
diff --git a/src/Distribution/Hi/FilePath.hs b/src/Distribution/Hi/FilePath.hs
--- a/src/Distribution/Hi/FilePath.hs
+++ b/src/Distribution/Hi/FilePath.hs
@@ -1,7 +1,6 @@
 module Distribution.Hi.FilePath
     (
       toDestionationPath
-    , toDir
     ) where
 
 import           Distribution.Hi.Types
diff --git a/src/Distribution/Hi/Version.hs b/src/Distribution/Hi/Version.hs
--- a/src/Distribution/Hi/Version.hs
+++ b/src/Distribution/Hi/Version.hs
@@ -4,4 +4,4 @@
     ) where
 
 version :: String
-version = "0.0.3"
+version = "0.0.4"
diff --git a/src/Main.hs b/src/Main.hs
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -9,6 +9,6 @@
 main = do
     mode <- getMode
     case mode of
-      ShowVersion                -> print version
+      ShowVersion                -> putStrLn version
       RunWithNoConfigurationFile -> Hi.cli =<< getInitFlags
       Run                        -> Hi.cli =<< getInitFlags