11 files changed, 23 insertions, 23 deletions

diff --git a/bittorrent/bittorrent.cabal b/bittorrent/bittorrent.cabal
index 555143f7..bb34e0ec 100644
--- a/bittorrent/bittorrent.cabal
+++ b/bittorrent/bittorrent.cabal
@@ -81,7 +81,7 @@ library
                     Data.Wrapper.PSQInt
                     Data.MinMaxPSQ
                     Network.Address
-                    Network.DHT.Routing
+                    Network.Kademlia.Routing
                     Data.Torrent
                     Network.BitTorrent.DHT.ContactInfo
                     Network.BitTorrent.DHT.Token
@@ -243,7 +243,7 @@ test-suite spec
                        Network.BitTorrent.DHT.TestData
                        Network.BitTorrent.DHT.MessageSpec
                        Network.BitTorrent.DHT.QuerySpec
-                       Network.DHT.RoutingSpec
+                       Network.Kademlia.RoutingSpec
                        Network.BitTorrent.DHT.SessionSpec
                        Network.BitTorrent.DHT.TokenSpec
                        Network.BitTorrent.Internal.CacheSpec
diff --git a/dht-client.cabal b/dht-client.cabal
index 12f5cddd..afd3f8da 100644
--- a/dht-client.cabal
+++ b/dht-client.cabal
@@ -65,7 +65,7 @@ library
                     Data.Wrapper.PSQInt
                     Data.MinMaxPSQ
                     Network.Address
-                    Network.DHT.Routing
+                    Network.Kademlia.Routing
                     Data.Torrent
                     Network.BitTorrent.DHT.ContactInfo
                     Network.BitTorrent.DHT.Token
@@ -138,7 +138,7 @@ library
       Build-depends:  network      >= 2.4 && < 2.6
 
 
-  other-modules:       Paths_bittorrent
+  other-modules:       Paths_dht_client
                        Crypto.Cipher.Salsa
                        Crypto.Cipher.XSalsa
                        Crypto.ECC.Class
diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 5c002363..6c655458 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -52,7 +52,7 @@ import Network.StreamServer
 import Network.Kademlia
 import qualified Network.BitTorrent.MainlineDHT as Mainline
 import qualified Network.Tox as Tox
-import Network.DHT.Routing as R
+import Network.Kademlia.Routing as R
 import Data.Aeson as J (ToJSON, FromJSON)
 import qualified Data.Aeson as J
 import qualified Data.ByteString.Lazy as L
diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index 55b34f98..4af583ed 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -195,7 +195,7 @@ import System.FilePath
 import System.Posix.Types
 
 import Network.Address
