22 files changed, 25 insertions, 26 deletions

diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index 6a999478..b3bf0ec7 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -194,7 +194,7 @@ import Text.PrettyPrint.HughesPJClass hiding ((<>),($$))
 import System.FilePath
 import System.Posix.Types
 
-import Network.BitTorrent.Address
+import Network.Address
 import Network.DHT.Routing
 import Network.DatagramServer.Mainline
 
@@ -866,7 +866,7 @@ data Torrent = Torrent
   , tNodes        :: !(Maybe [NodeAddr HostName])
     -- ^ This key should be set to the /K closest/ nodes in the
     -- torrent generating client's routing table. Alternatively, the
-    -- key could be set to a known good 'Network.BitTorrent.Address.Node'
+    -- key could be set to a known good 'Network.Address.Node'
     -- such as one operated by the person generating the torrent.
     --
     -- Please do not automatically add \"router.bittorrent.com\" to
diff --git a/src/Network/BitTorrent/Address.hs b/src/Network/Address.hs
index e75066b1..19bf29d6 100644
--- a/src/Network/BitTorrent/Address.hs
+++ b/src/Network/Address.hs
@@ -1,5 +1,5 @@
 -- |
---   Module      :  Network.BitTorrent.Address
+--   Module      :  Network.Address
 --   Copyright   :  (c) Sam Truzjan 2013
 --                  (c) Daniel Gröber 2013
 --   License     :  BSD3
