diff --git a/pontarius-xmpp.cabal b/pontarius-xmpp.cabal
index af700b9..ea1735b 100644
--- a/pontarius-xmpp.cabal
+++ b/pontarius-xmpp.cabal
@@ -61,7 +61,7 @@ Library
                  , Network.Xmpp.IM.Message
                  , Network.Xmpp.IM.Presence
                  , Network.Xmpp.Marshal
-                 , Network.Xmpp.Monad
+                 , Network.Xmpp.Connection
                  , Network.Xmpp.Message
                  , Network.Xmpp.Pickle
                  , Network.Xmpp.Presence
diff --git a/source/Network/Xmpp.hs b/source/Network/Xmpp.hs
index d5f2ea7..efc07bd 100644
--- a/source/Network/Xmpp.hs
+++ b/source/Network/Xmpp.hs
@@ -149,22 +149,22 @@ module Network.Xmpp
   , exampleParams
   ) where
 
-import           Data.XML.Types (Element)
+import Data.XML.Types (Element)
 
-import           Network.Xmpp.Bind
-import           Network.Xmpp.Concurrent
-import           Network.Xmpp.Concurrent.Channels
-import           Network.Xmpp.Concurrent.Types
-import           Network.Xmpp.Marshal
-import           Network.Xmpp.Message
-import           Network.Xmpp.Monad
-import           Network.Xmpp.Presence
-import           Network.Xmpp.Sasl
-import           Network.Xmpp.Session
+import Network.Xmpp.Bind
+import Network.Xmpp.Concurrent
+import Network.Xmpp.Concurrent.Channels
+import Network.Xmpp.Concurrent.Types
+import Network.Xmpp.Connection
+import Network.Xmpp.Marshal
+import Network.Xmpp.Message
+import Network.Xmpp.Presence
+import Network.Xmpp.Sasl
+import Network.Xmpp.Session
 -- import           Network.Xmpp.Session
-import           Network.Xmpp.Stream
-import           Network.Xmpp.TLS
-import           Network.Xmpp.Types
+import Network.Xmpp.Stream
+import Network.Xmpp.TLS
+import Network.Xmpp.Types
 
 
 -- -- Sends the session IQ set element and waits for an answer. Throws an error if
diff --git a/source/Network/Xmpp/Basic.hs b/source/Network/Xmpp/Basic.hs
index c6fe2b0..be2de9d 100644
--- a/source/Network/Xmpp/Basic.hs
+++ b/source/Network/Xmpp/Basic.hs
@@ -16,9 +16,9 @@ module Network.Xmpp.Basic
 
        where
 
-import Network.Xmpp.Monad
+import Network.Xmpp.Connection
 import Network.Xmpp.Sasl
+import Network.Xmpp.Session
 import Network.Xmpp.Stream
 import Network.Xmpp.TLS
 import Network.Xmpp.Types
-import Network.Xmpp.Session
diff --git a/source/Network/Xmpp/Bind.hs b/source/Network/Xmpp/Bind.hs
index 5f9d45e..ef9c624 100644
--- a/source/Network/Xmpp/Bind.hs
+++ b/source/Network/Xmpp/Bind.hs
@@ -11,9 +11,9 @@ import Data.Text as Text
 import Data.XML.Pickle
 import Data.XML.Types
 
-import Network.Xmpp.Types
+import Network.Xmpp.Connection
 import Network.Xmpp.Pickle
-import Network.Xmpp.Monad
+import Network.Xmpp.Types
 
 import Control.Monad.State(modify)
 
diff --git a/source/Network/Xmpp/Concurrent/Monad.hs b/source/Network/Xmpp/Concurrent/Monad.hs
index 2f17ea9..b52571c 100644
--- a/source/Network/Xmpp/Concurrent/Monad.hs
+++ b/source/Network/Xmpp/Concurrent/Monad.hs
@@ -18,7 +18,7 @@ import qualified Data.Map as Map
 import           Data.Text(Text)
 
 import           Network.Xmpp.Concurrent.Types
-import           Network.Xmpp.Monad
+import           Network.Xmpp.Connection
 
 
 
