diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
 # hw-succinct
-[![v0.0-branch](https://circleci.com/gh/haskell-works/hw-succinct/tree/v0.0-branch.svg?style=svg)](https://circleci.com/gh/haskell-works/hw-succinct/tree/v0.0-branch)
+[![0.0-branch](https://circleci.com/gh/haskell-works/hw-succinct/tree/0.0-branch.svg?style=svg)](https://circleci.com/gh/haskell-works/hw-succinct/tree/0.0-branch)
 
 Note: The succinct Json parsing library has moved to https://github.com/haskell-works/hw-json
diff --git a/hw-succinct.cabal b/hw-succinct.cabal
--- a/hw-succinct.cabal
+++ b/hw-succinct.cabal
@@ -1,9 +1,9 @@
 name:                   hw-succinct
-version:                0.0.0.14
-synopsis:               Conduits for tokenizing streams.
+version:                0.1.0.1
+synopsis:               Succint datastructures
 description:            Please see README.md
 homepage:               http://github.com/haskell-works/hw-succinct#readme
-license:                BSD3
+license:                MIT
 license-file:           LICENSE
 author:                 John Ky
 maintainer:             newhoggy@gmail.com
@@ -11,28 +11,29 @@
 category:               Data, Conduit
 build-type:             Simple
 extra-source-files:     README.md
-cabal-version:          >= 1.10
+cabal-version:          >= 1.22
 
 library
   hs-source-dirs:       src
   exposed-modules:      HaskellWorks.Data.Succinct
-  build-depends:        base                            >= 4.7  && < 5
+  build-depends:        base                          >= 4          && < 5
                       , attoparsec
                       , bytestring
                       , conduit
                       , containers
-                      , hw-bits
-                      , hw-conduit
-                      , hw-parser
-                      , hw-prim
-                      , hw-rankselect
+                      , hw-balancedparens             >= 0.1.0.0
+                      , hw-bits                       >= 0.4.0.0
+                      , hw-prim                       >= 0.4.0.0
+                      , hw-rankselect                 >= 0.8.0.0
+                      , hw-rankselect-base            >= 0.2.0.0
+                      , mmap
                       , mono-traversable
                       , text
                       , vector
                       , word8
 
   default-language:     Haskell2010
-  ghc-options:          -rtsopts -with-rtsopts=-N -Wall -O2 -Wall -msse4.2
+  ghc-options:          -Wall -msse4.2
 
 source-repository head
   type:     git
diff --git a/src/HaskellWorks/Data/Succinct.hs b/src/HaskellWorks/Data/Succinct.hs
--- a/src/HaskellWorks/Data/Succinct.hs
+++ b/src/HaskellWorks/Data/Succinct.hs
@@ -7,6 +7,5 @@
     ( module X
     ) where
 
-import           HaskellWorks.Data.Succinct.BalancedParens   as X
-import           HaskellWorks.Data.Succinct.NearestNeighbour as X
-import           HaskellWorks.Data.Succinct.RankSelect       as X
+import           HaskellWorks.Data.BalancedParens   as X
+import           HaskellWorks.Data.RankSelect.Base  as X