8 files changed, 10 insertions, 6 deletions

diff --git a/bench/Main.hs b/bench/Main.hs
index 6162eeb1..269e60f5 100644
--- a/bench/Main.hs
+++ b/bench/Main.hs
@@ -8,6 +8,7 @@ import Data.ByteString (ByteString)
 import qualified Data.ByteString as B
 import Data.Serialize
 import Network.BitTorrent as BT
+import Data.Bitfield as BT
 
 
 instance NFData BlockIx where
diff --git a/network-bittorrent.cabal b/network-bittorrent.cabal
index e3f60869..a0df082f 100644
--- a/network-bittorrent.cabal
+++ b/network-bittorrent.cabal
@@ -22,6 +22,7 @@ source-repository head
 
 library
   exposed-modules:     Data.Torrent
+                     , Data.Bitfield
                      , Data.Torrent.InfoHash
 
                      , Network.BitTorrent
@@ -37,7 +38,6 @@ library
 
                      , Network.BitTorrent.PeerWire
                      , Network.BitTorrent.PeerWire.Block
-                     , Network.BitTorrent.PeerWire.Bitfield
                      , Network.BitTorrent.PeerWire.Selection
                      , Network.BitTorrent.PeerWire.Message
                      , Network.BitTorrent.PeerWire.Handshake
diff --git a/src/Network/BitTorrent/PeerWire/Bitfield.hs b/src/Data/Bitfield.hs
index 03273899..ac647791 100644
--- a/src/Network/BitTorrent/PeerWire/Bitfield.hs
+++ b/src/Data/Bitfield.hs
@@ -12,7 +12,7 @@
 --
 {-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE RankNTypes #-}
-module Network.BitTorrent.PeerWire.Bitfield
+module Data.Bitfield
 -- TODO: move to Data.Bitfield
        ( Bitfield(..)
 
@@ -51,7 +51,7 @@ import Foreign
 --import Network.BitTorrent.PeerWire.Block
 import Data.Torrent
 
--- one good idea is to aggregate frequently used stats in reducer
+-- TODO: one good idea is to aggregate frequently used stats in reducer
 -- it should give a big boost
 newtype Bitfield = MkBitfield {
     bfBits :: ByteString
diff --git a/src/Network/BitTorrent/PeerWire.hs b/src/Network/BitTorrent/PeerWire.hs
index 6d8ff156..d0583bff 100644
--- a/src/Network/BitTorrent/PeerWire.hs
+++ b/src/Network/BitTorrent/PeerWire.hs
@@ -9,7 +9,6 @@
 module Network.BitTorrent.PeerWire (module PW) where
 
 import Network.BitTorrent.PeerWire.Block as PW
-import Network.BitTorrent.PeerWire.Bitfield as PW
 import Network.BitTorrent.PeerWire.Selection as PW
 import Network.BitTorrent.PeerWire.Message as PW
 import Network.BitTorrent.PeerWire.Handshake as PW
diff --git a/src/Network/BitTorrent/PeerWire/Message.hs b/src/Network/BitTorrent/PeerWire/Message.hs
index cc771966..39102eed 100644
--- a/src/Network/BitTorrent/PeerWire/Message.hs
+++ b/src/Network/BitTorrent/PeerWire/Message.hs
@@ -10,7 +10,7 @@ import qualified Data.ByteString as B
 import Data.Serialize
 
 import Network.BitTorrent.PeerWire.Block
-import Network.BitTorrent.PeerWire.Bitfield
+import Data.Bitfield
 
 import Data.Array
 
diff --git a/src/Network/BitTorrent/PeerWire/Selection.hs b/src/Network/BitTorrent/PeerWire/Selection.hs
index 2e17317e..83ab8311 100644
--- a/src/Network/BitTorrent/PeerWire/Selection.hs
+++ b/src/Network/BitTorrent/PeerWire/Selection.hs
@@ -29,9 +29,10 @@ module Network.BitTorrent.PeerWire.Selection
        , autoSelector
        ) where
 
+import Data.Bitfield
 import Network.BitTorrent.PeerWire.Block
 import Network.BitTorrent.PeerWire.Message
-import Network.BitTorrent.PeerWire.Bitfield
+
 
 
 type Selector =  Bitfield      -- ^ Indices of client "have" pieces.
diff --git a/tests/Encoding.hs b/tests/Encoding.hs
index bd452975..fe0e1d7e 100644
--- a/tests/Encoding.hs
+++ b/tests/Encoding.hs
@@ -14,6 +14,7 @@ import Test.QuickCheck
 
 import Network.URI
 
+import Data.Bitfield
 import Data.Torrent
 import Network.BitTorrent
 
diff --git a/tests/Main.hs b/tests/Main.hs
index 5a9a50ee..ff3d8260 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -8,8 +8,10 @@ import Test.Framework.Providers.QuickCheck2 (testProperty)
 
 import Encoding
 
+import Data.Bitfield as BT
 import Network.BitTorrent as BT
 
+
 prop_bitfieldDiff0 :: Bitfield -> Bool
 prop_bitfieldDiff0 b = (b `difference` empty (8 * bitfieldByteCount b)) == b