diff --git a/changelog b/changelog
--- a/changelog
+++ b/changelog
@@ -1,3 +1,7 @@
+0.1.0
+
+* Reorganisation of all `papa` packages.
+
 0.0.1
 
 * Initial release
diff --git a/papa.cabal b/papa.cabal
--- a/papa.cabal
+++ b/papa.cabal
@@ -1,5 +1,5 @@
 name:               papa
-version:            0.0.1
+version:            0.1.0
 license:            BSD3
 license-file:       LICENSE
 author:             Tony Morris <ʇǝu˙sıɹɹoɯʇ@ןןǝʞsɐɥ>
@@ -27,8 +27,9 @@
 
   build-depends:
                     base >= 4.8 && < 5
-                    , papa-lens >= 0.0.1 && < 0.1
-                    , papa-prelude >= 0.0.1 && < 0.1
+                    , papa-base >= 0.1.0 && < 0.2
+                    , papa-prelude >= 0.1.0 && < 0.2
+                    , papa-include >= 0.1.0 && < 0.2
                    
   ghc-options:
                     -Wall
diff --git a/src/Papa.hs b/src/Papa.hs
--- a/src/Papa.hs
+++ b/src/Papa.hs
@@ -1,6 +1,9 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
 module Papa(
   module P
 ) where
 
+import Papa.Base as P
+import Papa.Include as P
 import Papa.Prelude as P
-import Papa.Lens as P