diff --git a/src/Network/XMPP/IM.hs b/src/Network/XMPP/IM.hs
new file mode 100644
index 0000000..86d4888
--- /dev/null
+++ b/src/Network/XMPP/IM.hs
@@ -0,0 +1,74 @@
+module Network.XMPP.IM where
+
+import Data.Text(Text)
+import Network.XMPP.Types
+
+-- | An empty presence.
+presence :: Presence
+presence = Presence { presenceID       = Nothing
+                    , presenceFrom     = Nothing
+                    , presenceTo       = Nothing
+                    , presenceLangTag  = Nothing
+                    , presenceType     = Nothing
+                    , presencePayload  = []
+                    }
+
+-- | Request subscription with an entity.
+presenceSubscribe :: JID -> Presence
+presenceSubscribe to = presence { presenceTo = Just to
+                                , presenceType = Just Subscribe
+                                }
+
+-- | Is presence a subscription request?
+isPresenceSubscribe :: Presence -> Bool
+isPresenceSubscribe pres = presenceType pres == (Just Subscribe)
+
+-- | Approve a subscripton of an entity.
+presenceSubscribed :: JID -> Presence
+presenceSubscribed to = presence { presenceTo = Just to
+                                 , presenceType = Just Subscribed
+                                 }
+
+-- | Is presence a subscription approval?
+isPresenceSubscribed :: Presence -> Bool
+isPresenceSubscribed pres = presenceType pres == (Just Subscribed)
+
+-- | End a subscription with an entity.
+presenceUnsubscribe :: JID -> Presence
+presenceUnsubscribe to = presence { presenceTo = Just to
+                                  , presenceType = Just Unsubscribed
+                                  }
+
+-- | Is presence an unsubscription request?
+isPresenceUnsubscribe :: Presence -> Bool
+isPresenceUnsubscribe pres = presenceType pres == (Just Unsubscribe)
+
+-- | Signal to the server that the client is available for communication.
+presenceOnline :: Presence
+presenceOnline = presence
+
+-- | Signal to the server that the client is no longer available for
+-- communication.
+presenceOffline :: Presence
+presenceOffline = presence {presenceType = Just Unavailable}
+
+---- Change your status
+--status
+--  :: Maybe Text     -- ^ Status message
+--  -> Maybe ShowType -- ^ Status Type
+--  -> Maybe Int      -- ^ Priority
+--  -> Presence
+--status txt showType prio = presence { presenceShowType = showType
+--                                    , presencePriority = prio
+--                                    , presenceStatus   = txt
+--                                    }
+
+-- | Set the current availability status. This implicitly sets the client's
+-- status online.
+--presenceAvail :: ShowType -> Presence
+--presenceAvail showType = status Nothing (Just showType) Nothing
+
+-- | 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
diff --git a/src/Network/XMPP/Presence.hs b/src/Network/XMPP/Presence.hs
index e0295d3..9d486c2 100644
--- a/src/Network/XMPP/Presence.hs
+++ b/src/Network/XMPP/Presence.hs
@@ -5,76 +5,6 @@ module Network.XMPP.Presence where
 import Data.Text(Text)
 import Network.XMPP.Types
 
--- | An empty presence.
-presence :: Presence
-presence = Presence { presenceID       = Nothing
-                    , presenceFrom     = Nothing
-                    , presenceTo       = Nothing
-                    , presenceLangTag  = Nothing
-                    , presenceType     = Nothing
-                    , presencePayload  = []
-                    }
-
--- | Request subscription with an entity.
-presenceSubscribe :: JID -> Presence
-presenceSubscribe to = presence { presenceTo = Just to
-                                , presenceType = Just Subscribe
-                                }
-
--- | Is presence a subscription request?
-isPresenceSubscribe :: Presence -> Bool
-isPresenceSubscribe pres = presenceType pres == (Just Subscribe)
-
--- | Approve a subscripton of an entity.
-presenceSubscribed :: JID -> Presence
-presenceSubscribed to = presence { presenceTo = Just to
-                                 , presenceType = Just Subscribed
-                                 }
-
--- | Is presence a subscription approval?
-isPresenceSubscribed :: Presence -> Bool
-isPresenceSubscribed pres = presenceType pres == (Just Subscribed)
-
--- | End a subscription with an entity.
-presenceUnsubscribe :: JID -> Presence
-presenceUnsubscribe to = presence { presenceTo = Just to
-                                  , presenceType = Just Unsubscribed
-                                  }
-
--- | Is presence an unsubscription request?
-isPresenceUnsubscribe :: Presence -> Bool
-isPresenceUnsubscribe pres = presenceType pres == (Just Unsubscribe)
-
--- | Signal to the server that the client is available for communication.
-presenceOnline :: Presence
-presenceOnline = presence
-
--- | Signal to the server that the client is no longer available for
--- communication.
-presenceOffline :: Presence
-presenceOffline = presence {presenceType = Just Unavailable}
-
----- Change your status
---status
---  :: Maybe Text     -- ^ Status message
---  -> Maybe ShowType -- ^ Status Type
---  -> Maybe Int      -- ^ Priority
---  -> Presence
---status txt showType prio = presence { presenceShowType = showType
---                                    , presencePriority = prio
---                                    , presenceStatus   = txt
---                                    }
-
--- | Set the current availability status. This implicitly sets the client's
--- status online.
---presenceAvail :: ShowType -> Presence
---presenceAvail showType = status Nothing (Just showType) Nothing
-
--- | Set the current status message. This implicitly sets the client's status
--- online.
---presenceMessage :: Text -> Presence
---presenceMessage txt = status (Just txt) Nothing Nothing
-
 -- | Add a recipient to a presence notification.
 presTo :: Presence -> JID -> Presence
 presTo pres to = pres{presenceTo = Just to}
\ No newline at end of file