diff --git a/vervis.cabal b/vervis.cabal
index e8beaf9..fd40a62 100644
--- a/vervis.cabal
+++ b/vervis.cabal
@@ -38,7 +38,11 @@ flag library-only
   default:     False
 
 library
-  exposed-modules:     Control.Applicative.Local
+  exposed-modules:
+                       Vervis.Application
+                       Vervis.Hook
+  other-modules:
+                       Control.Applicative.Local
                        Control.Concurrent.Local
                        Control.Concurrent.ResultShare
                        Control.Monad.Trans.Except.Local
@@ -123,7 +127,6 @@ library
                        Vervis.Actor
                        Vervis.ActorKey
                        Vervis.API
-                       Vervis.Application
                        Vervis.Avatar
                        Vervis.BinaryBody
                        Vervis.Changes
@@ -185,7 +188,6 @@ library
                        Vervis.Handler.Ticket
                        -- Vervis.Handler.Wiki
                        -- Vervis.Handler.Workflow
-                       Vervis.Hook
                        Vervis.KeyFile
                        Vervis.Migration
                        Vervis.Migration.Model
@@ -227,7 +229,7 @@ library
                        -- Vervis.Widget.Workflow
                        -- Vervis.Wiki
                        Vervis.WorkItem
-  -- other-modules:       
+
   default-extensions:  TemplateHaskell
                        QuasiQuotes
                        OverloadedStrings
@@ -243,6 +245,7 @@ library
                        ViewPatterns
                        TupleSections
                        RecordWildCards
+
   build-depends:       aeson
                        -- For activity JSOn display in /inbox test page
                      , aeson-pretty
@@ -404,6 +407,7 @@ library
                        -- for reading gzipped darcs inventory via utils in
                        -- Data.Attoparsec.ByteString.Local
                      , zlib
+
   hs-source-dirs:      src
   default-language:    Haskell2010
 
@@ -439,6 +443,7 @@ executable vervis-post-apply
 
 test-suite test
   main-is:             Spec.hs
+
   default-extensions:  TemplateHaskell
                        QuasiQuotes
                        OverloadedStrings
@@ -454,6 +459,7 @@ test-suite test
                        DeriveDataTypeable
                        ViewPatterns
                        TupleSections
+
   build-depends:       base
                      , vervis
                      , yesod-test
@@ -467,6 +473,7 @@ test-suite test
                      , transformers
                      , hspec >= 2.0.0
                      , aeson
+
   hs-source-dirs:      test
   default-language:    Haskell2010
   ghc-options:         -Wall