11 files changed, 16 insertions, 16 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index 6df074bb..cd4c5d38 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -45,7 +45,6 @@ library
                      , RecordWildCards
   hs-source-dirs:      src
   exposed-modules:     Data.Torrent
-                       Data.Torrent.Bitfield
                        Data.Torrent.Progress
                        Data.Torrent.Tree
                        Network.BitTorrent
@@ -62,6 +61,7 @@ library
                        Network.BitTorrent.DHT.Token
                        Network.BitTorrent.Exchange
                        Network.BitTorrent.Exchange.Assembler
+                       Network.BitTorrent.Exchange.Bitfield
                        Network.BitTorrent.Exchange.Block
                        Network.BitTorrent.Exchange.Connection
                        Network.BitTorrent.Exchange.Manager
@@ -173,7 +173,6 @@ test-suite spec
                        Config
 
                        Data.TorrentSpec
-                       Data.Torrent.BitfieldSpec
                        Data.Torrent.ProgressSpec
                        Network.BitTorrent.Client.HandleSpec
                        Network.BitTorrent.CoreSpec
@@ -192,6 +191,7 @@ test-suite spec
                        Network.BitTorrent.Tracker.RPC.HTTPSpec
                        Network.BitTorrent.Tracker.RPC.UDPSpec
                        Network.BitTorrent.Tracker.SessionSpec
+                       Network.BitTorrent.Exchange.BitfieldSpec
                        Network.BitTorrent.Exchange.ConnectionSpec
                        Network.BitTorrent.Exchange.MessageSpec
                        Network.BitTorrent.Exchange.SessionSpec
