that.diff

diff --git a/papa-base-export/src/Papa/Base/Export.hs b/papa-base-export/src/Papa/Base/Export.hs
index 5fa74b8..ea9438d 100644
--- a/papa-base-export/src/Papa/Base/Export.hs
+++ b/papa-base-export/src/Papa/Base/Export.hs
@@ -1,29 +1,49 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
 module Papa.Base.Export(
-  module P
+    module Papa.Base.Export.Control.Applicative,
+    module Papa.Base.Export.Control.Category,
+    module Papa.Base.Export.Control.Monad,
+    module Papa.Base.Export.Data.Bool,
+    module Papa.Base.Export.Data.Char,
+    module Papa.Base.Export.Data.Either,
+    module Papa.Base.Export.Data.Eq,
+    module Papa.Base.Export.Data.Foldable,
+    module Papa.Base.Export.Data.Function,
+    module Papa.Base.Export.Data.Functor,
+    module Papa.Base.Export.Data.Int,
+    module Papa.Base.Export.Data.List,
+    module Papa.Base.Export.Data.List.NonEmpty,
+    module Papa.Base.Export.Data.Maybe,
+    module Papa.Base.Export.Data.Monoid,
+    module Papa.Base.Export.Data.Ord,
+    module Papa.Base.Export.Data.Ratio,
+    module Papa.Base.Export.Data.Semigroup,
+    module Papa.Base.Export.Data.String,
+    module Papa.Base.Export.Data.Traversable,
+    module Papa.Base.Export.Data.Void,
+    module Papa.Base.Export.Prelude
 ) where
 
-import Papa.Base.Export.Control.Applicative as P
-import Papa.Base.Export.Control.Category as P
-import Papa.Base.Export.Control.Monad as P
-import Papa.Base.Export.Data.Bool as P
-import Papa.Base.Export.Data.Char as P
-import Papa.Base.Export.Data.Either as P
-import Papa.Base.Export.Data.Eq as P
-import Papa.Base.Export.Data.Foldable as P
-import Papa.Base.Export.Data.Function as P
-import Papa.Base.Export.Data.Functor as P
-import Papa.Base.Export.Data.Int as P
-import Papa.Base.Export.Data.List as P
-import Papa.Base.Export.Data.List.NonEmpty as P
-import Papa.Base.Export.Data.Maybe as P
-import Papa.Base.Export.Data.Monoid as P
-import Papa.Base.Export.Data.Ord as P
-import Papa.Base.Export.Data.Ratio as P
-import Papa.Base.Export.Data.Semigroup as P
-import Papa.Base.Export.Data.String as P
-import Papa.Base.Export.Data.Traversable as P
-import Papa.Base.Export.Data.Void as P
-import Papa.Base.Export.Prelude as P
-
+import Papa.Base.Export.Control.Applicative
+import Papa.Base.Export.Control.Category
+import Papa.Base.Export.Control.Monad
+import Papa.Base.Export.Data.Bool
+import Papa.Base.Export.Data.Char
+import Papa.Base.Export.Data.Either
+import Papa.Base.Export.Data.Eq
+import Papa.Base.Export.Data.Foldable
+import Papa.Base.Export.Data.Function
+import Papa.Base.Export.Data.Functor
+import Papa.Base.Export.Data.Int
+import Papa.Base.Export.Data.List
+import Papa.Base.Export.Data.List.NonEmpty
+import Papa.Base.Export.Data.Maybe
+import Papa.Base.Export.Data.Monoid
+import Papa.Base.Export.Data.Ord
+import Papa.Base.Export.Data.Ratio
+import Papa.Base.Export.Data.Semigroup
+import Papa.Base.Export.Data.String
+import Papa.Base.Export.Data.Traversable
+import Papa.Base.Export.Data.Void
+import Papa.Base.Export.Prelude
diff --git a/papa-base-export/src/Papa/Base/Export/Control/Applicative.hs b/papa-base-export/src/Papa/Base/Export/Control/Applicative.hs
index 9e28218..a41335a 100644
--- a/papa-base-export/src/Papa/Base/Export/Control/Applicative.hs
+++ b/papa-base-export/src/Papa/Base/Export/Control/Applicative.hs
@@ -1,10 +1,22 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
 module Papa.Base.Export.Control.Applicative(
-  module P
+    Applicative(pure, (<*>), (*>), (<*))
+  , Alternative(empty, (<|>), some, many)
+  , Const(getConst)
+  , WrappedMonad(unwrapMonad)
+  , WrappedArrow(unwrapArrow)
+  , ZipList(getZipList)
+  , (<$>)
+  , (<$)
+  , (<**>)
+  , liftA
+  , liftA2
+  , liftA3
+  , optional
 ) where
 
