diff --git a/Pipes/Text.hs b/Pipes/Text.hs
--- a/Pipes/Text.hs
+++ b/Pipes/Text.hs
@@ -159,13 +159,17 @@
 
    -- * Re-exports
     -- $reexports
+    , Decoding(..)
+    , streamDecodeUtf8
+    , decodeSomeUtf8
+    , Codec(..)
+    , TextException(..)
     , module Data.ByteString
     , module Data.Text
     , module Data.Profunctor
     , module Data.Word
     , module Pipes.Parse
     , module Pipes.Group
-    , module Pipes.Text.Internal
     ) where
 
 import Control.Exception (throwIO, try)
diff --git a/Pipes/Text/Internal.hs b/Pipes/Text/Internal.hs
--- a/Pipes/Text/Internal.hs
+++ b/Pipes/Text/Internal.hs
@@ -1,15 +1,7 @@
 module Pipes.Text.Internal
-    ( Decoding(..)
-    , streamDecodeUtf8
-    , decodeSomeUtf8
-    , Codec(..)
-    , TextException(..)
-    , utf8
-    , utf16_le
-    , utf16_be
-    , utf32_le
-    , utf32_be
+    (module Pipes.Text.Internal.Codec
+    , module Pipes.Text.Internal.Decoding
     ) where
 
-import Pipes.Text.Internal.Decoding
 import Pipes.Text.Internal.Codec
+import Pipes.Text.Internal.Decoding
diff --git a/Pipes/Text/Internal/Codec.hs b/Pipes/Text/Internal/Codec.hs
--- a/Pipes/Text/Internal/Codec.hs
+++ b/Pipes/Text/Internal/Codec.hs
@@ -12,10 +12,7 @@
 
 
 module Pipes.Text.Internal.Codec
-    ( Decoding(..)
-    , streamDecodeUtf8
-    , decodeSomeUtf8
-    , Codec(..)
+    ( Codec(..)
     , TextException(..)
     , utf8
     , utf16_le
diff --git a/changelog b/changelog
--- a/changelog
+++ b/changelog
@@ -1,10 +1,17 @@
- # Version 0.0.0.3
+ # Version 0.0.0.5
+ 
+ * Rearranged internal modules
 
+
+ # Version 0.0.0.4
+
  * Altered bad haddock markup
 
+
  # Version 0.0.0.3
  
  * Actually added changelog
+
 
  # Version 0.0.0.2
 
diff --git a/pipes-text.cabal b/pipes-text.cabal
--- a/pipes-text.cabal
+++ b/pipes-text.cabal
@@ -1,5 +1,5 @@
 name:                pipes-text
-version:             0.0.0.4
+version:             0.0.0.5
 synopsis:            Text pipes.
 description:         Many of the pipes and other operations defined here mirror those in
                      the `pipes-bytestring` library. Folds like `length` and grouping