diff --git a/src/NixTree/Main.hs b/app/Main.hs
similarity index 99%
rename from src/NixTree/Main.hs
rename to app/Main.hs
index a212088..72cfbff 100644
--- a/src/NixTree/Main.hs
+++ b/app/Main.hs
@@ -4,7 +4,7 @@ module Main where
 
 import Control.Concurrent.Async
 import Control.Exception (evaluate)
-import NixTree.App
+import NixTree.BrickApp
 import NixTree.PathStats
 import qualified Options.Applicative as Opts
 import qualified Options.Applicative.Help.Pretty as Opts
diff --git a/src/NixTree/App.hs b/app/NixTree/BrickApp.hs
similarity index 99%
rename from src/NixTree/App.hs
rename to app/NixTree/BrickApp.hs
index 43e0ef6..e3098bc 100644
--- a/src/NixTree/App.hs
+++ b/app/NixTree/BrickApp.hs
@@ -1,4 +1,4 @@
-module NixTree.App (run, helpText) where
+module NixTree.BrickApp (run, helpText) where
 
 import qualified Brick as B
 import qualified Brick.BChan as B
@@ -6,7 +6,6 @@ import qualified Brick.Widgets.Border as B
 import qualified Brick.Widgets.Center as B
 import qualified Brick.Widgets.List as B
 import Control.Concurrent
-import Data.InvertedIndex
 import qualified Data.List.NonEmpty as NE
 import qualified Data.Map as Map
 import qualified Data.Sequence as S
@@ -15,6 +14,7 @@ import qualified Data.Text as T
 import qualified Graphics.Vty as V
 import Lens.Micro (Traversal', _Just)
 import qualified NixTree.Clipboard as Clipboard
+import NixTree.Data.InvertedIndex
 import NixTree.PathStats
 import qualified System.Clock as Clock
 import qualified System.HrfSize as HRF
diff --git a/src/NixTree/Clipboard.hs b/app/NixTree/Clipboard.hs
similarity index 100%
rename from src/NixTree/Clipboard.hs
rename to app/NixTree/Clipboard.hs
diff --git a/nix-tree.cabal b/nix-tree.cabal
index 515c1b6..9ce933e 100644
--- a/nix-tree.cabal
+++ b/nix-tree.cabal
@@ -38,46 +38,50 @@ common common-options
                       NumericUnderscores
                       MultiWayIf
                       TemplateHaskell
-  other-modules:      NixTree.PathStats
-                      NixTree.StorePath
-                      NixTree.App
-                      Data.InvertedIndex
-                      NixTree.Clipboard
   mixins:             base hiding (Prelude)
                     , relude (Relude as Prelude)
-  build-depends:      base
+  build-depends:      base >=4.11 && < 5
                     , relude
-                    , aeson
-                    , brick >= 2.1
-                    , bytestring
                     , containers
                     , clock
                     , filepath
                     , hrfsize
                     , text
                     , typed-process
-                    , unordered-containers
                     , vty
                     , directory
                     , optparse-applicative
                     , microlens
+
+library
+  import:             common-options
+  hs-source-dirs:     src
+  exposed-modules:    NixTree.PathStats
+                      NixTree.StorePath
+                      NixTree.Data.InvertedIndex
+  build-depends:      aeson
+                    , bytestring
+                    , unordered-containers
                     , dot
 
 executable nix-tree
   import:             common-options
   ghc-options:        -Wunused-packages -threaded -with-rtsopts=-N
-  main-is:            NixTree/Main.hs
-  hs-source-dirs:     src
+  main-is:            Main.hs
+  hs-source-dirs:     app
+  other-modules:      NixTree.BrickApp
+                      NixTree.Clipboard
   default-language:   Haskell2010
-  build-depends:      base >= 4.11 && < 5
-                    , terminal-progress-bar
+  build-depends:      terminal-progress-bar
                     , async
+                    , brick >= 2.1
+                    , nix-tree
 
 test-suite nix-tree-tests
   import:           common-options
   type:             exitcode-stdio-1.0
-  hs-source-dirs:   test/ src/
-  other-modules:    Test.Data.InvertedIndex
+  hs-source-dirs:   test
+  other-modules:    Test.NixTree.Data.InvertedIndex
   main-is:          Test.hs
-  build-depends:    base >=4.11 && < 5
-                  , hedgehog
+  build-depends:    hedgehog
+                  , nix-tree
diff --git a/src/Data/InvertedIndex.hs b/src/NixTree/Data/InvertedIndex.hs
similarity index 98%
rename from src/Data/InvertedIndex.hs
rename to src/NixTree/Data/InvertedIndex.hs
index 734b67b..e4f8dad 100644
--- a/src/Data/InvertedIndex.hs
+++ b/src/NixTree/Data/InvertedIndex.hs
@@ -1,4 +1,4 @@
-module Data.InvertedIndex
+module NixTree.Data.InvertedIndex
   ( InvertedIndex,
     iiFromList,
     iiInsert,
diff --git a/test/Test.hs b/test/Test.hs
index 2687e58..69ae132 100644
--- a/test/Test.hs
+++ b/test/Test.hs
@@ -4,9 +4,9 @@ module Main where
 
 import Hedgehog
 import Hedgehog.Main
-import qualified Test.Data.InvertedIndex
+import qualified Test.NixTree.Data.InvertedIndex
 
 main :: IO ()
 main =
   defaultMain . map checkParallel $
-    [Test.Data.InvertedIndex.tests]
+    [Test.NixTree.Data.InvertedIndex.tests]
diff --git a/test/Test/Data/InvertedIndex.hs b/test/Test/NixTree/Data/InvertedIndex.hs
similarity index 90%
rename from test/Test/Data/InvertedIndex.hs
rename to test/Test/NixTree/Data/InvertedIndex.hs
index dfd73ae..4ef4e12 100644
--- a/test/Test/Data/InvertedIndex.hs
+++ b/test/Test/NixTree/Data/InvertedIndex.hs
@@ -1,13 +1,13 @@
 {-# LANGUAGE TemplateHaskell #-}
 
-module Test.Data.InvertedIndex (tests) where
+module Test.NixTree.Data.InvertedIndex (tests) where
 
-import Data.InvertedIndex
 import qualified Data.Map as Map
 import qualified Data.Text as Text
 import Hedgehog
 import qualified Hedgehog.Gen as Gen
 import qualified Hedgehog.Range as Range
+import NixTree.Data.InvertedIndex
 
 prop_inverted_index :: Property
 prop_inverted_index = withDiscards 10000 . withTests 10000 . property $ do