@@ -24,7 +24,7 @@
 {-# LANGUAGE DeriveTraversable          #-}
 {-# LANGUAGE TemplateHaskell            #-}
 {-# OPTIONS -fno-warn-orphans           #-}
-module Network.BitTorrent.Address
+module Network.Address
        ( -- * Address
          Address (..)
        , fromAddr
@@ -128,7 +128,6 @@ import System.Locale    (defaultTimeLocale)
 import System.Entropy
 import Data.Digest.CRC32C
 import Network.DatagramServer.Types as RPC
-import Network.DatagramServer.Mainline (KMessageOf)
 -- import Network.DHT.Mainline
 
 -- import Paths_bittorrent (version)
diff --git a/src/Network/BitTorrent/Client.hs b/src/Network/BitTorrent/Client.hs
index b9a59f45..c84290dd 100644
--- a/src/Network/BitTorrent/Client.hs
+++ b/src/Network/BitTorrent/Client.hs
@@ -61,7 +61,7 @@ import Data.Text
 import Network
 
 import           Data.Torrent
-import           Network.BitTorrent.Address
+import           Network.Address
 import           Network.BitTorrent.Client.Types
 import           Network.BitTorrent.Client.Handle
 import           Network.BitTorrent.DHT      as DHT      hiding (Options)
diff --git a/src/Network/BitTorrent/Client/Types.hs b/src/Network/BitTorrent/Client/Types.hs
index 7f228276..e2ad858f 100644
--- a/src/Network/BitTorrent/Client/Types.hs
+++ b/src/Network/BitTorrent/Client/Types.hs
@@ -36,7 +36,7 @@ import Network
 import System.Log.FastLogger
 
 import Data.Torrent
-import Network.BitTorrent.Address
+import Network.Address
 import Network.BitTorrent.Internal.Types as Types
 import Network.BitTorrent.DHT      as DHT
 import Network.BitTorrent.Exchange as Exchange
diff --git a/src/Network/BitTorrent/DHT.hs b/src/Network/BitTorrent/DHT.hs
index 13f3744f..51d92127 100644
--- a/src/Network/BitTorrent/DHT.hs
+++ b/src/Network/BitTorrent/DHT.hs
@@ -65,7 +65,7 @@ import Network.Socket
 import Text.PrettyPrint.HughesPJClass as PP (pPrint,render)
 
 import Data.Torrent
-import Network.BitTorrent.Address
+import Network.Address
 import Network.BitTorrent.DHT.Query
 import Network.BitTorrent.DHT.Session
 import Network.DHT.Routing as T hiding (null)
diff --git a/src/Network/BitTorrent/DHT/ContactInfo.hs b/src/Network/BitTorrent/DHT/ContactInfo.hs
index f9dae567..3db3d5a8 100644
--- a/src/Network/BitTorrent/DHT/ContactInfo.hs
+++ b/src/Network/BitTorrent/DHT/ContactInfo.hs
@@ -20,13 +20,13 @@ import Data.Word
 import Network.Socket (SockAddr(..))
 
 import Data.Torrent
-import Network.BitTorrent.Address
+import Network.Address
 
 -- {-
 -- import Data.HashMap.Strict as HM
 --
 -- import Data.Torrent.InfoHash
--- import Network.BitTorrent.Address
+-- import Network.Address
 --
 -- -- increase prefix when table is too large
 -- -- decrease prefix when table is too small
diff --git a/src/Network/BitTorrent/DHT/Message.hs b/src/Network/BitTorrent/DHT/Message.hs
index 34714a6a..04cc0d41 100644
--- a/src/Network/BitTorrent/DHT/Message.hs
+++ b/src/Network/BitTorrent/DHT/Message.hs
@@ -100,7 +100,7 @@ import Data.Word
 import Control.Monad
 #endif
 import Network.KRPC.Method
-import Network.BitTorrent.Address hiding (NodeId)
+import Network.Address hiding (NodeId)
 import Data.ByteString (ByteString)
 import Data.List as L
 import Data.Monoid
diff --git a/src/Network/BitTorrent/DHT/Query.hs b/src/Network/BitTorrent/DHT/Query.hs
index cd2b5119..7d320283 100644
--- a/src/Network/BitTorrent/DHT/Query.hs
+++ b/src/Network/BitTorrent/DHT/Query.hs
@@ -99,7 +99,7 @@ import Network.DatagramServer.Mainline (KMessageOf)
 import Data.ByteString (ByteString)
 import Network.DatagramServer.Tox
 #endif
-import Network.BitTorrent.Address hiding (NodeId)
+import Network.Address hiding (NodeId)
 import Network.DatagramServer.Types as RPC hiding (Query,Response)
 
 {-----------------------------------------------------------------------
diff --git a/src/Network/BitTorrent/DHT/Search.hs b/src/Network/BitTorrent/DHT/Search.hs
index 367a6a9b..a6d07746 100644
--- a/src/Network/BitTorrent/DHT/Search.hs
+++ b/src/Network/BitTorrent/DHT/Search.hs
@@ -23,7 +23,7 @@ import qualified Data.MinMaxPSQ   as MM
          ;import Data.MinMaxPSQ   (MinMaxPSQ)
 import qualified Data.Wrapper.PSQ as PSQ
          ;import Data.Wrapper.PSQ (pattern (:->), Binding, PSQ)
-import Network.BitTorrent.Address hiding (NodeId)
+import Network.Address hiding (NodeId)
 import Network.DatagramServer.Types
 #ifdef VERSION_bencoding
 import Network.DHT.Mainline ()
diff --git a/src/Network/BitTorrent/DHT/Session.hs b/src/Network/BitTorrent/DHT/Session.hs
index 730c0059..e205add4 100644
--- a/src/Network/BitTorrent/DHT/Session.hs
+++ b/src/Network/BitTorrent/DHT/Session.hs
@@ -113,7 +113,7 @@ import Network.DatagramServer.Mainline (KMessageOf)
 #else
 import Network.DatagramServer.Tox as Tox
 #endif
-import Network.BitTorrent.Address
+import Network.Address
 import Network.BitTorrent.DHT.ContactInfo (PeerStore)
 import qualified Network.BitTorrent.DHT.ContactInfo as P
 import Network.BitTorrent.DHT.Message
diff --git a/src/Network/BitTorrent/DHT/Token.hs b/src/Network/BitTorrent/DHT/Token.hs
index 4c930cbc..75eadd1a 100644
--- a/src/Network/BitTorrent/DHT/Token.hs
+++ b/src/Network/BitTorrent/DHT/Token.hs
@@ -53,7 +53,7 @@ import Data.String
 import Data.Time
 import System.Random
 
-import Network.BitTorrent.Address
+import Network.Address
 
 -- TODO use ShortByteString
 
diff --git a/src/Network/BitTorrent/Exchange/Connection.hs b/src/Network/BitTorrent/Exchange/Connection.hs
index d65d322e..6804d0a2 100644
--- a/src/Network/BitTorrent/Exchange/Connection.hs
+++ b/src/Network/BitTorrent/Exchange/Connection.hs
@@ -137,7 +137,7 @@ import System.Log.FastLogger (ToLogStr(..))
 import System.Timeout
 
 import Data.Torrent
-import Network.BitTorrent.Address
+import Network.Address
 import Network.BitTorrent.Exchange.Bitfield as BF
 import Network.BitTorrent.Exchange.Message  as Msg
 
diff --git a/src/Network/BitTorrent/Exchange/Download.hs b/src/Network/BitTorrent/Exchange/Download.hs
index aa754407..981db2fb 100644
--- a/src/Network/BitTorrent/Exchange/Download.hs
+++ b/src/Network/BitTorrent/Exchange/Download.hs
@@ -43,7 +43,7 @@ import Data.Map as M
 import Data.Tuple
 
 import Data.Torrent as Torrent
-import Network.BitTorrent.Address
+import Network.Address
 import Network.BitTorrent.Exchange.Bitfield as BF
 import Network.BitTorrent.Exchange.Block    as Block
 import Network.BitTorrent.Exchange.Message  as Msg
diff --git a/src/Network/BitTorrent/Exchange/Manager.hs b/src/Network/BitTorrent/Exchange/Manager.hs
index 54727805..30a6a607 100644
--- a/src/Network/BitTorrent/Exchange/Manager.hs
+++ b/src/Network/BitTorrent/Exchange/Manager.hs
@@ -13,7 +13,7 @@ import Data.Default
 import Network.Socket
 
 import Data.Torrent
-import Network.BitTorrent.Address
+import Network.Address
 import Network.BitTorrent.Exchange.Connection hiding (Options)
 import Network.BitTorrent.Exchange.Session
 
diff --git a/src/Network/BitTorrent/Exchange/Message.hs b/src/Network/BitTorrent/Exchange/Message.hs
index 74232b47..2c6770f7 100644
--- a/src/Network/BitTorrent/Exchange/Message.hs
+++ b/src/Network/BitTorrent/Exchange/Message.hs
@@ -119,7 +119,7 @@ import Text.PrettyPrint.HughesPJClass hiding ((<>),($$))
 
 import Data.Torrent hiding (Piece (..))
 import qualified Data.Torrent as P (Piece (..))
-import Network.BitTorrent.Address
+import Network.Address
 import Network.BitTorrent.Exchange.Bitfield
 import Network.BitTorrent.Exchange.Block
 
diff --git a/src/Network/BitTorrent/Exchange/Session.hs b/src/Network/BitTorrent/Exchange/Session.hs
index 00886ccf..38a3c3a6 100644
--- a/src/Network/BitTorrent/Exchange/Session.hs
+++ b/src/Network/BitTorrent/Exchange/Session.hs
@@ -52,7 +52,7 @@ import System.Log.FastLogger (LogStr, ToLogStr (..))
 import Data.BEncode as BE
 import Data.Torrent as Torrent
 import Network.BitTorrent.Internal.Types
-import Network.BitTorrent.Address
+import Network.Address
 import Network.BitTorrent.Exchange.Bitfield as BF
 import Network.BitTorrent.Exchange.Block   as Block
 import Network.BitTorrent.Exchange.Connection
diff --git a/src/Network/BitTorrent/Tracker/Message.hs b/src/Network/BitTorrent/Tracker/Message.hs
index ddd86665..b9b6a9d3 100644
--- a/src/Network/BitTorrent/Tracker/Message.hs
+++ b/src/Network/BitTorrent/Tracker/Message.hs
@@ -126,7 +126,7 @@ import System.Entropy
 import Text.Read (readMaybe)
 
 import Data.Torrent
-import Network.BitTorrent.Address
+import Network.Address
 import Network.BitTorrent.Internal.Progress
 
 {-----------------------------------------------------------------------
diff --git a/src/Network/BitTorrent/Tracker/RPC.hs b/src/Network/BitTorrent/Tracker/RPC.hs
index 6fd22b25..45fef05e 100644
--- a/src/Network/BitTorrent/Tracker/RPC.hs
+++ b/src/Network/BitTorrent/Tracker/RPC.hs
@@ -37,7 +37,7 @@ import Network.URI
 import Network.Socket (HostAddress)
 
 import           Data.Torrent
-import           Network.BitTorrent.Address
+import           Network.Address
 import           Network.BitTorrent.Internal.Progress
 import           Network.BitTorrent.Tracker.Message
 import qualified Network.BitTorrent.Tracker.RPC.HTTP as HTTP
diff --git a/src/Network/BitTorrent/Tracker/RPC/HTTP.hs b/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
index bc52bddd..9b6e056a 100644
--- a/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
+++ b/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
@@ -48,7 +48,7 @@ import           Network.HTTP.Types.Header (hUserAgent)
 import           Network.HTTP.Types.URI    (SimpleQuery, renderSimpleQuery)
 
 import Data.Torrent                        (InfoHash)
-import Network.BitTorrent.Address             (libUserAgent)
+import Network.Address             (libUserAgent)
 import Network.BitTorrent.Tracker.Message hiding (Request, Response)
 
 {-----------------------------------------------------------------------
diff --git a/src/Network/BitTorrent/Tracker/Session.hs b/src/Network/BitTorrent/Tracker/Session.hs
index cef7d665..aa4a832f 100644
--- a/src/Network/BitTorrent/Tracker/Session.hs
+++ b/src/Network/BitTorrent/Tracker/Session.hs
@@ -58,7 +58,7 @@ import Data.Traversable
 import Network.URI
 
 import Data.Torrent
-import Network.BitTorrent.Address
+import Network.Address
 import Network.BitTorrent.Internal.Cache
 import Network.BitTorrent.Internal.Types
 import Network.BitTorrent.Tracker.List as TL
diff --git a/src/Network/DHT/Routing.hs b/src/Network/DHT/Routing.hs
index c0a431fa..1d1aa44b 100644
--- a/src/Network/DHT/Routing.hs
+++ b/src/Network/DHT/Routing.hs
@@ -83,7 +83,7 @@ import Text.PrettyPrint.HughesPJClass (pPrint,Pretty)
 import qualified Data.ByteString as BS
 import Data.Bits
 
-import Network.BitTorrent.Address
+import Network.Address
 
 
 {-----------------------------------------------------------------------
diff --git a/src/Network/DatagramServer/Tox.hs b/src/Network/DatagramServer/Tox.hs
index 2f48b512..d7d20824 100644
--- a/src/Network/DatagramServer/Tox.hs
+++ b/src/Network/DatagramServer/Tox.hs
@@ -23,7 +23,7 @@ import Data.Word
 import Data.LargeWord
 import Data.IP
 import Data.Serialize
--- import Network.BitTorrent.Address (NodeInfo(..)) -- Serialize IP
+-- import Network.Address (NodeInfo(..)) -- Serialize IP
 import GHC.Generics (Generic)
 import Network.Socket
 import Network.DatagramServer.Types