diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -1,21 +1,30 @@
-MIT License
+Copyright John Ky (c) 2016
 
-Copyright (c) 2016 John Ky
+All rights reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Author name here nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/hw-prim.cabal b/hw-prim.cabal
--- a/hw-prim.cabal
+++ b/hw-prim.cabal
@@ -1,9 +1,9 @@
 name:                   hw-prim
-version:                0.3.0.5
+version:                0.4.0.0
 synopsis:               Primitive functions and data types
 description:            Please see README.md
 homepage:               http://github.com/haskell-works/hw-prim#readme
-license:                MIT
+license:                BSD3
 license-file:           LICENSE
 author:                 John Ky
 maintainer:             newhoggy@gmail.com
@@ -37,11 +37,6 @@
                       , HaskellWorks.Data.Generate
                       , HaskellWorks.Data.Length
                       , HaskellWorks.Data.Naive
-                      , HaskellWorks.Data.Narrow
-                      , HaskellWorks.Data.Narrow.Narrow8
-                      , HaskellWorks.Data.Narrow.Narrow16
-                      , HaskellWorks.Data.Narrow.Narrow32
-                      , HaskellWorks.Data.Narrow.Narrow64
                       , HaskellWorks.Data.Positioning
                       , HaskellWorks.Data.Search
                       , HaskellWorks.Data.Sign
@@ -53,11 +48,6 @@
                       , HaskellWorks.Data.Vector.AsVector64
                       , HaskellWorks.Data.Vector.BoxedVectorLike
                       , HaskellWorks.Data.Vector.StorableVectorLike
-                      , HaskellWorks.Data.Widen
-                      , HaskellWorks.Data.Widen.Widen8
-                      , HaskellWorks.Data.Widen.Widen16
-                      , HaskellWorks.Data.Widen.Widen32
-                      , HaskellWorks.Data.Widen.Widen64
   build-depends:        base                          >= 4          && < 5
                       , bytestring
                       , vector
