diff --git a/changelog b/changelog
--- a/changelog
+++ b/changelog
@@ -1,3 +1,7 @@
+0.2.0
+
+* Reorganisation of modules.
+
 0.0.1
 
 * Initial release
diff --git a/papa-lens.cabal b/papa-lens.cabal
--- a/papa-lens.cabal
+++ b/papa-lens.cabal
@@ -1,5 +1,5 @@
 name:               papa-lens
-version:            0.0.1
+version:            0.2.0
 license:            BSD3
 license-file:       LICENSE
 author:             Tony Morris <ʇǝu˙sıɹɹoɯʇ@ןןǝʞsɐɥ>
@@ -19,7 +19,7 @@
   location:         git@github.com:data61/papa-lens.git
 
 flag                small_base
-  description:      Choose the new, split-up base package.
+  description:      Choose the new, split-up lens package.
 
 library
   default-language:
@@ -27,8 +27,9 @@
 
   build-depends:
                     base >= 4.8 && < 5
-                    , lens >= 4.1 && < 5
-
+                    , papa-lens-export >= 0.2.0
+                    , papa-lens-implement >= 0.2.0
+                    
   ghc-options:
                     -Wall
 
diff --git a/src/Papa/Lens.hs b/src/Papa/Lens.hs
--- a/src/Papa/Lens.hs
+++ b/src/Papa/Lens.hs
@@ -1,5 +1,8 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
 module Papa.Lens(
   module P
 ) where
 
-import Control.Lens as P
+import Papa.Lens.Export as P
+import Papa.Lens.Implement as P