diff --git a/src/Data/Torrent/Bitfield.hs b/src/Network/BitTorrent/Exchange/Bitfield.hs
index ff701d75..3f4931f3 100644
--- a/src/Data/Torrent/Bitfield.hs
+++ b/src/Network/BitTorrent/Exchange/Bitfield.hs
@@ -27,7 +27,7 @@
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE RecordWildCards #-}
-module Data.Torrent.Bitfield
+module Network.BitTorrent.Exchange.Bitfield
        ( -- * Bitfield
          PieceIx
        , PieceCount
@@ -43,8 +43,8 @@ module Data.Torrent.Bitfield
 
          -- * Query
          -- ** Cardinality
-       , Data.Torrent.Bitfield.null
-       , Data.Torrent.Bitfield.full
+       , Network.BitTorrent.Exchange.Bitfield.null
+       , Network.BitTorrent.Exchange.Bitfield.full
        , haveCount
        , totalCount
        , completeness
diff --git a/src/Network/BitTorrent/Exchange/Connection.hs b/src/Network/BitTorrent/Exchange/Connection.hs
index 9b7942ae..f208fa54 100644
--- a/src/Network/BitTorrent/Exchange/Connection.hs
+++ b/src/Network/BitTorrent/Exchange/Connection.hs
@@ -135,10 +135,10 @@ import Text.Show.Functions ()
 import System.Log.FastLogger (ToLogStr(..))
 import System.Timeout
 
-import Data.Torrent.Bitfield as BF
 import Data.Torrent
 import Network.BitTorrent.Address
-import Network.BitTorrent.Exchange.Message as Msg
+import Network.BitTorrent.Exchange.Bitfield as BF
+import Network.BitTorrent.Exchange.Message  as Msg
 
 -- TODO handle port message?
 -- TODO handle limits?
diff --git a/src/Network/BitTorrent/Exchange/Message.hs b/src/Network/BitTorrent/Exchange/Message.hs
index a0cb5c91..f8b76186 100644
--- a/src/Network/BitTorrent/Exchange/Message.hs
+++ b/src/Network/BitTorrent/Exchange/Message.hs
@@ -117,10 +117,10 @@ import Network.Socket hiding (KeepAlive)
 import Text.PrettyPrint as PP hiding ((<>))
 import Text.PrettyPrint.Class
 
-import Data.Torrent.Bitfield
 import Data.Torrent hiding (Piece (..))
 import qualified Data.Torrent as P (Piece (..))
 import Network.BitTorrent.Address
+import Network.BitTorrent.Exchange.Bitfield
 import Network.BitTorrent.Exchange.Block
 
 {-----------------------------------------------------------------------
diff --git a/src/Network/BitTorrent/Exchange/Selection.hs b/src/Network/BitTorrent/Exchange/Selection.hs
index 2724fabc..3701450b 100644
--- a/src/Network/BitTorrent/Exchange/Selection.hs
+++ b/src/Network/BitTorrent/Exchange/Selection.hs
@@ -22,7 +22,7 @@ module Network.BitTorrent.Exchange.Selection
 
 import Data.Ratio
 
-import Data.Torrent.Bitfield
+import Network.BitTorrent.Exchange.Bitfield
 
 
 type Selector =  Bitfield      -- ^ Indices of client /have/ pieces.
diff --git a/src/Network/BitTorrent/Exchange/Session.hs b/src/Network/BitTorrent/Exchange/Session.hs
index b68f17a0..4c6811d9 100644
--- a/src/Network/BitTorrent/Exchange/Session.hs
+++ b/src/Network/BitTorrent/Exchange/Session.hs
@@ -46,9 +46,9 @@ import System.Log.FastLogger (LogStr, ToLogStr (..))
 
 import Data.BEncode as BE
 import Data.Torrent as Torrent
-import Data.Torrent.Bitfield as BF
 import Network.BitTorrent.Internal.Types
 import Network.BitTorrent.Address
+import Network.BitTorrent.Exchange.Bitfield as BF
 import Network.BitTorrent.Exchange.Block   as Block
 import Network.BitTorrent.Exchange.Connection
 import Network.BitTorrent.Exchange.Message as Message
diff --git a/src/Network/BitTorrent/Exchange/Session/Status.hs b/src/Network/BitTorrent/Exchange/Session/Status.hs
index 63b91926..af3e94f5 100644
--- a/src/Network/BitTorrent/Exchange/Session/Status.hs
+++ b/src/Network/BitTorrent/Exchange/Session/Status.hs
@@ -29,7 +29,7 @@ import Data.Set as S
 import Data.Tuple
 
 import Data.Torrent
-import Data.Torrent.Bitfield as BF
+import Network.BitTorrent.Exchange.Bitfield as BF
 import Network.BitTorrent.Address
 import Network.BitTorrent.Exchange.Block as Block
 import System.Torrent.Storage (Storage, writePiece)
diff --git a/src/System/Torrent/Storage.hs b/src/System/Torrent/Storage.hs
index 1123cea9..1d77e55d 100644
--- a/src/System/Torrent/Storage.hs
+++ b/src/System/Torrent/Storage.hs
@@ -56,7 +56,7 @@ import Data.Conduit.List as C
 import Data.Typeable
 
 import Data.Torrent
-import Data.Torrent.Bitfield as BF
+import Network.BitTorrent.Exchange.Bitfield as BF
 import System.Torrent.FileMap as FM
 
 
diff --git a/tests/Data/Torrent/BitfieldSpec.hs b/tests/Network/BitTorrent/Exchange/BitfieldSpec.hs
index 093f6f19..234965fa 100644
--- a/tests/Data/Torrent/BitfieldSpec.hs
+++ b/tests/Network/BitTorrent/Exchange/BitfieldSpec.hs
@@ -1,10 +1,10 @@
 {-# OPTIONS -fno-warn-orphans #-}
-module Data.Torrent.BitfieldSpec (spec) where
+module Network.BitTorrent.Exchange.BitfieldSpec (spec) where
 import Control.Applicative
 import Test.Hspec
 import Test.QuickCheck
 
-import Data.Torrent.Bitfield
+import Network.BitTorrent.Exchange.Bitfield
 
 instance Arbitrary Bitfield where
   arbitrary = fromBitmap <$> arbitrary
diff --git a/tests/Network/BitTorrent/Exchange/MessageSpec.hs b/tests/Network/BitTorrent/Exchange/MessageSpec.hs
index f82b034e..d615b1ff 100644
--- a/tests/Network/BitTorrent/Exchange/MessageSpec.hs
+++ b/tests/Network/BitTorrent/Exchange/MessageSpec.hs
@@ -11,7 +11,7 @@ import Test.Hspec
 import Test.QuickCheck
 
 import Data.TorrentSpec ()
-import Data.Torrent.BitfieldSpec ()
+import Network.BitTorrent.Exchange.BitfieldSpec ()
 import Network.BitTorrent.CoreSpec ()
 import Network.BitTorrent.Address ()
 import Network.BitTorrent.Exchange.BlockSpec ()
diff --git a/tests/System/Torrent/StorageSpec.hs b/tests/System/Torrent/StorageSpec.hs
index 96f1b036..b5e49078 100644
--- a/tests/System/Torrent/StorageSpec.hs
+++ b/tests/System/Torrent/StorageSpec.hs
@@ -8,7 +8,7 @@ import System.IO.Unsafe
 import Test.Hspec
 
 import Data.Torrent
-import Data.Torrent.Bitfield as BF
+import Network.BitTorrent.Exchange.Bitfield as BF
 import System.Torrent.Storage