diff --git a/source/Network/Xmpp/Concurrent/Threads.hs b/source/Network/Xmpp/Concurrent/Threads.hs
index 64c7c2f..6d8534e 100644
--- a/source/Network/Xmpp/Concurrent/Threads.hs
+++ b/source/Network/Xmpp/Concurrent/Threads.hs
@@ -4,21 +4,21 @@
 
 module Network.Xmpp.Concurrent.Threads where
 
-import Network.Xmpp.Types
+import           Network.Xmpp.Types
 
-import Control.Applicative((<$>))
-import Control.Concurrent
-import Control.Concurrent.STM
+import           Control.Applicative((<$>))
+import           Control.Concurrent
+import           Control.Concurrent.STM
 import qualified Control.Exception.Lifted as Ex
-import Control.Monad
-import Control.Monad.IO.Class
-import Control.Monad.State.Strict
+import           Control.Monad
+import           Control.Monad.IO.Class
+import           Control.Monad.State.Strict
 
 import qualified Data.ByteString as BS
-import Network.Xmpp.Monad
-import Network.Xmpp.Concurrent.Types
+import           Network.Xmpp.Concurrent.Types
+import           Network.Xmpp.Connection
 
-import GHC.IO (unsafeUnmask)
+import           GHC.IO (unsafeUnmask)
 
 -- Worker to read stanzas from the stream and concurrently distribute them to
 -- all listener threads.
diff --git a/source/Network/Xmpp/Monad.hs b/source/Network/Xmpp/Connection.hs
similarity index 99%
rename from source/Network/Xmpp/Monad.hs
rename to source/Network/Xmpp/Connection.hs
index e2cea4e..d96aae5 100644
--- a/source/Network/Xmpp/Monad.hs
+++ b/source/Network/Xmpp/Connection.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE OverloadedStrings #-}
 
-module Network.Xmpp.Monad where
+module Network.Xmpp.Connection where
 
 import           Control.Applicative((<$>))
 import           Control.Concurrent (forkIO, threadDelay)
diff --git a/source/Network/Xmpp/IM/Presence.hs b/source/Network/Xmpp/IM/Presence.hs
index c586a1f..512da70 100644
--- a/source/Network/Xmpp/IM/Presence.hs
+++ b/source/Network/Xmpp/IM/Presence.hs
@@ -73,4 +73,4 @@ presenceOffline = presence {presenceType = Just Unavailable}
 -- | Set the current status message. This implicitly sets the client's status
 -- online.
 --presenceMessage :: Text -> Presence
---presenceMessage txt = status (Just txt) Nothing Nothing
\ No newline at end of file
+--presenceMessage txt = status (Just txt) Nothing Nothing
diff --git a/source/Network/Xmpp/Sasl.hs b/source/Network/Xmpp/Sasl.hs
index 5f79247..bc809c5 100644
--- a/source/Network/Xmpp/Sasl.hs
+++ b/source/Network/Xmpp/Sasl.hs
@@ -29,15 +29,15 @@ import qualified Data.Text as Text
 import           Data.Text (Text)
 import qualified Data.Text.Encoding as Text
 
-import           Network.Xmpp.Monad
+import           Network.Xmpp.Connection
+import           Network.Xmpp.Pickle
 import           Network.Xmpp.Stream
 import           Network.Xmpp.Types
-import           Network.Xmpp.Pickle
 
 import qualified System.Random as Random
 
-import Network.Xmpp.Sasl.Types
-import Network.Xmpp.Sasl.Mechanisms
+import           Network.Xmpp.Sasl.Types
+import           Network.Xmpp.Sasl.Mechanisms
 
 -- | Uses the first supported mechanism to authenticate, if any. Updates the
 -- state with non-password credentials and restarts the stream upon
diff --git a/source/Network/Xmpp/Sasl/Common.hs b/source/Network/Xmpp/Sasl/Common.hs
index 23c3bb7..7b71630 100644
--- a/source/Network/Xmpp/Sasl/Common.hs
+++ b/source/Network/Xmpp/Sasl/Common.hs
@@ -22,10 +22,10 @@ import           Data.Word (Word8)
 import           Data.XML.Pickle
 import           Data.XML.Types
 
