9 files changed, 10 insertions, 10 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index 6470f612..17f2e68e 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -229,7 +229,7 @@ library
     exposed-modules:   Data.BEncode.Pretty
   else
     build-depends:     largeword
-    exposed-modules:   Data.Tox
+    exposed-modules:   Network.DatagramServer.Tox
   if flag(aeson)
     build-depends: aeson, aeson-pretty, unordered-containers, vector
     cpp-options:   -DBENCODE_AESON
diff --git a/src/Network/BitTorrent/DHT/Message.hs b/src/Network/BitTorrent/DHT/Message.hs
index cfe24fc5..4410a296 100644
--- a/src/Network/BitTorrent/DHT/Message.hs
+++ b/src/Network/BitTorrent/DHT/Message.hs
@@ -94,8 +94,8 @@ import Data.Bool
 import Data.BEncode as BE
 import Data.BEncode.BDict as BDict
 #else
-import qualified Data.Tox as Tox
-import Data.Tox (NodeId)
+import qualified Network.DatagramServer.Tox as Tox
+import Network.DatagramServer.Tox (NodeId)
 import Data.Word
 import Control.Monad
 import Network.KRPC.Method
diff --git a/src/Network/BitTorrent/DHT/Query.hs b/src/Network/BitTorrent/DHT/Query.hs
index 1c4df267..fc6625ae 100644
--- a/src/Network/BitTorrent/DHT/Query.hs
+++ b/src/Network/BitTorrent/DHT/Query.hs
@@ -96,7 +96,7 @@ import Network.DHT.Mainline hiding (NodeId)
 import Network.DatagramServer.Mainline (KMessageOf)
 #else
 import Data.ByteString (ByteString)
-import Data.Tox
+import Network.DatagramServer.Tox
 #endif
 import Network.BitTorrent.Address hiding (NodeId)
 import Network.DatagramServer.Types as RPC hiding (Query,Response)
diff --git a/src/Network/BitTorrent/DHT/Routing.hs b/src/Network/BitTorrent/DHT/Routing.hs
index d147bb94..fc7c76b0 100644
--- a/src/Network/BitTorrent/DHT/Routing.hs
+++ b/src/Network/BitTorrent/DHT/Routing.hs
@@ -89,7 +89,7 @@ import Network.BitTorrent.Address
 import Network.DHT.Mainline ()
 import Network.DatagramServer.Mainline (KMessageOf)
 #else
-import Data.Tox as Tox
+import Network.DatagramServer.Tox as Tox
 type KMessageOf = Tox.Message
 #endif
 
diff --git a/src/Network/BitTorrent/DHT/Search.hs b/src/Network/BitTorrent/DHT/Search.hs
index 7a587644..367a6a9b 100644
--- a/src/Network/BitTorrent/DHT/Search.hs
+++ b/src/Network/BitTorrent/DHT/Search.hs
@@ -30,7 +30,7 @@ import Network.DHT.Mainline ()
 import Network.DatagramServer.Mainline (KMessageOf)
 type Ann = ()
 #else
-import Data.Tox as Tox
+import Network.DatagramServer.Tox as Tox
 type KMessageOf = Tox.Message
 type Ann = Bool
 #endif
diff --git a/src/Network/BitTorrent/DHT/Session.hs b/src/Network/BitTorrent/DHT/Session.hs
index ead4a723..f874b62e 100644
--- a/src/Network/BitTorrent/DHT/Session.hs
+++ b/src/Network/BitTorrent/DHT/Session.hs
@@ -110,7 +110,7 @@ import qualified Network.DatagramServer as KRPC (def)
 import Data.BEncode (BValue)
 import Network.DatagramServer.Mainline (KMessageOf)
 #else
-import Data.Tox as Tox
+import Network.DatagramServer.Tox as Tox
 #endif
 import Network.BitTorrent.Address
 import Network.BitTorrent.DHT.ContactInfo (PeerStore)
diff --git a/src/Network/DatagramServer.hs b/src/Network/DatagramServer.hs
index d22bc893..21300108 100644
--- a/src/Network/DatagramServer.hs
+++ b/src/Network/DatagramServer.hs
@@ -118,7 +118,7 @@ import Data.BEncode as BE
 import Data.BEncode.Internal as BE
 import Data.BEncode.Pretty (showBEncode)
 #else
-import qualified Data.Tox as Tox
+import qualified Network.DatagramServer.Tox as Tox
 #endif
 import qualified Data.ByteString.Base16 as Base16
 import Data.ByteString as BS
diff --git a/src/Network/DatagramServer/Mainline.hs b/src/Network/DatagramServer/Mainline.hs
index 2177d076..70b9b184 100644
--- a/src/Network/DatagramServer/Mainline.hs
+++ b/src/Network/DatagramServer/Mainline.hs
@@ -65,7 +65,7 @@ import Control.Exception.Lifted as Lifted
 #ifdef VERSION_bencoding
 import Data.BEncode as BE
 #else
-import qualified Data.Tox as Tox
+import qualified Network.DatagramServer.Tox as Tox
 #endif
 import Data.ByteString as B
 import Data.ByteString.Char8 as BC
diff --git a/src/Data/Tox.hs b/src/Network/DatagramServer/Tox.hs
index b79e0b9a..ad376c68 100644
--- a/src/Data/Tox.hs
+++ b/src/Network/DatagramServer/Tox.hs
@@ -11,7 +11,7 @@
 {-# LANGUAGE TupleSections         #-}
 {-# LANGUAGE TypeFamilies          #-}
 {-# LANGUAGE UnboxedTuples         #-}
-module Data.Tox where
+module Network.DatagramServer.Tox where
 
 import Data.Bits
 import Data.ByteString (ByteString)