6 files changed, 11 insertions, 11 deletions

diff --git a/Presence/Server.hs b/Connection/Tcp.hs
index c38aec2a..73d01c40 100644
--- a/Presence/Server.hs
+++ b/Connection/Tcp.hs
@@ -9,7 +9,7 @@
 {-# LANGUAGE LambdaCase         #-}
 -----------------------------------------------------------------------------
 -- |
--- Module      :  Server
+-- Module      :  Connection.Tcp
 --
 -- Maintainer  :  joe@jerkface.net
 -- Stability   :  experimental
@@ -20,8 +20,8 @@
 --
 --  * interface tweaks
 --
-module Server
-    ( module Server
+module Connection.Tcp
+    ( module Connection.Tcp
     , module PingMachine ) where
 
 import Data.ByteString (ByteString,hGetNonBlocking)
@@ -216,7 +216,7 @@ noCleanUp io _ = ( (,) () ) `liftM` liftIO io
 -- | Construct a 'Server' object.  Use 'Control.Monad.Trans.Resource.ResourceT'
 -- to ensure proper cleanup.  For example,
 --
--- > import Server
+-- > import Connection.Tcp
 -- > import Control.Monad.Trans.Resource (runResourceT)
 -- > import Control.Monad.IO.Class       (liftIO)
 -- > import Control.Monad.STM            (atomically)
diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs
index 6d6d3bd7..5a0ed20e 100644
--- a/Presence/XMPPServer.hs
+++ b/Presence/XMPPServer.hs
@@ -34,7 +34,7 @@ module XMPPServer
 import ConnectionKey
 import qualified Control.Concurrent.STM.UpdateStream as Slotted
 import Nesting
-import Server
+import Connection.Tcp
 import EventUtil
 import ControlMaybe
 import LockedChan
diff --git a/dht-client.cabal b/dht-client.cabal
index 81453e38..849ebf28 100644
--- a/dht-client.cabal
+++ b/dht-client.cabal
@@ -118,7 +118,7 @@ library
                     Nesting
                     Paths
                     PeerResolve
-                    Server
+                    Connection.Tcp
                     SockAddr
                     TraversableT
                     UTmp
diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 527af7e7..4b38a7ea 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -99,7 +99,7 @@ import Presence
 import XMPPServer
 import Connection
 import ToxToXMPP
-import qualified Server (ConnectionEvent(..))
+import qualified Connection.Tcp (ConnectionEvent(..))
 
 
 showReport :: [(String,String)] -> String
@@ -987,7 +987,7 @@ noArgPing :: (x -> IO (Maybe r)) -> [String] -> x -> IO (Maybe r)
 noArgPing f [] x = f x
 noArgPing _ _  _ = return Nothing
 
-announceToxConnection :: TChan ((ConnectionKey,SockAddr), Server.ConnectionEvent XML.Event)
+announceToxConnection :: TChan ((ConnectionKey,SockAddr), Connection.Tcp.ConnectionEvent XML.Event)
                       -> SockAddr
                       -> SockAddr
                       -> STM Bool
@@ -997,7 +997,7 @@ announceToxConnection :: TChan ((ConnectionKey,SockAddr), Server.ConnectionEvent
 announceToxConnection echan laddr saddr pingflag tsrc tsnk
     = atomically $ writeTChan echan
         ( (PeerKey saddr, laddr )
-        , Server.Connection pingflag xsrc xsnk )
+        , Connection.Tcp.Connection pingflag xsrc xsnk )
  where
     xsrc = tsrc =$= toxToXmpp
     xsnk = flushPassThrough xmppToTox =$= tsnk
diff --git a/simplechat.hs b/simplechat.hs
index bf592db3..84b33e13 100644
--- a/simplechat.hs
+++ b/simplechat.hs
@@ -16,7 +16,7 @@ import Control.Concurrent (forkIO)
 import Control.Concurrent.Chan
 import Data.HList
 
-import Server
+import Connection.Tcp
 
 
 startCon socket st  = do
diff --git a/test-server.hs b/test-server.hs
index 795a8190..b47a4bcb 100644
--- a/test-server.hs
+++ b/test-server.hs
@@ -5,7 +5,7 @@ import Debug.Trace
 import Control.Exception (evaluate) -- ,handle,SomeException(..),bracketOnError)
 import Control.Exception ({-evaluate,-}handle,SomeException(..),bracketOnError,ErrorCall(..))
 import System.IO.Error (ioeGetErrorType)
-import Server
+import Connection.Tcp
 import Control.Monad
 import Control.Monad.Trans.Resource
 import Control.Monad.IO.Class