-import           Network.Xmpp.Monad
+import           Network.Xmpp.Connection
 import           Network.Xmpp.Pickle
-import           Network.Xmpp.Sasl.Types
 import           Network.Xmpp.Sasl.StringPrep
+import           Network.Xmpp.Sasl.Types
 
 import qualified System.Random as Random
 
diff --git a/source/Network/Xmpp/Sasl/Mechanisms/DigestMd5.hs b/source/Network/Xmpp/Sasl/Mechanisms/DigestMd5.hs
index 229f5b0..806b13a 100644
--- a/source/Network/Xmpp/Sasl/Mechanisms/DigestMd5.hs
+++ b/source/Network/Xmpp/Sasl/Mechanisms/DigestMd5.hs
@@ -31,7 +31,7 @@ import qualified Data.ByteString as BS
 
 import           Data.XML.Types
 
-import           Network.Xmpp.Monad
+import           Network.Xmpp.Connection
 import           Network.Xmpp.Pickle
 import           Network.Xmpp.Stream
 import           Network.Xmpp.Types
diff --git a/source/Network/Xmpp/Sasl/Mechanisms/Plain.hs b/source/Network/Xmpp/Sasl/Mechanisms/Plain.hs
index 8f1ed25..8ac5484 100644
--- a/source/Network/Xmpp/Sasl/Mechanisms/Plain.hs
+++ b/source/Network/Xmpp/Sasl/Mechanisms/Plain.hs
@@ -29,24 +29,24 @@ import qualified Data.Text as Text
 import           Data.Text (Text)
 import qualified Data.Text.Encoding as Text
 
-import Data.XML.Pickle
+import           Data.XML.Pickle
 
 import qualified Data.ByteString as BS
 
-import Data.XML.Types
+import           Data.XML.Types
 
-import           Network.Xmpp.Monad
+import           Network.Xmpp.Connection
+import           Network.Xmpp.Pickle
 import           Network.Xmpp.Stream
 import           Network.Xmpp.Types
-import           Network.Xmpp.Pickle
 
 import qualified System.Random as Random
 
-import Data.Maybe (fromMaybe)
+import           Data.Maybe (fromMaybe)
 import qualified Data.Text as Text
 
-import Network.Xmpp.Sasl.Common
-import Network.Xmpp.Sasl.Types
+import           Network.Xmpp.Sasl.Common
+import           Network.Xmpp.Sasl.Types
 
 -- TODO: stringprep
 xmppPlain :: Text.Text -- ^ Password
@@ -79,4 +79,4 @@ plain :: Text.Text -- ^ authentication ID (username)
       -> Maybe Text.Text -- ^ authorization ID
       -> Text.Text -- ^ password
       -> SaslHandler
-plain authcid authzid passwd = ("PLAIN", xmppPlain authcid authzid passwd)
\ No newline at end of file
+plain authcid authzid passwd = ("PLAIN", xmppPlain authcid authzid passwd)
diff --git a/source/Network/Xmpp/Session.hs b/source/Network/Xmpp/Session.hs
index 8e84ad2..39c0fa5 100644
--- a/source/Network/Xmpp/Session.hs
+++ b/source/Network/Xmpp/Session.hs
@@ -6,19 +6,19 @@ import           Control.Monad.Error
 import           Data.Text as Text
 import           Data.XML.Pickle
 import           Data.XML.Types(Element)
+import           Network
 import qualified Network.TLS as TLS
 import           Network.Xmpp.Bind
 import           Network.Xmpp.Concurrent.Types
+import           Network.Xmpp.Connection
 import           Network.Xmpp.Marshal
-import           Network.Xmpp.Monad
 import           Network.Xmpp.Pickle
 import           Network.Xmpp.Sasl
 import           Network.Xmpp.Sasl.Mechanisms
 import           Network.Xmpp.Sasl.Types
 import           Network.Xmpp.Stream