-import Control.Applicative as P(
+import Control.Applicative (
     Applicative(pure, (<*>), (*>), (<*))
   , Alternative(empty, (<|>), some, many)
   , Const(getConst)
diff --git a/papa-base-implement/src/Papa/Base/Implement.hs b/papa-base-implement/src/Papa/Base/Implement.hs
index b81819a..1b474eb 100644
--- a/papa-base-implement/src/Papa/Base/Implement.hs
+++ b/papa-base-implement/src/Papa/Base/Implement.hs
@@ -1,14 +1,21 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
 module Papa.Base.Implement(
-  module P
+    module Papa.Base.Implement.Control.Applicative,
+    module Papa.Base.Implement.Control.Monad,
+    module Papa.Base.Implement.Data.Foldable,
+    module Papa.Base.Implement.Data.Functor,
+    module Papa.Base.Implement.Data.Function,
+    module Papa.Base.Implement.Data.List,
+    module Papa.Base.Implement.Data.Monoid,
+    module Papa.Base.Implement.Data.Traversable
 ) where
 
-import Papa.Base.Implement.Control.Applicative as P
-import Papa.Base.Implement.Control.Monad as P
-import Papa.Base.Implement.Data.Foldable as P
-import Papa.Base.Implement.Data.Functor as P
-import Papa.Base.Implement.Data.Function as P
-import Papa.Base.Implement.Data.List as P
-import Papa.Base.Implement.Data.Monoid as P
-import Papa.Base.Implement.Data.Traversable as P
+import Papa.Base.Implement.Control.Applicative
+import Papa.Base.Implement.Control.Monad
+import Papa.Base.Implement.Data.Foldable
+import Papa.Base.Implement.Data.Functor
+import Papa.Base.Implement.Data.Function
+import Papa.Base.Implement.Data.List
+import Papa.Base.Implement.Data.Monoid
+import Papa.Base.Implement.Data.Traversable
diff --git a/papa-base/src/Papa/Base.hs b/papa-base/src/Papa/Base.hs
index 6e14f86..6c314f7 100644
--- a/papa-base/src/Papa/Base.hs
+++ b/papa-base/src/Papa/Base.hs
@@ -1,8 +1,9 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
 module Papa.Base(
-  module P
+  module Papa.Base.Export,
+  module Papa.Base.Implement
 ) where
 
-import Papa.Base.Export as P
-import Papa.Base.Implement as P
+import Papa.Base.Export
+import Papa.Base.Implement
diff --git a/papa/src/Papa.hs b/papa/src/Papa.hs
index a8c1817..3362dc7 100644
--- a/papa/src/Papa.hs
+++ b/papa/src/Papa.hs
@@ -1,10 +1,13 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 
 module Papa(
-  module P
+  module Papa.Base,
+  module Papa.Bifunctors,
+  module Papa.Lens,
+  module Papa.Semigroupoids
 ) where
 
-import Papa.Base as P
-import Papa.Bifunctors as P
-import Papa.Lens as P
-import Papa.Semigroupoids as P
+import Papa.Base
+import Papa.Bifunctors
+import Papa.Lens
+import Papa.Semigroupoids