-import Network.DHT.Routing
+import Network.Kademlia.Routing
 
 
 {-----------------------------------------------------------------------
diff --git a/src/Network/BitTorrent/MainlineDHT.hs b/src/Network/BitTorrent/MainlineDHT.hs
index e7d702c3..4566471a 100644
--- a/src/Network/BitTorrent/MainlineDHT.hs
+++ b/src/Network/BitTorrent/MainlineDHT.hs
@@ -60,8 +60,8 @@ import Network.Address                        (Address, fromAddr, fromSockAddr,
 import Network.BitTorrent.DHT.ContactInfo     as Peers
 import Network.Kademlia.Search          (Search (..))
 import Network.BitTorrent.DHT.Token           as Token
-import qualified Network.DHT.Routing          as R
-         ;import Network.DHT.Routing          (Timestamp, getTimestamp)
+import qualified Network.Kademlia.Routing          as R
+         ;import Network.Kademlia.Routing          (Timestamp, getTimestamp)
 import Network.QueryResponse
 import Network.Socket
 import System.IO
diff --git a/src/Network/Kademlia.hs b/src/Network/Kademlia.hs
index 5fb1e334..873fc8c0 100644
--- a/src/Network/Kademlia.hs
+++ b/src/Network/Kademlia.hs
@@ -11,7 +11,7 @@ import Data.Maybe
 import qualified Data.Set as Set
 import Data.Time.Clock       (getCurrentTime)
 import Data.Time.Clock.POSIX (getPOSIXTime, utcTimeToPOSIXSeconds)
-import Network.DHT.Routing   as R
+import Network.Kademlia.Routing   as R
 #ifdef THREAD_DEBUG
 import Control.Concurrent.Lifted.Instrument
 #else
diff --git a/src/Network/DHT/Routing.hs b/src/Network/Kademlia/Routing.hs
index 11dbd11e..7f76ac77 100644
--- a/src/Network/DHT/Routing.hs
+++ b/src/Network/Kademlia/Routing.hs
@@ -26,7 +26,7 @@
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE StandaloneDeriving, FlexibleContexts, MultiParamTypeClasses, FlexibleInstances #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
-module Network.DHT.Routing
+module Network.Kademlia.Routing
        {-
        ( -- * BucketList
          BucketList
@@ -40,12 +40,12 @@ module Network.DHT.Routing
        , NodeCount
 
          -- * Query
-       , Network.DHT.Routing.null
-       , Network.DHT.Routing.full
+       , Network.Kademlia.Routing.null
+       , Network.Kademlia.Routing.full
        , thisId
        , shape
-       , Network.DHT.Routing.size
-       , Network.DHT.Routing.depth
+       , Network.Kademlia.Routing.size
+       , Network.Kademlia.Routing.depth
        , compatibleNodeId
 
          -- * Lookup
@@ -55,14 +55,14 @@ module Network.DHT.Routing
        , kclosest
 
          -- * Construction
-       , Network.DHT.Routing.nullTable
+       , Network.Kademlia.Routing.nullTable
        , Event(..)
        , CheckPing(..)
-       , Network.DHT.Routing.insert
+       , Network.Kademlia.Routing.insert
 
          -- * Conversion
-       , Network.DHT.Routing.TableEntry
-       , Network.DHT.Routing.toList
+       , Network.Kademlia.Routing.TableEntry
+       , Network.Kademlia.Routing.toList
 
          -- * Routing
        , Timestamp
@@ -436,7 +436,7 @@ mapTable g f tbl@(BucketList self bkts) = reify (contramapC g $ bucketCompare bk
     resolve = const id
 
 instance (Eq ni) => Eq (BucketList ni) where
-  (==) = (==) `on` Network.DHT.Routing.toList
+  (==) = (==) `on` Network.Kademlia.Routing.toList
 
 #if 0
 
diff --git a/src/Network/Kademlia/Search.hs b/src/Network/Kademlia/Search.hs
index 195bed14..71107fbd 100644
--- a/src/Network/Kademlia/Search.hs
+++ b/src/Network/Kademlia/Search.hs
@@ -26,7 +26,7 @@ import qualified Data.MinMaxPSQ   as MM
 import qualified Data.Wrapper.PSQ as PSQ
          ;import Data.Wrapper.PSQ (pattern (:->), Binding, PSQ, PSQKey)
 import Network.Address hiding (NodeId)
-import Network.DHT.Routing as R
+import Network.Kademlia.Routing as R
 #ifdef THREAD_DEBUG
 import Control.Concurrent.Lifted.Instrument
 #else
diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 7279c2e3..c49cfe90 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -71,7 +71,7 @@ import Network.Address                        (Address, WantIP (..), either4or6,
                                                sockAddrPort, testIdBit,
                                                toSockAddr, un4map)
 import Network.Kademlia.Search          (Search (..))
-import qualified Network.DHT.Routing          as R
+import qualified Network.Kademlia.Routing          as R
 import Network.QueryResponse
 import Network.Socket
 import System.Endian
diff --git a/src/Network/Tox/DHT/Handlers.hs b/src/Network/Tox/DHT/Handlers.hs
index 2dc183cd..4e43c4a7 100644
--- a/src/Network/Tox/DHT/Handlers.hs
+++ b/src/Network/Tox/DHT/Handlers.hs
@@ -11,7 +11,7 @@ import Network.Kademlia.Search
 import qualified Data.Wrapper.PSQInt as Int
 import Network.Kademlia
 import Network.Address               (WantIP (..), ipFamily, testIdBit,fromSockAddr, sockAddrPort)
-import qualified Network.DHT.Routing as R
+import qualified Network.Kademlia.Routing as R
 import Control.TriadCommittee
 import System.Global6
 
diff --git a/src/Network/Tox/Onion/Handlers.hs b/src/Network/Tox/Onion/Handlers.hs
index f02bac98..9dc6177c 100644
--- a/src/Network/Tox/Onion/Handlers.hs
+++ b/src/Network/Tox/Onion/Handlers.hs
@@ -18,7 +18,7 @@ import Data.Serialize as S
 import qualified Data.Wrapper.PSQInt as Int
 import Network.Kademlia
 import Network.Address               (WantIP (..), ipFamily, testIdBit)
-import qualified Network.DHT.Routing as R
+import qualified Network.Kademlia.Routing as R
 import Control.TriadCommittee
 import qualified Data.MinMaxPSQ               as MinMaxPSQ
          ;import Data.MinMaxPSQ               (MinMaxPSQ')