-import           Network.Xmpp.Types
-import           Network
 import           Network.Xmpp.TLS
+import           Network.Xmpp.Types
 
 -- | The quick and easy way to set up a connection to an XMPP server
 --
diff --git a/source/Network/Xmpp/Stream.hs b/source/Network/Xmpp/Stream.hs
index 6f8dd5e..1e70320 100644
--- a/source/Network/Xmpp/Stream.hs
+++ b/source/Network/Xmpp/Stream.hs
@@ -19,10 +19,10 @@ import           Data.Void (Void)
 import           Data.XML.Pickle
 import           Data.XML.Types
 
-import           Network.Xmpp.Monad
+import           Network.Xmpp.Connection
+import           Network.Xmpp.Errors
 import           Network.Xmpp.Pickle
 import           Network.Xmpp.Types
-import           Network.Xmpp.Errors
 
 import           Text.XML.Stream.Elements
 import           Text.XML.Stream.Parse as XP
diff --git a/source/Network/Xmpp/TLS.hs b/source/Network/Xmpp/TLS.hs
index 26bbe6a..161dc90 100644
--- a/source/Network/Xmpp/TLS.hs
+++ b/source/Network/Xmpp/TLS.hs
@@ -17,7 +17,7 @@ import           Data.Conduit.TLS as TLS
 import           Data.Typeable
 import           Data.XML.Types
 
-import           Network.Xmpp.Monad
+import           Network.Xmpp.Connection
 import           Network.Xmpp.Pickle(ppElement)
 import           Network.Xmpp.Stream
 import           Network.Xmpp.Types
diff --git a/source/Network/Xmpp/Utilities.hs b/source/Network/Xmpp/Utilities.hs
index 9326ace..11441a8 100644
--- a/source/Network/Xmpp/Utilities.hs
+++ b/source/Network/Xmpp/Utilities.hs
@@ -51,4 +51,4 @@ idGenerator prefix = atomically $ do
 
 -- Constructs a "Version" based on the major and minor version numbers.
 versionFromNumbers :: Integer -> Integer -> Version
-versionFromNumbers major minor = Version major minor
\ No newline at end of file
+versionFromNumbers major minor = Version major minor
diff --git a/source/Network/Xmpp/Xep/InbandRegistration.hs b/source/Network/Xmpp/Xep/InbandRegistration.hs
index fc2f0f2..4641f37 100644
--- a/source/Network/Xmpp/Xep/InbandRegistration.hs
+++ b/source/Network/Xmpp/Xep/InbandRegistration.hs
@@ -19,7 +19,7 @@ import qualified Data.Text as Text
 import           Data.XML.Pickle
 import qualified Data.XML.Types as XML
 
-import           Network.Xmpp.Monad
+import           Network.Xmpp.Connection
 import           Network.Xmpp.Pickle
 import           Network.Xmpp.Types
 import           Network.Xmpp.Xep.ServiceDiscovery
@@ -201,4 +201,4 @@ instance Read Field where
 
 
 -- Registered
--- Instructions
\ No newline at end of file
+-- Instructions
diff --git a/source/Network/Xmpp/Xep/ServiceDiscovery.hs b/source/Network/Xmpp/Xep/ServiceDiscovery.hs
index d637107..a85fee4 100644
--- a/source/Network/Xmpp/Xep/ServiceDiscovery.hs
+++ b/source/Network/Xmpp/Xep/ServiceDiscovery.hs
@@ -25,12 +25,12 @@ import           Data.XML.Pickle
 import           Data.XML.Types
 
 import           Network.Xmpp
-import           Network.Xmpp.Monad
-import           Network.Xmpp.Pickle
-import           Network.Xmpp.Types
 import           Network.Xmpp.Concurrent
-import           Network.Xmpp.Concurrent.Types
 import           Network.Xmpp.Concurrent.Channels
+import           Network.Xmpp.Concurrent.Types
+import           Network.Xmpp.Connection
+import           Network.Xmpp.Pickle
+import           Network.Xmpp.Types
 
 data DiscoError = DiscoNoQueryElement
                 | DiscoIQError IQError