6 files changed, 12 insertions, 11 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index 23f2a1e8..7d2b9594 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -71,14 +71,14 @@ library
                        Network.BitTorrent.Exchange
                        Network.BitTorrent.Exchange.Assembler
                        Network.BitTorrent.Exchange.Block
+                       Network.BitTorrent.Exchange.Connection
+                       Network.BitTorrent.Exchange.Connection.Status
                        Network.BitTorrent.Exchange.Manager
                        Network.BitTorrent.Exchange.Message
                        Network.BitTorrent.Exchange.Selection
                        Network.BitTorrent.Exchange.Session
                        Network.BitTorrent.Exchange.Session.Metadata
                        Network.BitTorrent.Exchange.Session.Status
-                       Network.BitTorrent.Exchange.Wire
-                       Network.BitTorrent.Exchange.Wire.Status
                        Network.BitTorrent.Tracker
                        Network.BitTorrent.Tracker.Cache
                        Network.BitTorrent.Tracker.List
@@ -209,10 +209,10 @@ test-suite spec
                        Network.BitTorrent.Tracker.RPC.HTTPSpec
                        Network.BitTorrent.Tracker.RPC.UDPSpec
                        Network.BitTorrent.Tracker.SessionSpec
+                       Network.BitTorrent.Exchange.ConnectionSpec
                        Network.BitTorrent.Exchange.MessageSpec
                        Network.BitTorrent.Exchange.SessionSpec
                        Network.BitTorrent.Exchange.Session.MetadataSpec
-                       Network.BitTorrent.Exchange.WireSpec
                        System.Torrent.StorageSpec
                        System.Torrent.FileMapSpec
   build-depends:       base == 4.*
diff --git a/src/Network/BitTorrent/Exchange/Wire.hs b/src/Network/BitTorrent/Exchange/Connection.hs
index 53c9afb2..b23eb08b 100644
--- a/src/Network/BitTorrent/Exchange/Wire.hs
+++ b/src/Network/BitTorrent/Exchange/Connection.hs
@@ -18,7 +18,7 @@
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-module Network.BitTorrent.Exchange.Wire
+module Network.BitTorrent.Exchange.Connection
        ( -- * Wire
          Connected
        , Wire
@@ -125,8 +125,8 @@ import System.Timeout
 import Data.Torrent.Bitfield as BF
 import Data.Torrent.InfoHash
 import Network.BitTorrent.Core
+import Network.BitTorrent.Exchange.Connection.Status
 import Network.BitTorrent.Exchange.Message as Msg
-import Network.BitTorrent.Exchange.Wire.Status
 
 -- TODO handle port message?
 -- TODO handle limits?
diff --git a/src/Network/BitTorrent/Exchange/Wire/Status.hs b/src/Network/BitTorrent/Exchange/Connection/Status.hs
index d1b60f11..b4b10371 100644
--- a/src/Network/BitTorrent/Exchange/Wire/Status.hs
+++ b/src/Network/BitTorrent/Exchange/Connection/Status.hs
@@ -9,7 +9,7 @@
 --   sides.
 --
 {-# LANGUAGE TemplateHaskell   #-}
-module Network.BitTorrent.Exchange.Wire.Status
+module Network.BitTorrent.Exchange.Connection.Status
        ( -- * Peer status
          PeerStatus(..)
        , choking
diff --git a/src/Network/BitTorrent/Exchange/Manager.hs b/src/Network/BitTorrent/Exchange/Manager.hs
index 52a51a8d..f7f3cea7 100644
--- a/src/Network/BitTorrent/Exchange/Manager.hs
+++ b/src/Network/BitTorrent/Exchange/Manager.hs
@@ -14,8 +14,9 @@ import Network.Socket
 
 import Data.Torrent.InfoHash
 import Network.BitTorrent.Core
+import Network.BitTorrent.Exchange.Connection hiding (Options)
 import Network.BitTorrent.Exchange.Session
-import Network.BitTorrent.Exchange.Wire hiding (Options)
+
 
 data Options = Options
   { optBacklog  :: Int
diff --git a/src/Network/BitTorrent/Exchange/Session.hs b/src/Network/BitTorrent/Exchange/Session.hs
index f9e8433f..a0eaadaa 100644
--- a/src/Network/BitTorrent/Exchange/Session.hs
+++ b/src/Network/BitTorrent/Exchange/Session.hs
@@ -46,11 +46,11 @@ import Data.Torrent.Piece
 import qualified Data.Torrent.Piece as Torrent (Piece ())
 import Network.BitTorrent.Core
 import Network.BitTorrent.Exchange.Block   as Block
+import Network.BitTorrent.Exchange.Connection
+import Network.BitTorrent.Exchange.Connection.Status
 import Network.BitTorrent.Exchange.Message as Message
 import Network.BitTorrent.Exchange.Session.Metadata as Metadata
 import Network.BitTorrent.Exchange.Session.Status   as SS
-import Network.BitTorrent.Exchange.Wire
-import Network.BitTorrent.Exchange.Wire.Status
 import System.Torrent.Storage
 
 {-----------------------------------------------------------------------
diff --git a/tests/Network/BitTorrent/Exchange/WireSpec.hs b/tests/Network/BitTorrent/Exchange/ConnectionSpec.hs
index 293e1bd6..c21f55ef 100644
--- a/tests/Network/BitTorrent/Exchange/WireSpec.hs
+++ b/tests/Network/BitTorrent/Exchange/ConnectionSpec.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE RecordWildCards      #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
-module Network.BitTorrent.Exchange.WireSpec (spec) where
+module Network.BitTorrent.Exchange.ConnectionSpec (spec) where
 import Control.Applicative
 import Control.Monad.Trans
 import Data.Default
@@ -10,8 +10,8 @@ import Test.QuickCheck
 import Data.Torrent
 import Data.Torrent.InfoHash
 import Network.BitTorrent.Core
+import Network.BitTorrent.Exchange.Connection
 import Network.BitTorrent.Exchange.Message
-import Network.BitTorrent.Exchange.Wire
 
 import Config
 import Network.BitTorrent.Exchange.MessageSpec ()