Merge branch 'tidy' into dev

32 files changed, 482 insertions, 600 deletions

diff --git a/tests/Config.hs b/tests/Config.hs
index 09e838cc..9ffb0d8c 100644
--- a/tests/Config.hs
+++ b/tests/Config.hs
@@ -33,7 +33,7 @@ import System.IO.Unsafe
 import Test.Hspec
 
 import Data.Torrent
-import Network.BitTorrent.Core (IP, PeerAddr (PeerAddr), genPeerId)
+import Network.BitTorrent.Address (IP, PeerAddr (PeerAddr), genPeerId)
 
 
 type ClientName = String
diff --git a/tests/Data/Torrent/InfoHashSpec.hs b/tests/Data/Torrent/InfoHashSpec.hs
deleted file mode 100644
index 06570ec9..00000000
--- a/tests/Data/Torrent/InfoHashSpec.hs
+++ /dev/null
@@ -1,40 +0,0 @@
-{-# OPTIONS -fno-warn-orphans #-}
-module Data.Torrent.InfoHashSpec (spec) where
-
-import Control.Applicative
-import Data.ByteString as BS
-import Data.Convertible
-import System.FilePath
-import Test.Hspec
-import Test.QuickCheck
-import Test.QuickCheck.Instances ()
-
-import Data.Torrent
-import Data.Torrent.InfoHash as IH
-
-
-instance Arbitrary InfoHash where
-  arbitrary = do
-    bs <- BS.pack <$> vectorOf 20 arbitrary
-    pure $ either (const (error "arbitrary infohash")) id $ safeConvert bs
-
-type TestPair = (FilePath, String)
-
--- TODO add a few more torrents here
-torrentList :: [TestPair]
-torrentList =
-  [ ( "res" </> "dapper-dvd-amd64.iso.torrent"
-    , "0221caf96aa3cb94f0f58d458e78b0fc344ad8bf")
-  ]
-
-infohashSpec :: (FilePath, String) -> Spec
-infohashSpec (filepath, expectedHash) = do
-  it ("should match " ++ filepath) $ do
-    torrent    <- fromFile filepath
-    let actualHash = show $ idInfoHash $ tInfoDict torrent
-    actualHash `shouldBe` expectedHash
-
-spec :: Spec
-spec = do
-  describe "info hash" $ do
-    mapM_ infohashSpec torrentList
diff --git a/tests/Data/Torrent/LayoutSpec.hs b/tests/Data/Torrent/LayoutSpec.hs
deleted file mode 100644
index d3966b3f..00000000
--- a/tests/Data/Torrent/LayoutSpec.hs
+++ /dev/null
@@ -1,30 +0,0 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE StandaloneDeriving         #-}
-module Data.Torrent.LayoutSpec (spec) where
-
-import Control.Applicative
-import Test.Hspec
-import Test.QuickCheck
-import System.Posix.Types
-
-import Data.Torrent.Layout
-
-
-instance Arbitrary COff where
-  arbitrary = fromIntegral <$> (arbitrary :: Gen Int)
-
-instance Arbitrary a => Arbitrary (FileInfo a) where
-  arbitrary = FileInfo <$> arbitrary <*> arbitrary <*> arbitrary
-
-instance Arbitrary LayoutInfo where
-  arbitrary = oneof
-    [ SingleFile <$> arbitrary
-    , MultiFile  <$> arbitrary <*> arbitrary
-    ]
-
-spec :: Spec
-spec = do
-  describe "accumPosition" $ do
-    it "" $ property $ \ p1 p2 p3 s1 s2 s3 ->
-      accumPositions [(p1, s1), (p2, s2), (p3, s3)]
-        `shouldBe`   [(p1, (0, s1)), (p2, (s1, s2)), (p3, (s1 + s2, s3))]
\ No newline at end of file
diff --git a/tests/Data/Torrent/MagnetSpec.hs b/tests/Data/Torrent/MagnetSpec.hs
deleted file mode 100644
index 13554455..00000000
--- a/tests/Data/Torrent/MagnetSpec.hs
+++ /dev/null
@@ -1,44 +0,0 @@
-{-# OPTIONS -fno-warn-orphans #-}
-module Data.Torrent.MagnetSpec (spec) where
-
-import Control.Applicative
-import Data.Maybe
-import Data.Monoid
-import Test.Hspec
-import Test.QuickCheck
-import Test.QuickCheck.Instances ()
-import Network.URI
-
-import Data.Torrent.Magnet
-import Data.Torrent.InfoHashSpec ()
-
-
-instance Arbitrary URIAuth where
-  arbitrary = URIAuth <$> arbitrary <*> arbitrary <*> arbitrary
-
-instance Arbitrary URI where
-  arbitrary
-    = pure $ fromJust $ parseURI "http://ietf.org/1737.txt?a=1&b=h#123"
-
-instance Arbitrary Magnet where
-  arbitrary = Magnet <$> arbitrary <*> arbitrary
-    <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary
-    <*> arbitrary <*> arbitrary <*> pure mempty
-
-magnetEncoding :: Magnet -> IO ()
-magnetEncoding m = parseMagnet (renderMagnet m) `shouldBe` Just m
-
-spec :: Spec
-spec = do
-  describe "Magnet" $ do
-    it "properly encoded" $ property $ magnetEncoding
-
-    it "parse base32" $ do
-      let magnet = "magnet:?xt=urn:btih:CT76LXJDDCH5LS2TUHKH6EUJ3NYKX4Y6"
-      let ih = "CT76LXJDDCH5LS2TUHKH6EUJ3NYKX4Y6"
-      parseMagnet magnet `shouldBe` Just (nullMagnet ih)
-
-    it "parse base16" $ do
-      let magnet = "magnet:?xt=urn:btih:0123456789abcdef0123456789abcdef01234567"
-      let ih = "0123456789abcdef0123456789abcdef01234567"
-      parseMagnet magnet `shouldBe` Just (nullMagnet ih)
diff --git a/tests/Data/Torrent/MetainfoSpec.hs b/tests/Data/Torrent/MetainfoSpec.hs
deleted file mode 100644
index 369c5e0f..00000000
--- a/tests/Data/Torrent/MetainfoSpec.hs
+++ /dev/null
@@ -1,80 +0,0 @@
-{-# LANGUAGE TypeSynonymInstances #-}
-{-# OPTIONS -fno-warn-orphans #-}
-module Data.Torrent.MetainfoSpec (spec) where
-
-import Control.Applicative
-import Data.ByteString as BS
-import Data.ByteString.Lazy as BL
-import Data.BEncode
-import Data.Maybe
-import Data.Time
-import Network.URI
-import Test.Hspec
-import Test.QuickCheck
-import Test.QuickCheck.Instances ()
-
-import Data.Torrent.Piece
-import Data.Torrent.Layout
-import Data.Torrent
-import Data.Torrent.LayoutSpec ()
-import Network.BitTorrent.Core.NodeInfoSpec ()
-
-{-----------------------------------------------------------------------
---  Common
------------------------------------------------------------------------}
-
-data T a = T
-
-prop_properBEncode :: Show a => BEncode a => Eq a
-                   => T a -> a -> IO ()
-prop_properBEncode _ expected = actual `shouldBe` Right expected
-  where
-    actual = decode $ BL.toStrict $ encode expected
-
-instance Arbitrary URI where
-  arbitrary = pure $ fromJust
-              $ parseURI "http://exsample.com:80/123365_asd"
-
-{-----------------------------------------------------------------------
---  Instances
------------------------------------------------------------------------}
-
-instance Arbitrary HashList where
-  arbitrary = HashList <$> arbitrary
-
-instance Arbitrary PieceInfo where
-  arbitrary = PieceInfo <$> arbitrary <*> arbitrary
-
-instance Arbitrary InfoDict where
-  arbitrary = infoDictionary <$> arbitrary <*> arbitrary <*> arbitrary
-
-pico :: Gen (Maybe NominalDiffTime)
-pico = oneof
-  [ pure Nothing
-  , (Just . fromIntegral) <$> (arbitrary :: Gen Int)
-  ]
-
-instance Arbitrary Torrent where
-  arbitrary = Torrent <$> arbitrary
-                 <*> arbitrary <*> arbitrary    <*> arbitrary
-                 <*> pico      <*> arbitrary    <*> arbitrary
-                 <*> arbitrary
-                 <*> arbitrary <*> pure Nothing <*> arbitrary
-
-{-----------------------------------------------------------------------
---  Spec
------------------------------------------------------------------------}
-
-spec :: Spec
-spec = do
-  describe "FileInfo" $ do
-    it "properly bencoded" $ property $
-      prop_properBEncode (T :: T (FileInfo BS.ByteString))
-
-  describe "LayoutInfo" $ do
-    it "properly bencoded" $ property $
-      prop_properBEncode (T :: T LayoutInfo)
-
-  describe "Torrent" $ do
-    it "property bencoded" $ property $
-      prop_properBEncode (T :: T Torrent)
diff --git a/tests/Data/Torrent/PieceSpec.hs b/tests/Data/Torrent/PieceSpec.hs
deleted file mode 100644
index ef1f2938..00000000
--- a/tests/Data/Torrent/PieceSpec.hs
+++ /dev/null
@@ -1,13 +0,0 @@
-{-# OPTIONS_GHC -fno-warn-orphans #-}
-module Data.Torrent.PieceSpec (spec) where
-import Control.Applicative
-import Test.Hspec
-import Test.QuickCheck
-import Data.Torrent.Piece
-
-
-instance Arbitrary a => Arbitrary (Piece a) where
-  arbitrary = Piece <$> arbitrary <*> arbitrary
-
-spec :: Spec
-spec = return ()
\ No newline at end of file
diff --git a/tests/Data/TorrentSpec.hs b/tests/Data/TorrentSpec.hs
new file mode 100644
index 00000000..b4a280e4
--- /dev/null
+++ b/tests/Data/TorrentSpec.hs
@@ -0,0 +1,139 @@
+{-# LANGUAGE TypeSynonymInstances       #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE StandaloneDeriving         #-}
+{-# OPTIONS -fno-warn-orphans           #-}
+module Data.TorrentSpec (spec) where
+import Control.Applicative
+import Data.BEncode
+import Data.ByteString as BS
+import Data.ByteString.Lazy as BL
+import Data.Convertible
+import Data.Maybe
+import Data.Monoid
+import Data.Time
+import Network.URI
+import System.FilePath
+import System.Posix.Types
+import Test.Hspec
+import Test.QuickCheck
+import Test.QuickCheck.Instances ()
+
+import Data.Torrent
+import Network.BitTorrent.CoreSpec ()
+
+
+pico :: Gen (Maybe NominalDiffTime)
+pico = oneof
+  [ pure Nothing
+  , (Just . fromIntegral) <$> (arbitrary :: Gen Int)
+  ]
+
+instance Arbitrary COff where
+  arbitrary = fromIntegral <$> (arbitrary :: Gen Int)
+
+instance Arbitrary URIAuth where
+  arbitrary = URIAuth <$> arbitrary <*> arbitrary <*> arbitrary
+
+instance Arbitrary URI where
+  arbitrary
+    = pure $ fromJust $ parseURI "http://ietf.org/1737.txt?a=1&b=h#123"
+
+instance Arbitrary InfoHash where
+  arbitrary = do
+    bs <- BS.pack <$> vectorOf 20 arbitrary
+    pure $ either (const (error "arbitrary infohash")) id $ safeConvert bs
+
+instance Arbitrary a => Arbitrary (FileInfo a) where
+  arbitrary = FileInfo <$> arbitrary <*> arbitrary <*> arbitrary
+
+instance Arbitrary LayoutInfo where
+  arbitrary = oneof
+    [ SingleFile <$> arbitrary
+    , MultiFile  <$> arbitrary <*> arbitrary
+    ]
+
+instance Arbitrary a => Arbitrary (Piece a) where
+  arbitrary = Piece <$> arbitrary <*> arbitrary
+
+instance Arbitrary HashList where
+  arbitrary = HashList <$> arbitrary
+
+instance Arbitrary PieceInfo where
+  arbitrary = PieceInfo <$> arbitrary <*> arbitrary
+
+instance Arbitrary InfoDict where
+  arbitrary = infoDictionary <$> arbitrary <*> arbitrary <*> arbitrary
+
+instance Arbitrary Torrent where
+  arbitrary = Torrent <$> arbitrary
+                 <*> arbitrary <*> arbitrary    <*> arbitrary
+                 <*> pico      <*> arbitrary    <*> arbitrary
+                 <*> arbitrary
+                 <*> arbitrary <*> pure Nothing <*> arbitrary
+
+instance Arbitrary Magnet where
+  arbitrary = Magnet <$> arbitrary <*> arbitrary
+    <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary
+    <*> arbitrary <*> arbitrary <*> pure mempty
+
+type TestPair = (FilePath, String)
+
+-- TODO add a few more torrents here
+torrentList :: [TestPair]
+torrentList =
+  [ ( "res" </> "dapper-dvd-amd64.iso.torrent"
+    , "0221caf96aa3cb94f0f58d458e78b0fc344ad8bf")
+  ]
+
+infohashSpec :: (FilePath, String) -> Spec
+infohashSpec (filepath, expectedHash) = do
+  it ("should match " ++ filepath) $ do
+    torrent    <- fromFile filepath
+    let actualHash = show $ idInfoHash $ tInfoDict torrent
+    actualHash `shouldBe` expectedHash
+
+magnetEncoding :: Magnet -> IO ()
+magnetEncoding m = parseMagnet (renderMagnet m) `shouldBe` Just m
+
+data T a = T
+
+prop_properBEncode :: Show a => BEncode a => Eq a
+                   => T a -> a -> IO ()
+prop_properBEncode _ expected = actual `shouldBe` Right expected
+  where
+    actual = decode $ BL.toStrict $ encode expected
+
+spec :: Spec
+spec = do
+  describe "info hash" $ do
+    mapM_ infohashSpec torrentList
+
+  describe "accumPosition" $ do
+    it "" $ property $ \ p1 p2 p3 s1 s2 s3 ->
+      accumPositions [(p1, s1), (p2, s2), (p3, s3)]
+        `shouldBe`   [(p1, (0, s1)), (p2, (s1, s2)), (p3, (s1 + s2, s3))]
+
+  describe "FileInfo" $ do
+    it "properly bencoded" $ property $
+      prop_properBEncode (T :: T (FileInfo BS.ByteString))
+
+  describe "LayoutInfo" $ do
+    it "properly bencoded" $ property $
+      prop_properBEncode (T :: T LayoutInfo)
+
+  describe "Torrent" $ do
+    it "property bencoded" $ property $
+      prop_properBEncode (T :: T Torrent)
+
+  describe "Magnet" $ do
+    it "properly encoded" $ property $ magnetEncoding
+
+    it "parse base32" $ do
+      let magnet = "magnet:?xt=urn:btih:CT76LXJDDCH5LS2TUHKH6EUJ3NYKX4Y6"
+      let ih = "CT76LXJDDCH5LS2TUHKH6EUJ3NYKX4Y6"
+      parseMagnet magnet `shouldBe` Just (nullMagnet ih)
+
+    it "parse base16" $ do
+      let magnet = "magnet:?xt=urn:btih:0123456789abcdef0123456789abcdef01234567"
+      let ih = "0123456789abcdef0123456789abcdef01234567"
+      parseMagnet magnet `shouldBe` Just (nullMagnet ih)
diff --git a/tests/Network/BitTorrent/Client/HandleSpec.hs b/tests/Network/BitTorrent/Client/HandleSpec.hs
index 8e16d9b0..d51bab02 100644
--- a/tests/Network/BitTorrent/Client/HandleSpec.hs
+++ b/tests/Network/BitTorrent/Client/HandleSpec.hs
@@ -2,7 +2,7 @@ module Network.BitTorrent.Client.HandleSpec (spec) where
 import Data.Default
 import Test.Hspec
 
-import Data.Torrent.Magnet
+import Data.Torrent
 import Network.BitTorrent.Client
 import Network.BitTorrent.Client.Handle
 
diff --git a/tests/Network/BitTorrent/Core/FingerprintSpec.hs b/tests/Network/BitTorrent/Core/FingerprintSpec.hs
deleted file mode 100644
index df62442a..00000000
--- a/tests/Network/BitTorrent/Core/FingerprintSpec.hs
+++ /dev/null
@@ -1,33 +0,0 @@
--- | see <http://bittorrent.org/beps/bep_0020.html>
-module Network.BitTorrent.Core.FingerprintSpec (spec) where
-import Test.Hspec
-import Network.BitTorrent.Core.PeerId
-
-spec :: Spec
-spec = do
-  describe "client info" $ do
-    it "decode mainline encoded peer id" $ do
-      fingerprint "M4-3-6--xxxxxxxxxxxx" `shouldBe` "Mainline-4.3.6"
-      fingerprint "M4-20-8-xxxxxxxxxxxx" `shouldBe` "Mainline-4.20.8"
-
-    it "decode azureus encoded peer id" $ do
-      fingerprint "-AZ2060-xxxxxxxxxxxx" `shouldBe` "Azureus-2060"
-      fingerprint "-BS0000-xxxxxxxxxxxx" `shouldBe` "BTSlave-0"
-
-    it "decode Shad0w style peer id" $ do
-      fingerprint "S58B-----xxxxxxxxxxx" `shouldBe` "Shadow-5.8.11"
-      fingerprint "T58B-----xxxxxxxxxxx" `shouldBe` "BitTornado-5.8.11"
-
-    it "decode bitcomet style peer id" $ do
-      fingerprint "exbc01xxxxxxxxxxxxxx" `shouldBe` "BitComet-48.49"
-      fingerprint "FUTB01xxxxxxxxxxxxxx" `shouldBe` "BitComet-48.49"
-      fingerprint "exbc01LORDxxxxxxxxxx" `shouldBe` "BitLord-48.49"
-
-    it "decode opera style peer id" $ do
-      fingerprint "OP0123xxxxxxxxxxxxxx" `shouldBe` "Opera-123"
-
-    it "decode ML donkey style peer id" $ do
-      fingerprint "-ML2.7.2-xxxxxxxxxxx" `shouldBe` "MLdonkey-0"
-
--- TODO XBT, Bits on Wheels, Queen Bee, BitTyrant, TorrenTopia,
--- BitSpirit, Rufus, G3 Torrent, FlashGet
\ No newline at end of file
diff --git a/tests/Network/BitTorrent/Core/NodeInfoSpec.hs b/tests/Network/BitTorrent/Core/NodeInfoSpec.hs
deleted file mode 100644
index fb777440..00000000
--- a/tests/Network/BitTorrent/Core/NodeInfoSpec.hs
+++ /dev/null
@@ -1,52 +0,0 @@
-{-# OPTIONS -fno-warn-orphans #-}
-module Network.BitTorrent.Core.NodeInfoSpec (spec) where
-import Control.Applicative
-import Data.Serialize as S
-import Data.String
-import Test.Hspec
-import Test.QuickCheck
-
-import Network.BitTorrent.Core
-import Network.BitTorrent.Core.PeerAddrSpec ()
-
-instance Arbitrary NodeId where
-  arbitrary = fromString <$> vector 20
-
-instance Arbitrary a => Arbitrary (NodeAddr a) where
-  arbitrary = NodeAddr <$> arbitrary <*> arbitrary
-
-instance Arbitrary a => Arbitrary (NodeInfo a) where
-  arbitrary = NodeInfo <$> arbitrary <*> arbitrary
-
-spec :: Spec
-spec = do
-  describe "NodeId" $ do
-    it "properly serialized" $ do
-      S.decode "mnopqrstuvwxyz123456"
-        `shouldBe` Right ("mnopqrstuvwxyz123456" :: NodeId)
-
-      S.encode ("mnopqrstuvwxyz123456" :: NodeId)
-        `shouldBe` "mnopqrstuvwxyz123456"
-
-    it "properly serialized (iso)" $ property $ \ nid ->
-      S.decode (S.encode nid) `shouldBe`
-        Right (nid :: NodeId)
-
-  describe "NodeAddr" $ do
-    it "properly serialized" $ do
-      S.decode "\127\0\0\1\1\2" `shouldBe`
-        Right ("127.0.0.1:258" :: NodeAddr IPv4)
-
-    it "properly serialized (iso)" $ property $ \ nid ->
-      S.decode (S.encode nid) `shouldBe`
-        Right (nid :: NodeAddr IPv4)
-
-  describe "NodeInfo" $ do
-    it "properly serialized" $ do
-      S.decode "mnopqrstuvwxyz123456\
-               \\127\0\0\1\1\2" `shouldBe` Right
-       (NodeInfo "mnopqrstuvwxyz123456" "127.0.0.1:258" :: NodeInfo IPv4)
-
-    it "properly serialized (iso)" $ property $ \ nid ->
-      S.decode (S.encode nid) `shouldBe`
-        Right (nid :: NodeInfo IPv4)
diff --git a/tests/Network/BitTorrent/Core/PeerAddrSpec.hs b/tests/Network/BitTorrent/Core/PeerAddrSpec.hs
deleted file mode 100644
index abb90183..00000000
--- a/tests/Network/BitTorrent/Core/PeerAddrSpec.hs
+++ /dev/null
@@ -1,221 +0,0 @@
-{-# LANGUAGE FlexibleInstances    #-}
-{-# OPTIONS_GHC -fno-warn-orphans #-}
-module Network.BitTorrent.Core.PeerAddrSpec (spec) where
-import Control.Applicative
-import Data.BEncode as BE
-import Data.ByteString.Lazy as BL
-import Data.IP
-import Data.Serialize as S
-import Data.Word
-import Network
-import Test.Hspec
-import Test.QuickCheck
-
-import Network.BitTorrent.Core.PeerIdSpec hiding (spec)
-import Network.BitTorrent.Core.PeerAddr
-
-instance Arbitrary IPv4 where
-  arbitrary = do
-    a <- choose (0, 255)
-    b <- choose (0, 255)
-    c <- choose (0, 255)
-    d <- choose (0, 255)
-    return $ toIPv4 [a, b, c, d]
-
-instance Arbitrary IPv6 where
-  arbitrary = do
-    a <- choose (0, fromIntegral (maxBound :: Word16))
-    b <- choose (0, fromIntegral (maxBound :: Word16))
-    c <- choose (0, fromIntegral (maxBound :: Word16))
-    d <- choose (0, fromIntegral (maxBound :: Word16))
-    e <- choose (0, fromIntegral (maxBound :: Word16))
-    f <- choose (0, fromIntegral (maxBound :: Word16))
-    g <- choose (0, fromIntegral (maxBound :: Word16))
-    h <- choose (0, fromIntegral (maxBound :: Word16))
-    return $ toIPv6 [a, b, c, d, e, f, g, h]
-
-instance Arbitrary IP where
-  arbitrary = frequency
-    [ (1, IPv4 <$> arbitrary)
-    , (1, IPv6 <$> arbitrary)
-    ]
-
-instance Arbitrary PortNumber where
-  arbitrary = fromIntegral <$> (arbitrary :: Gen Word16)
-
-instance Arbitrary a => Arbitrary (PeerAddr a) where
-  arbitrary = PeerAddr <$> arbitrary <*> arbitrary <*> arbitrary
-
-spec :: Spec
-spec = do
-  describe "PortNumber" $ do
-    it "properly serialized" $ do
-      S.decode "\x1\x2" `shouldBe` Right (258 :: PortNumber)
-      S.encode (258 :: PortNumber) `shouldBe` "\x1\x2"
-
-    it "properly bencoded" $ do
-      BE.decode "i80e" `shouldBe` Right (80 :: PortNumber)
-
-    it "fail if port number is invalid" $ do
-      (BE.decode "i-10e" :: BE.Result PortNumber)
-        `shouldBe`
-        Left "fromBEncode: unable to decode PortNumber: -10"
-
-      (BE.decode "i70000e" :: BE.Result PortNumber)
-        `shouldBe`
-        Left "fromBEncode: unable to decode PortNumber: 70000"
-
-  describe "Peer IPv4" $ do
-    it "properly serialized" $ do
-      S.decode "\x1\x2\x3\x4" `shouldBe` Right (toIPv4 [1, 2, 3, 4])
-      S.encode (toIPv4 [1, 2, 3, 4]) `shouldBe` "\x1\x2\x3\x4"
-
-    it "properly serialized (iso)" $ property $ \ ip -> do
-      S.decode (S.encode ip) `shouldBe` Right (ip :: IPv4)
-
-    it "properly bencoded" $ do
-      BE.decode "11:168.192.0.1" `shouldBe` Right (toIPv4 [168, 192, 0, 1])
-      BE.encode (toIPv4 [168, 192, 0, 1]) `shouldBe` "11:168.192.0.1"
-
-    it "properly bencoded (iso)" $ property $ \ ip ->
-      BE.decode (BL.toStrict (BE.encode ip)) `shouldBe` Right (ip :: IPv4)
-
-    it "fail gracefully on invalid strings" $ do
-      BE.decode "3:1.1" `shouldBe`
-        (Left "fromBEncode: unable to decode IP: 1.1" :: BE.Result IPv4)
-
-    it "fail gracefully on invalid bencode" $ do
-      BE.decode "i10e" `shouldBe`
-        (Left "fromBEncode: unable to decode IP: addr should be a bstring"
-         :: BE.Result IPv4)
-
-  describe "Peer IPv6" $ do
-    it "properly serialized" $ do
-      S.decode "\x1\x2\x3\x4\x5\x6\x7\x8\x9\xa\xb\xc\xd\xe\xf\x10"
-        `shouldBe`
-        Right ("102:304:506:708:90a:b0c:d0e:f10" :: IPv6)
-
-      S.encode ("102:304:506:708:90a:b0c:d0e:f10" :: IPv6)
-        `shouldBe`
-        "\x1\x2\x3\x4\x5\x6\x7\x8\x9\xa\xb\xc\xd\xe\xf\x10"
-
-    it "properly serialized (iso)" $ property $ \ ip ->
-      S.decode (S.encode ip) `shouldBe` Right (ip :: IPv6)
-
-    it "properly bencoded" $ do
-      BE.decode "3:::1" `shouldBe` Right (toIPv6 [0, 0, 0, 0, 0, 0, 0, 1])
-      BE.encode (toIPv6 [0, 0, 0, 0, 0, 0, 0, 1]) `shouldBe`
-        "23:00:00:00:00:00:00:00:01"
-
-      BE.decode "23:00:00:00:00:00:00:00:01"
-        `shouldBe`
-        Right (toIPv6 [0, 0, 0, 0, 0, 0, 0, 1])
-
-    it "properly bencoded iso" $ property $ \ ip ->
-      BE.decode (BL.toStrict (BE.encode ip)) `shouldBe` Right (ip :: IPv4)
-
-    it "fail gracefully on invalid strings" $ do
-      BE.decode "4:g::1" `shouldBe`
-        (Left "fromBEncode: unable to decode IP: g::1" :: BE.Result IPv6)
-
-    it "fail gracefully on invalid bencode" $ do
-      BE.decode "i10e" `shouldBe`
-        (Left "fromBEncode: unable to decode IP: addr should be a bstring"
-         :: BE.Result IPv6)
-
-
-  describe "Peer IP" $ do
-    it "properly serialized IPv6" $ do
-      S.decode "\x1\x2\x3\x4\x5\x6\x7\x8\x9\xa\xb\xc\xd\xe\xf\x10"
-        `shouldBe`
-        Right ("102:304:506:708:90a:b0c:d0e:f10" :: IP)
-
-      S.encode ("102:304:506:708:90a:b0c:d0e:f10" :: IP)
-        `shouldBe`
-        "\x1\x2\x3\x4\x5\x6\x7\x8\x9\xa\xb\xc\xd\xe\xf\x10"
-
-    it "properly serialized (iso) IPv6" $ property $ \ ip ->
-      S.decode (S.encode ip) `shouldBe` Right (ip :: IP)
-
-    it "properly serialized IPv4" $ do
-      S.decode "\x1\x2\x3\x4" `shouldBe` Right (IPv4 $ toIPv4 [1, 2, 3, 4])
-      S.encode (toIPv4 [1, 2, 3, 4]) `shouldBe` "\x1\x2\x3\x4"
-
-    it "properly serialized (iso) IPv4" $ property $ \ ip -> do
-      S.decode (S.encode ip) `shouldBe` Right (ip :: IP)
-
-    it "properly bencoded" $ do
-      BE.decode "11:168.192.0.1" `shouldBe`
-        Right (IPv4 (toIPv4 [168, 192, 0, 1]))
-
-      BE.decode "3:::1" `shouldBe` Right
-         (IPv6 (toIPv6 [0, 0, 0, 0, 0, 0, 0, 1]))
-
-      BE.encode (IPv6 (toIPv6 [0, 0, 0, 0, 0, 0, 0, 1])) `shouldBe`
-        "23:00:00:00:00:00:00:00:01"
-
-      BE.decode "23:00:00:00:00:00:00:00:01"
-        `shouldBe`
-        Right (IPv6 (toIPv6 [0, 0, 0, 0, 0, 0, 0, 1]))
-
-    it "properly bencoded iso" $ property $ \ ip ->
-      BE.decode (BL.toStrict (BE.encode ip)) `shouldBe` Right (ip :: IP)
-
-    it "fail gracefully on invalid strings" $ do
-      BE.decode "4:g::1" `shouldBe`
-        (Left "fromBEncode: unable to decode IP: g::1" :: BE.Result IP)
-
-    it "fail gracefully on invalid bencode" $ do
-      BE.decode "i10e" `shouldBe`
-        (Left "fromBEncode: unable to decode IP: addr should be a bstring"
-         :: BE.Result IP)
-
-  describe "PeerAddr" $ do
-    it "IsString" $ do
-      ("127.0.0.1:80" :: PeerAddr IP)
-        `shouldBe` PeerAddr Nothing "127.0.0.1" 80
-
-      ("127.0.0.1:80" :: PeerAddr IPv4)
-        `shouldBe` PeerAddr Nothing "127.0.0.1" 80
-
-      ("[::1]:80"     :: PeerAddr IP)
-        `shouldBe` PeerAddr Nothing "::1"       80
-
-      ("[::1]:80"     :: PeerAddr IPv6)
-        `shouldBe` PeerAddr Nothing "::1"       80
-
-    it "properly bencoded (iso)" $ property $ \ addr ->
-      BE.decode (BL.toStrict (BE.encode addr))
-        `shouldBe` Right (addr :: PeerAddr IP)
-
-
-    it "properly bencoded (ipv4)" $ do
-      BE.decode "d2:ip11:168.192.0.1\
-                 \7:peer id20:01234567890123456789\
-                 \4:porti6881e\
-                 \e"
-        `shouldBe`
-        Right (PeerAddr (Just "01234567890123456789")
-                        (IPv4 (toIPv4 [168, 192, 0, 1]))
-                        6881)
-
-    it "properly bencoded (ipv6)" $ do
-      BE.decode "d2:ip3:::1\
-                 \7:peer id20:01234567890123456789\
-                 \4:porti6881e\
-                 \e"
-        `shouldBe`
-        Right (PeerAddr (Just "01234567890123456789")
-                        (IPv6 (toIPv6 [0, 0, 0, 0, 0, 0, 0, 1]))
-                        6881)
-
-    it "peer id is optional" $ do
-      BE.decode "d2:ip11:168.192.0.1\
-                 \4:porti6881e\
-                 \e"
-        `shouldBe`
-        Right (PeerAddr Nothing (IPv4 (toIPv4 [168, 192, 0, 1])) 6881)
-
-    it "has sock addr for both ipv4 and ipv6" $ do
-      show (peerSockAddr "128.0.0.1:80") `shouldBe` "128.0.0.1:80"
-      show (peerSockAddr "[::1]:8080"  ) `shouldBe` "[::1]:8080"
diff --git a/tests/Network/BitTorrent/Core/PeerIdSpec.hs b/tests/Network/BitTorrent/Core/PeerIdSpec.hs
deleted file mode 100644
index 4b0c2398..00000000
--- a/tests/Network/BitTorrent/Core/PeerIdSpec.hs
+++ /dev/null
@@ -1,25 +0,0 @@
-{-# OPTIONS -fno-warn-orphans #-}
-module Network.BitTorrent.Core.PeerIdSpec (spec) where
-import Control.Applicative
-import Data.BEncode as BE
-import Data.Text.Encoding as T
-import Test.Hspec
-import Test.QuickCheck
-import Test.QuickCheck.Instances ()
-import Network.BitTorrent.Core.PeerId
-
-
-instance Arbitrary PeerId where
-  arbitrary = oneof
-    [ azureusStyle defaultClientId defaultVersionNumber
-        <$> (T.encodeUtf8 <$> arbitrary)
-    , shadowStyle  'X'             defaultVersionNumber
-        <$> (T.encodeUtf8 <$> arbitrary)
-    ]
-
-spec :: Spec
-spec = do
-  describe "PeerId" $ do
-    it "properly bencoded" $ do
-      BE.decode "20:01234567890123456789"
-        `shouldBe` Right ("01234567890123456789" :: PeerId)
\ No newline at end of file
diff --git a/tests/Network/BitTorrent/CoreSpec.hs b/tests/Network/BitTorrent/CoreSpec.hs
index 460c52be..5bf900b2 100644
--- a/tests/Network/BitTorrent/CoreSpec.hs
+++ b/tests/Network/BitTorrent/CoreSpec.hs
@@ -1,11 +1,305 @@
--- | Re-export modules.
+{-# LANGUAGE FlexibleInstances    #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
 module Network.BitTorrent.CoreSpec (spec) where
-import Network.BitTorrent.Core.FingerprintSpec as CoreSpec ()
-import Network.BitTorrent.Core.NodeInfoSpec    as CoreSpec ()
-import Network.BitTorrent.Core.PeerIdSpec      as CoreSpec ()
-import Network.BitTorrent.Core.PeerAddrSpec    as CoreSpec ()
+import Control.Applicative
+import Data.BEncode as BE
+import Data.ByteString.Lazy as BL
+import Data.IP
+import Data.Serialize as S
+import Data.String
+import Data.Text.Encoding as T
+import Data.Word
+import Network
+import Test.Hspec
+import Test.QuickCheck
+import Test.QuickCheck.Instances ()
 
-import Test.Hspec (Spec)
+import Network.BitTorrent.Address
+
+
+instance Arbitrary IPv4 where
+  arbitrary = do
+    a <- choose (0, 255)
+    b <- choose (0, 255)
+    c <- choose (0, 255)
+    d <- choose (0, 255)
+    return $ toIPv4 [a, b, c, d]
+
+instance Arbitrary IPv6 where
+  arbitrary = do
+    a <- choose (0, fromIntegral (maxBound :: Word16))
+    b <- choose (0, fromIntegral (maxBound :: Word16))
+    c <- choose (0, fromIntegral (maxBound :: Word16))
+    d <- choose (0, fromIntegral (maxBound :: Word16))
+    e <- choose (0, fromIntegral (maxBound :: Word16))
+    f <- choose (0, fromIntegral (maxBound :: Word16))
+    g <- choose (0, fromIntegral (maxBound :: Word16))
+    h <- choose (0, fromIntegral (maxBound :: Word16))
+    return $ toIPv6 [a, b, c, d, e, f, g, h]
+
+instance Arbitrary IP where
+  arbitrary = frequency
+    [ (1, IPv4 <$> arbitrary)
+    , (1, IPv6 <$> arbitrary)
+    ]
+
+instance Arbitrary PortNumber where
+  arbitrary = fromIntegral <$> (arbitrary :: Gen Word16)
+
+instance Arbitrary PeerId where
+  arbitrary = oneof
+    [ azureusStyle defaultClientId defaultVersionNumber
+        <$> (T.encodeUtf8 <$> arbitrary)
+    , shadowStyle  'X'             defaultVersionNumber
+        <$> (T.encodeUtf8 <$> arbitrary)
+    ]
+
+instance Arbitrary a => Arbitrary (PeerAddr a) where
+  arbitrary = PeerAddr <$> arbitrary <*> arbitrary <*> arbitrary
+
+instance Arbitrary NodeId where
+  arbitrary = fromString <$> vector 20
+
+instance Arbitrary a => Arbitrary (NodeAddr a) where
+  arbitrary = NodeAddr <$> arbitrary <*> arbitrary
+
+instance Arbitrary a => Arbitrary (NodeInfo a) where
+  arbitrary = NodeInfo <$> arbitrary <*> arbitrary
 
 spec :: Spec
-spec = return ()
\ No newline at end of file
+spec = do
+  describe "PeerId" $ do
+    it "properly bencoded" $ do
+      BE.decode "20:01234567890123456789"
+        `shouldBe` Right ("01234567890123456789" :: PeerId)
+
+  describe "PortNumber" $ do
+    it "properly serialized" $ do
+      S.decode "\x1\x2" `shouldBe` Right (258 :: PortNumber)
+      S.encode (258 :: PortNumber) `shouldBe` "\x1\x2"
+
+    it "properly bencoded" $ do
+      BE.decode "i80e" `shouldBe` Right (80 :: PortNumber)
+
+    it "fail if port number is invalid" $ do
+      (BE.decode "i-10e" :: BE.Result PortNumber)
+        `shouldBe`
+        Left "fromBEncode: unable to decode PortNumber: -10"
+
+      (BE.decode "i70000e" :: BE.Result PortNumber)
+        `shouldBe`
+        Left "fromBEncode: unable to decode PortNumber: 70000"
+
+  describe "Peer IPv4" $ do
+    it "properly serialized" $ do
+      S.decode "\x1\x2\x3\x4" `shouldBe` Right (toIPv4 [1, 2, 3, 4])
+      S.encode (toIPv4 [1, 2, 3, 4]) `shouldBe` "\x1\x2\x3\x4"
+
+    it "properly serialized (iso)" $ property $ \ ip -> do
+      S.decode (S.encode ip) `shouldBe` Right (ip :: IPv4)
+
+    it "properly bencoded" $ do
+      BE.decode "11:168.192.0.1" `shouldBe` Right (toIPv4 [168, 192, 0, 1])
+      BE.encode (toIPv4 [168, 192, 0, 1]) `shouldBe` "11:168.192.0.1"
+
+    it "properly bencoded (iso)" $ property $ \ ip ->
+      BE.decode (BL.toStrict (BE.encode ip)) `shouldBe` Right (ip :: IPv4)
+
+    it "fail gracefully on invalid strings" $ do
+      BE.decode "3:1.1" `shouldBe`
+        (Left "fromBEncode: unable to decode IP: 1.1" :: BE.Result IPv4)
+
+    it "fail gracefully on invalid bencode" $ do
+      BE.decode "i10e" `shouldBe`
+        (Left "fromBEncode: unable to decode IP: addr should be a bstring"
+         :: BE.Result IPv4)
+
+  describe "Peer IPv6" $ do
+    it "properly serialized" $ do
+      S.decode "\x1\x2\x3\x4\x5\x6\x7\x8\x9\xa\xb\xc\xd\xe\xf\x10"
+        `shouldBe`
+        Right ("102:304:506:708:90a:b0c:d0e:f10" :: IPv6)
+
+      S.encode ("102:304:506:708:90a:b0c:d0e:f10" :: IPv6)
+        `shouldBe`
+        "\x1\x2\x3\x4\x5\x6\x7\x8\x9\xa\xb\xc\xd\xe\xf\x10"
+
+    it "properly serialized (iso)" $ property $ \ ip ->
+      S.decode (S.encode ip) `shouldBe` Right (ip :: IPv6)
+
+    it "properly bencoded" $ do
+      BE.decode "3:::1" `shouldBe` Right (toIPv6 [0, 0, 0, 0, 0, 0, 0, 1])
+      BE.encode (toIPv6 [0, 0, 0, 0, 0, 0, 0, 1]) `shouldBe`
+        "23:00:00:00:00:00:00:00:01"
+
+      BE.decode "23:00:00:00:00:00:00:00:01"
+        `shouldBe`
+        Right (toIPv6 [0, 0, 0, 0, 0, 0, 0, 1])
+
+    it "properly bencoded iso" $ property $ \ ip ->
+      BE.decode (BL.toStrict (BE.encode ip)) `shouldBe` Right (ip :: IPv4)
+
+    it "fail gracefully on invalid strings" $ do
+      BE.decode "4:g::1" `shouldBe`
+        (Left "fromBEncode: unable to decode IP: g::1" :: BE.Result IPv6)
+
+    it "fail gracefully on invalid bencode" $ do
+      BE.decode "i10e" `shouldBe`
+        (Left "fromBEncode: unable to decode IP: addr should be a bstring"
+         :: BE.Result IPv6)
+
+
+  describe "Peer IP" $ do
+    it "properly serialized IPv6" $ do
+      S.decode "\x1\x2\x3\x4\x5\x6\x7\x8\x9\xa\xb\xc\xd\xe\xf\x10"
+        `shouldBe`
+        Right ("102:304:506:708:90a:b0c:d0e:f10" :: IP)
+
+      S.encode ("102:304:506:708:90a:b0c:d0e:f10" :: IP)
+        `shouldBe`
+        "\x1\x2\x3\x4\x5\x6\x7\x8\x9\xa\xb\xc\xd\xe\xf\x10"
+
+    it "properly serialized (iso) IPv6" $ property $ \ ip ->
+      S.decode (S.encode ip) `shouldBe` Right (ip :: IP)
+
+    it "properly serialized IPv4" $ do
+      S.decode "\x1\x2\x3\x4" `shouldBe` Right (IPv4 $ toIPv4 [1, 2, 3, 4])
+      S.encode (toIPv4 [1, 2, 3, 4]) `shouldBe` "\x1\x2\x3\x4"
+
+    it "properly serialized (iso) IPv4" $ property $ \ ip -> do
+      S.decode (S.encode ip) `shouldBe` Right (ip :: IP)
+
+    it "properly bencoded" $ do
+      BE.decode "11:168.192.0.1" `shouldBe`
+        Right (IPv4 (toIPv4 [168, 192, 0, 1]))
+
+      BE.decode "3:::1" `shouldBe` Right
+         (IPv6 (toIPv6 [0, 0, 0, 0, 0, 0, 0, 1]))
+
+      BE.encode (IPv6 (toIPv6 [0, 0, 0, 0, 0, 0, 0, 1])) `shouldBe`
+        "23:00:00:00:00:00:00:00:01"
+
+      BE.decode "23:00:00:00:00:00:00:00:01"
+        `shouldBe`
+        Right (IPv6 (toIPv6 [0, 0, 0, 0, 0, 0, 0, 1]))
+
+    it "properly bencoded iso" $ property $ \ ip ->
+      BE.decode (BL.toStrict (BE.encode ip)) `shouldBe` Right (ip :: IP)
+
+    it "fail gracefully on invalid strings" $ do
+      BE.decode "4:g::1" `shouldBe`
+        (Left "fromBEncode: unable to decode IP: g::1" :: BE.Result IP)
+
+    it "fail gracefully on invalid bencode" $ do
+      BE.decode "i10e" `shouldBe`
+        (Left "fromBEncode: unable to decode IP: addr should be a bstring"
+         :: BE.Result IP)
+
+  describe "PeerAddr" $ do
+    it "IsString" $ do
+      ("127.0.0.1:80" :: PeerAddr IP)
+        `shouldBe` PeerAddr Nothing "127.0.0.1" 80
+
+      ("127.0.0.1:80" :: PeerAddr IPv4)
+        `shouldBe` PeerAddr Nothing "127.0.0.1" 80
+
+      ("[::1]:80"     :: PeerAddr IP)
+        `shouldBe` PeerAddr Nothing "::1"       80
+
+      ("[::1]:80"     :: PeerAddr IPv6)
+        `shouldBe` PeerAddr Nothing "::1"       80
+
+    it "properly bencoded (iso)" $ property $ \ addr ->
+      BE.decode (BL.toStrict (BE.encode addr))
+        `shouldBe` Right (addr :: PeerAddr IP)
+
+
+    it "properly bencoded (ipv4)" $ do
+      BE.decode "d2:ip11:168.192.0.1\
+                 \7:peer id20:01234567890123456789\
+                 \4:porti6881e\
+                 \e"
+        `shouldBe`
+        Right (PeerAddr (Just "01234567890123456789")
+                        (IPv4 (toIPv4 [168, 192, 0, 1]))
+                        6881)
+
+    it "properly bencoded (ipv6)" $ do
+      BE.decode "d2:ip3:::1\
+                 \7:peer id20:01234567890123456789\
+                 \4:porti6881e\
+                 \e"
+        `shouldBe`
+        Right (PeerAddr (Just "01234567890123456789")
+                        (IPv6 (toIPv6 [0, 0, 0, 0, 0, 0, 0, 1]))
+                        6881)
+
+    it "peer id is optional" $ do
+      BE.decode "d2:ip11:168.192.0.1\
+                 \4:porti6881e\
+                 \e"
+        `shouldBe`
+        Right (PeerAddr Nothing (IPv4 (toIPv4 [168, 192, 0, 1])) 6881)
+
+    it "has sock addr for both ipv4 and ipv6" $ do
+      show (peerSockAddr "128.0.0.1:80") `shouldBe` "128.0.0.1:80"
+      show (peerSockAddr "[::1]:8080"  ) `shouldBe` "[::1]:8080"
+
+  describe "NodeId" $ do
+    it "properly serialized" $ do
+      S.decode "mnopqrstuvwxyz123456"
+        `shouldBe` Right ("mnopqrstuvwxyz123456" :: NodeId)
+
+      S.encode ("mnopqrstuvwxyz123456" :: NodeId)
+        `shouldBe` "mnopqrstuvwxyz123456"
+
+    it "properly serialized (iso)" $ property $ \ nid ->
+      S.decode (S.encode nid) `shouldBe`
+        Right (nid :: NodeId)
+
+  describe "NodeAddr" $ do
+    it "properly serialized" $ do
+      S.decode "\127\0\0\1\1\2" `shouldBe`
+        Right ("127.0.0.1:258" :: NodeAddr IPv4)
+
+    it "properly serialized (iso)" $ property $ \ nid ->
+      S.decode (S.encode nid) `shouldBe`
+        Right (nid :: NodeAddr IPv4)
+
+  describe "NodeInfo" $ do
+    it "properly serialized" $ do
+      S.decode "mnopqrstuvwxyz123456\
+               \\127\0\0\1\1\2" `shouldBe` Right
+       (NodeInfo "mnopqrstuvwxyz123456" "127.0.0.1:258" :: NodeInfo IPv4)
+
+    it "properly serialized (iso)" $ property $ \ nid ->
+      S.decode (S.encode nid) `shouldBe`
+        Right (nid :: NodeInfo IPv4)
+
+  --  see <http://bittorrent.org/beps/bep_0020.html>
+  describe "Fingerprint" $ do
+    it "decode mainline encoded peer id" $ do
+      fingerprint "M4-3-6--xxxxxxxxxxxx" `shouldBe` "Mainline-4.3.6"
+      fingerprint "M4-20-8-xxxxxxxxxxxx" `shouldBe` "Mainline-4.20.8"
+
+    it "decode azureus encoded peer id" $ do
+      fingerprint "-AZ2060-xxxxxxxxxxxx" `shouldBe` "Azureus-2060"
+      fingerprint "-BS0000-xxxxxxxxxxxx" `shouldBe` "BTSlave-0"
+
+    it "decode Shad0w style peer id" $ do
+      fingerprint "S58B-----xxxxxxxxxxx" `shouldBe` "Shadow-5.8.11"
+      fingerprint "T58B-----xxxxxxxxxxx" `shouldBe` "BitTornado-5.8.11"
+
+    it "decode bitcomet style peer id" $ do
+      fingerprint "exbc01xxxxxxxxxxxxxx" `shouldBe` "BitComet-48.49"
+      fingerprint "FUTB01xxxxxxxxxxxxxx" `shouldBe` "BitComet-48.49"
+      fingerprint "exbc01LORDxxxxxxxxxx" `shouldBe` "BitLord-48.49"
+
+    it "decode opera style peer id" $ do
+      fingerprint "OP0123xxxxxxxxxxxxxx" `shouldBe` "Opera-123"
+
+    it "decode ML donkey style peer id" $ do
+      fingerprint "-ML2.7.2-xxxxxxxxxxx" `shouldBe` "MLdonkey-0"
+
+-- TODO XBT, Bits on Wheels, Queen Bee, BitTyrant, TorrenTopia,
+-- BitSpirit, Rufus, G3 Torrent, FlashGet
\ No newline at end of file
diff --git a/tests/Network/BitTorrent/DHT/MessageSpec.hs b/tests/Network/BitTorrent/DHT/MessageSpec.hs
index 4ec875dd..ab6e1ea5 100644
--- a/tests/Network/BitTorrent/DHT/MessageSpec.hs
+++ b/tests/Network/BitTorrent/DHT/MessageSpec.hs
@@ -8,7 +8,7 @@ import Data.ByteString.Lazy as BL
 import Data.Default
 import Data.List as L
 import Data.Maybe
-import Network.BitTorrent.Core
+import Network.BitTorrent.Address
 import Network.BitTorrent.DHT.Message
 import qualified Network.KRPC as KRPC (def)
 import Network.KRPC hiding (def)
@@ -17,9 +17,9 @@ import Test.Hspec
 import Test.QuickCheck
 import System.Timeout
 
+import Data.TorrentSpec                 ()
 import Network.BitTorrent.CoreSpec      ()
 import Network.BitTorrent.DHT.TokenSpec ()
-import Data.Torrent.InfoHashSpec        ()
 
 
 instance MonadLogger IO where
diff --git a/tests/Network/BitTorrent/DHT/QuerySpec.hs b/tests/Network/BitTorrent/DHT/QuerySpec.hs
index d25bd120..81c3b45b 100644
--- a/tests/Network/BitTorrent/DHT/QuerySpec.hs
+++ b/tests/Network/BitTorrent/DHT/QuerySpec.hs
@@ -9,7 +9,7 @@ import Data.Default
 import Data.List as L
 import Test.Hspec
 
-import Network.BitTorrent.Core
+import Network.BitTorrent.Address
 import Network.BitTorrent.DHT
 import Network.BitTorrent.DHT.Session
 import Network.BitTorrent.DHT.Query
diff --git a/tests/Network/BitTorrent/DHT/RoutingSpec.hs b/tests/Network/BitTorrent/DHT/RoutingSpec.hs
index c4a33357..aeccff5f 100644
--- a/tests/Network/BitTorrent/DHT/RoutingSpec.hs
+++ b/tests/Network/BitTorrent/DHT/RoutingSpec.hs
@@ -8,7 +8,7 @@ import Data.Maybe
 import Test.Hspec
 import Test.QuickCheck
 
-import Network.BitTorrent.Core
+import Network.BitTorrent.Address
 import Network.BitTorrent.DHT.Routing as T
 
 import Network.BitTorrent.CoreSpec hiding (spec)
diff --git a/tests/Network/BitTorrent/DHT/SessionSpec.hs b/tests/Network/BitTorrent/DHT/SessionSpec.hs
index bb32cf0e..a5376c32 100644
--- a/tests/Network/BitTorrent/DHT/SessionSpec.hs
+++ b/tests/Network/BitTorrent/DHT/SessionSpec.hs
@@ -5,17 +5,18 @@ import Control.Concurrent
 import Control.Exception
 import Control.Monad.Reader
 import Control.Monad.Trans.Resource
+import Data.Conduit.Lazy
 import Data.Default
 import Data.List as L
 import Test.Hspec
 import Test.QuickCheck
 
-import Network.BitTorrent.Core
+import Network.BitTorrent.Address
 import Network.BitTorrent.DHT
 import Network.BitTorrent.DHT.Message
 import Network.BitTorrent.DHT.Session
 
-import Data.Torrent.InfoHashSpec ()
+import Data.TorrentSpec ()
 import Network.BitTorrent.CoreSpec ()
 import Network.BitTorrent.DHT.TokenSpec ()
 
diff --git a/tests/Network/BitTorrent/DHT/TestData.hs b/tests/Network/BitTorrent/DHT/TestData.hs
index 2e000a77..e9473cbb 100644
--- a/tests/Network/BitTorrent/DHT/TestData.hs
+++ b/tests/Network/BitTorrent/DHT/TestData.hs
@@ -3,7 +3,7 @@ module Network.BitTorrent.DHT.TestData
        , testTorrents
        ) where
 
-import Data.Torrent.InfoHash
+import Data.Torrent
 
 data TestEntry = TestEntry
   { entryName  :: String
diff --git a/tests/Network/BitTorrent/DHT/TokenSpec.hs b/tests/Network/BitTorrent/DHT/TokenSpec.hs
index 6353a24c..a45d2212 100644
--- a/tests/Network/BitTorrent/DHT/TokenSpec.hs
+++ b/tests/Network/BitTorrent/DHT/TokenSpec.hs
@@ -7,7 +7,7 @@ import Data.String
 import Test.Hspec
 import Test.QuickCheck
 
-import Network.BitTorrent.Core
+import Network.BitTorrent.Address
 import Network.BitTorrent.CoreSpec ()
 import Network.BitTorrent.DHT.Token as T
 
diff --git a/tests/Network/BitTorrent/DHTSpec.hs b/tests/Network/BitTorrent/DHTSpec.hs
index 76b48257..30abc867 100644
--- a/tests/Network/BitTorrent/DHTSpec.hs
+++ b/tests/Network/BitTorrent/DHTSpec.hs
@@ -6,7 +6,7 @@ import Data.List as L
 import Test.Hspec
 import System.Timeout
 
-import Data.Torrent.InfoHash
+import Data.Torrent
 import Network.BitTorrent.DHT
 
 
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/ConnectionSpec.hs b/tests/Network/BitTorrent/Exchange/ConnectionSpec.hs
index c21f55ef..d654cda1 100644
--- a/tests/Network/BitTorrent/Exchange/ConnectionSpec.hs
+++ b/tests/Network/BitTorrent/Exchange/ConnectionSpec.hs
@@ -8,8 +8,7 @@ import Test.Hspec
 import Test.QuickCheck
 
 import Data.Torrent
-import Data.Torrent.InfoHash
-import Network.BitTorrent.Core
+import Network.BitTorrent.Address
 import Network.BitTorrent.Exchange.Connection
 import Network.BitTorrent.Exchange.Message
 
diff --git a/tests/Network/BitTorrent/Exchange/Session/MetadataSpec.hs b/tests/Network/BitTorrent/Exchange/DownloadSpec.hs
index 975ceb5b..d46f2034 100644
--- a/tests/Network/BitTorrent/Exchange/Session/MetadataSpec.hs
+++ b/tests/Network/BitTorrent/Exchange/DownloadSpec.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE RecordWildCards #-}
-module Network.BitTorrent.Exchange.Session.MetadataSpec (spec) where
+module Network.BitTorrent.Exchange.DownloadSpec (spec) where
 import Control.Concurrent
 import Data.ByteString as BS
 import Data.ByteString.Lazy as BL
@@ -7,11 +7,10 @@ import Test.Hspec
 import Test.QuickCheck
 
 import Data.BEncode as BE
-import Data.Torrent
-import Data.Torrent.Piece as P
-import Network.BitTorrent.Core
+import Data.Torrent as Torrent
+import Network.BitTorrent.Address
+import Network.BitTorrent.Exchange.Download
 import Network.BitTorrent.Exchange.Message
-import Network.BitTorrent.Exchange.Session.Metadata
 
 import Config
 import Network.BitTorrent.CoreSpec ()
@@ -25,27 +24,16 @@ chunkBy s bs
   | BS.null bs = []
   | otherwise  = BS.take s bs : chunkBy s (BS.drop s bs)
 
-withUpdates :: Updates a -> IO a
+withUpdates :: Updates s a -> IO a
 withUpdates m = do
   Torrent {..} <- getTestTorrent
   let infoDictLen = fromIntegral $ BL.length $ BE.encode tInfoDict
-  mvar <- newMVar (nullStatus infoDictLen)
-  runUpdates mvar placeholderAddr m
+  --mvar <- newMVar (nullStatus infoDictLen)
+  --runUpdates mvar placeholderAddr m
+  undefined
 
-simulateFetch :: InfoDict -> Updates (Maybe InfoDict)
-simulateFetch dict = go
-  where
-    blocks = chunkBy metadataPieceSize (BL.toStrict (BE.encode dict))
-    packPiece ix = P.Piece ix (blocks !! ix)
-    ih     = idInfoHash dict
-
-    go = do
-      mix <- scheduleBlock
-      case mix of
-        Nothing -> return Nothing
-        Just ix -> do
-          mdict <- pushBlock (packPiece ix) ih
-          maybe go (return . Just) mdict
+simulateFetch :: InfoDict -> Updates s (Maybe InfoDict)
+simulateFetch dict = undefined
 
 spec :: Spec
 spec = do
diff --git a/tests/Network/BitTorrent/Exchange/MessageSpec.hs b/tests/Network/BitTorrent/Exchange/MessageSpec.hs
index 63d814ff..d615b1ff 100644
--- a/tests/Network/BitTorrent/Exchange/MessageSpec.hs
+++ b/tests/Network/BitTorrent/Exchange/MessageSpec.hs
@@ -10,10 +10,10 @@ import Data.String
 import Test.Hspec
 import Test.QuickCheck
 
-import Data.Torrent.BitfieldSpec ()
-import Data.Torrent.InfoHashSpec ()
+import Data.TorrentSpec ()
+import Network.BitTorrent.Exchange.BitfieldSpec ()
 import Network.BitTorrent.CoreSpec ()
-import Network.BitTorrent.Core ()
+import Network.BitTorrent.Address ()
 import Network.BitTorrent.Exchange.BlockSpec ()
 import Network.BitTorrent.Exchange.Message
 
diff --git a/tests/Network/BitTorrent/Exchange/SessionSpec.hs b/tests/Network/BitTorrent/Exchange/SessionSpec.hs
index c2c76644..bf5b95a1 100644
--- a/tests/Network/BitTorrent/Exchange/SessionSpec.hs
+++ b/tests/Network/BitTorrent/Exchange/SessionSpec.hs
@@ -3,7 +3,7 @@ module Network.BitTorrent.Exchange.SessionSpec (spec) where
 import Test.Hspec
 
 import Data.Torrent
-import Network.BitTorrent.Core
+import Network.BitTorrent.Address
 import Network.BitTorrent.Exchange.Session
 
 import Config
diff --git a/tests/Data/Torrent/ProgressSpec.hs b/tests/Network/BitTorrent/Internal/ProgressSpec.hs
index 32efbd7a..acbfd84c 100644
--- a/tests/Data/Torrent/ProgressSpec.hs
+++ b/tests/Network/BitTorrent/Internal/ProgressSpec.hs
@@ -1,9 +1,9 @@
 {-# OPTIONS -fno-warn-orphans #-}
-module Data.Torrent.ProgressSpec (spec) where
+module Network.BitTorrent.Internal.ProgressSpec (spec) where
 import Control.Applicative
 import Test.Hspec
 import Test.QuickCheck
-import Data.Torrent.Progress
+import Network.BitTorrent.Internal.Progress
 
 
 instance Arbitrary Progress where
diff --git a/tests/Network/BitTorrent/Tracker/MessageSpec.hs b/tests/Network/BitTorrent/Tracker/MessageSpec.hs
index c56afd2a..29854d58 100644
--- a/tests/Network/BitTorrent/Tracker/MessageSpec.hs
+++ b/tests/Network/BitTorrent/Tracker/MessageSpec.hs
@@ -16,13 +16,13 @@ import Data.Maybe
 import Test.Hspec
 import Test.QuickCheck
 
-import Data.Torrent.InfoHashSpec ()
-import Data.Torrent.ProgressSpec ()
-import Network.BitTorrent.Core.PeerIdSpec ()
-import Network.BitTorrent.Core.PeerAddrSpec ()
+import Data.TorrentSpec ()
+import Network.BitTorrent.Internal.ProgressSpec ()
+import Network.BitTorrent.Address ()
+import Network.BitTorrent.Address ()
 
 import Network.BitTorrent.Tracker.Message as Message
-import Network.BitTorrent.Core
+import Network.BitTorrent.Address
 
 
 --prop_bencode :: Eq a => BEncode a => a -> Bool
diff --git a/tests/Network/BitTorrent/Tracker/RPC/HTTPSpec.hs b/tests/Network/BitTorrent/Tracker/RPC/HTTPSpec.hs
index 65f58911..e928f917 100644
--- a/tests/Network/BitTorrent/Tracker/RPC/HTTPSpec.hs
+++ b/tests/Network/BitTorrent/Tracker/RPC/HTTPSpec.hs
@@ -5,7 +5,7 @@ import Data.Default
 import Data.List as L
 import Test.Hspec
 
-import Data.Torrent.Progress
+import Network.BitTorrent.Internal.Progress
 import Network.BitTorrent.Tracker.Message as Message
 import Network.BitTorrent.Tracker.RPC.HTTP
 
diff --git a/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs b/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs
index 8a1ffc01..1ec3bdb7 100644
--- a/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs
+++ b/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs
@@ -9,7 +9,7 @@ import Data.List as L
 import Data.Maybe
 import Test.Hspec
 
-import Network.BitTorrent.Core
+import Network.BitTorrent.Address
 import Network.BitTorrent.Tracker.Message as Message
 
 import Network.BitTorrent.Tracker.TestData
diff --git a/tests/Network/BitTorrent/Tracker/TestData.hs b/tests/Network/BitTorrent/Tracker/TestData.hs
index e0edba25..b95e2df4 100644
--- a/tests/Network/BitTorrent/Tracker/TestData.hs
+++ b/tests/Network/BitTorrent/Tracker/TestData.hs
@@ -12,7 +12,7 @@ import Data.Maybe
 import Data.String
 import Network.URI
 
-import Data.Torrent.InfoHash
+import Data.Torrent
 
 
 data TrackerEntry = TrackerEntry
diff --git a/tests/System/Torrent/FileMapSpec.hs b/tests/System/Torrent/FileMapSpec.hs
index 36632b3e..85180c0a 100644
--- a/tests/System/Torrent/FileMapSpec.hs
+++ b/tests/System/Torrent/FileMapSpec.hs
@@ -9,7 +9,7 @@ import System.FilePath
 import System.IO.Unsafe
 import Test.Hspec
 
-import Data.Torrent.Layout
+import Data.Torrent
 import System.Torrent.FileMap as FM
 
 
diff --git a/tests/System/Torrent/StorageSpec.hs b/tests/System/Torrent/StorageSpec.hs
index 30322545..b5e49078 100644
--- a/tests/System/Torrent/StorageSpec.hs
+++ b/tests/System/Torrent/StorageSpec.hs
@@ -7,9 +7,8 @@ import System.Directory
 import System.IO.Unsafe
 import Test.Hspec
 
-import Data.Torrent.Bitfield as BF
-import Data.Torrent.Layout
-import Data.Torrent.Piece
+import Data.Torrent
+import Network.BitTorrent.Exchange.Bitfield as BF
 import System.Torrent.Storage