diff --git a/src/HaskellWorks/Data/Narrow.hs b/src/HaskellWorks/Data/Narrow.hs
deleted file mode 100644
--- a/src/HaskellWorks/Data/Narrow.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-module HaskellWorks.Data.Narrow
-  ( module X
-  ) where
-
-import HaskellWorks.Data.Narrow.Narrow8   as X
-import HaskellWorks.Data.Narrow.Narrow16  as X
-import HaskellWorks.Data.Narrow.Narrow32  as X
-import HaskellWorks.Data.Narrow.Narrow64  as X
diff --git a/src/HaskellWorks/Data/Narrow/Narrow16.hs b/src/HaskellWorks/Data/Narrow/Narrow16.hs
deleted file mode 100644
--- a/src/HaskellWorks/Data/Narrow/Narrow16.hs
+++ /dev/null
@@ -1,42 +0,0 @@
-{-# LANGUAGE TypeFamilies #-}
-
-module HaskellWorks.Data.Narrow.Narrow16
-  ( Narrow16(..)
-  ) where
-
-import Data.Int
-import Data.Word
-
-class Narrow16 a where
-  type Narrowed16 a
-  narrow16 :: a -> Narrowed16 a
-
-instance Narrow16 Word16 where
-  type Narrowed16 Word16 = Word16
-  narrow16 = fromIntegral
-  {-# INLINE narrow16 #-}
-
-instance Narrow16 Word32 where
-  type Narrowed16 Word32 = Word16
-  narrow16 = fromIntegral
-  {-# INLINE narrow16 #-}
-
-instance Narrow16 Word64 where
-  type Narrowed16 Word64 = Word16
-  narrow16 = fromIntegral
-  {-# INLINE narrow16 #-}
-
-instance Narrow16 Int16 where
-  type Narrowed16 Int16 = Int16
-  narrow16 = fromIntegral
-  {-# INLINE narrow16 #-}
-
-instance Narrow16 Int32 where
-  type Narrowed16 Int32 = Int16
-  narrow16 = fromIntegral
-  {-# INLINE narrow16 #-}
-
-instance Narrow16 Int64 where
-  type Narrowed16 Int64 = Int16
-  narrow16 = fromIntegral
-  {-# INLINE narrow16 #-}
diff --git a/src/HaskellWorks/Data/Narrow/Narrow32.hs b/src/HaskellWorks/Data/Narrow/Narrow32.hs
deleted file mode 100644
--- a/src/HaskellWorks/Data/Narrow/Narrow32.hs
+++ /dev/null
@@ -1,32 +0,0 @@
-{-# LANGUAGE TypeFamilies #-}
-
-module HaskellWorks.Data.Narrow.Narrow32
-  ( Narrow32(..)
-  ) where
-
-import Data.Int
-import Data.Word
-
-class Narrow32 a where
-  type Narrowed32 a
-  narrow32 :: a -> Narrowed32 a
-
-instance Narrow32 Word32 where
-  type Narrowed32 Word32 = Word32
-  narrow32 = fromIntegral
-  {-# INLINE narrow32 #-}
-
-instance Narrow32 Word64 where
-  type Narrowed32 Word64 = Word32
-  narrow32 = fromIntegral
-  {-# INLINE narrow32 #-}
-
-instance Narrow32 Int32 where
-  type Narrowed32 Int32 = Int32
-  narrow32 = fromIntegral
-  {-# INLINE narrow32 #-}
-
-instance Narrow32 Int64 where
-  type Narrowed32 Int64 = Int32
-  narrow32 = fromIntegral
-  {-# INLINE narrow32 #-}
diff --git a/src/HaskellWorks/Data/Narrow/Narrow64.hs b/src/HaskellWorks/Data/Narrow/Narrow64.hs
deleted file mode 100644
--- a/src/HaskellWorks/Data/Narrow/Narrow64.hs
+++ /dev/null
@@ -1,22 +0,0 @@
-{-# LANGUAGE TypeFamilies #-}
-
-module HaskellWorks.Data.Narrow.Narrow64
-  ( Narrow64(..)
-  ) where
-
-import Data.Int
-import Data.Word
-
-class Narrow64 a where
-  type Narrowed64 a
-  narrow64 :: a -> Narrowed64 a
-
-instance Narrow64 Word64 where
-  type Narrowed64 Word64 = Word64
-  narrow64 = fromIntegral
-  {-# INLINE narrow64 #-}
-
-instance Narrow64 Int64 where
-  type Narrowed64 Int64 = Int64
-  narrow64 = fromIntegral
-  {-# INLINE narrow64 #-}
diff --git a/src/HaskellWorks/Data/Narrow/Narrow8.hs b/src/HaskellWorks/Data/Narrow/Narrow8.hs
deleted file mode 100644
--- a/src/HaskellWorks/Data/Narrow/Narrow8.hs
+++ /dev/null
@@ -1,52 +0,0 @@
-{-# LANGUAGE TypeFamilies #-}
-
-module HaskellWorks.Data.Narrow.Narrow8
-  ( Narrow8(..)
-  ) where
-
-import Data.Int
-import Data.Word
-
-class Narrow8 a where
-  type Narrowed8 a
-  narrow8 :: a -> Narrowed8 a
-
-instance Narrow8 Word8 where
-  type Narrowed8 Word8 = Word8
-  narrow8 = fromIntegral
-  {-# INLINE narrow8 #-}
-
-instance Narrow8 Word16 where
-  type Narrowed8 Word16 = Word8
-  narrow8 = fromIntegral
-  {-# INLINE narrow8 #-}
-
-instance Narrow8 Word32 where
-  type Narrowed8 Word32 = Word8
-  narrow8 = fromIntegral
-  {-# INLINE narrow8 #-}
-
-instance Narrow8 Word64 where
-  type Narrowed8 Word64 = Word8
-  narrow8 = fromIntegral
-  {-# INLINE narrow8 #-}
-
-instance Narrow8 Int8 where
-  type Narrowed8 Int8 = Int8
-  narrow8 = fromIntegral
-  {-# INLINE narrow8 #-}
-
-instance Narrow8 Int16 where
-  type Narrowed8 Int16 = Int8
-  narrow8 = fromIntegral
-  {-# INLINE narrow8 #-}
-
-instance Narrow8 Int32 where
-  type Narrowed8 Int32 = Int8
-  narrow8 = fromIntegral
-  {-# INLINE narrow8 #-}
-
-instance Narrow8 Int64 where
-  type Narrowed8 Int64 = Int8
-  narrow8 = fromIntegral
-  {-# INLINE narrow8 #-}
diff --git a/src/HaskellWorks/Data/Widen.hs b/src/HaskellWorks/Data/Widen.hs
deleted file mode 100644
--- a/src/HaskellWorks/Data/Widen.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-module HaskellWorks.Data.Widen
-  ( module X
-  ) where
-
-import HaskellWorks.Data.Widen.Widen8  as X
-import HaskellWorks.Data.Widen.Widen16 as X
-import HaskellWorks.Data.Widen.Widen32 as X
-import HaskellWorks.Data.Widen.Widen64 as X
diff --git a/src/HaskellWorks/Data/Widen/Widen16.hs b/src/HaskellWorks/Data/Widen/Widen16.hs
deleted file mode 100644
--- a/src/HaskellWorks/Data/Widen/Widen16.hs
+++ /dev/null
@@ -1,32 +0,0 @@
-{-# LANGUAGE TypeFamilies #-}
-
-module HaskellWorks.Data.Widen.Widen16
-  ( Widen16(..)
-  ) where
-
-import Data.Int
-import Data.Word
-
-class Widen16 a where
-  type Widened16 a
-  widen16 :: a -> Widened16 a
-
-instance Widen16 Word8 where
-  type Widened16 Word8 = Word16
-  widen16 = fromIntegral
-  {-# INLINE widen16 #-}
-
-instance Widen16 Word16 where
-  type Widened16 Word16 = Word16
-  widen16 = fromIntegral
-  {-# INLINE widen16 #-}
-
-instance Widen16 Int8 where
-  type Widened16 Int8 = Int16
-  widen16 = fromIntegral
-  {-# INLINE widen16 #-}
-
-instance Widen16 Int16 where
-  type Widened16 Int16 = Int16
-  widen16 = fromIntegral
-  {-# INLINE widen16 #-}
diff --git a/src/HaskellWorks/Data/Widen/Widen32.hs b/src/HaskellWorks/Data/Widen/Widen32.hs
deleted file mode 100644
--- a/src/HaskellWorks/Data/Widen/Widen32.hs
+++ /dev/null
@@ -1,42 +0,0 @@
-{-# LANGUAGE TypeFamilies #-}
-
-module HaskellWorks.Data.Widen.Widen32
-  ( Widen32(..)
-  ) where
-
-import Data.Int
-import Data.Word
-
-class Widen32 a where
-  type Widened32 a
-  widen32 :: a -> Widened32 a
-
-instance Widen32 Word8 where
-  type Widened32 Word8 = Word32
-  widen32 = fromIntegral
-  {-# INLINE widen32 #-}
-
-instance Widen32 Word16 where
-  type Widened32 Word16 = Word32
-  widen32 = fromIntegral
-  {-# INLINE widen32 #-}
-
-instance Widen32 Word32 where
-  type Widened32 Word32 = Word32
-  widen32 = fromIntegral
-  {-# INLINE widen32 #-}
-
-instance Widen32 Int8 where
-  type Widened32 Int8 = Int32
-  widen32 = fromIntegral
-  {-# INLINE widen32 #-}
-
-instance Widen32 Int16 where
-  type Widened32 Int16 = Int32
-  widen32 = fromIntegral
-  {-# INLINE widen32 #-}
-
-instance Widen32 Int32 where
-  type Widened32 Int32 = Int32
-  widen32 = fromIntegral
-  {-# INLINE widen32 #-}
diff --git a/src/HaskellWorks/Data/Widen/Widen64.hs b/src/HaskellWorks/Data/Widen/Widen64.hs
deleted file mode 100644
--- a/src/HaskellWorks/Data/Widen/Widen64.hs
+++ /dev/null
@@ -1,52 +0,0 @@
-{-# LANGUAGE TypeFamilies #-}
-
-module HaskellWorks.Data.Widen.Widen64
-  ( Widen64(..)
-  ) where
-
-import Data.Int
-import Data.Word
-
-class Widen64 a where
-  type Widened64 a
-  widen64 :: a -> Widened64 a
-
-instance Widen64 Word8 where
-  type Widened64 Word8 = Word64
-  widen64 = fromIntegral
-  {-# INLINE widen64 #-}
-
-instance Widen64 Word16 where
-  type Widened64 Word16 = Word64
-  widen64 = fromIntegral
-  {-# INLINE widen64 #-}
-
-instance Widen64 Word32 where
-  type Widened64 Word32 = Word64
-  widen64 = fromIntegral
-  {-# INLINE widen64 #-}
-
-instance Widen64 Word64 where
-  type Widened64 Word64 = Word64
-  widen64 = id
-  {-# INLINE widen64 #-}
-
-instance Widen64 Int8 where
-  type Widened64 Int8 = Int64
-  widen64 = fromIntegral
-  {-# INLINE widen64 #-}
-
-instance Widen64 Int16 where
-  type Widened64 Int16 = Int64
-  widen64 = fromIntegral
-  {-# INLINE widen64 #-}
-
-instance Widen64 Int32 where
-  type Widened64 Int32 = Int64
-  widen64 = fromIntegral
-  {-# INLINE widen64 #-}
-
-instance Widen64 Int64 where
-  type Widened64 Int64 = Int64
-  widen64 = id
-  {-# INLINE widen64 #-}
diff --git a/src/HaskellWorks/Data/Widen/Widen8.hs b/src/HaskellWorks/Data/Widen/Widen8.hs
deleted file mode 100644
--- a/src/HaskellWorks/Data/Widen/Widen8.hs
+++ /dev/null
@@ -1,22 +0,0 @@
-{-# LANGUAGE TypeFamilies #-}
-
-module HaskellWorks.Data.Widen.Widen8
-  ( Widen8(..)
-  ) where
-
-import Data.Int
-import Data.Word
-
-class Widen8 a where
-  type Widened8 a
-  widen8 :: a -> Widened8 a
-
-instance Widen8 Word8 where
-  type Widened8 Word8 = Word8
-  widen8 = fromIntegral
-  {-# INLINE widen8 #-}
-
-instance Widen8 Int8 where
-  type Widened8 Int8 = Int8
-  widen8 = fromIntegral
-  {-# INLINE widen8 #-}