diff --git a/pontarius.cabal b/pontarius.cabal
index 09aaf57..e823f1c 100644
--- a/pontarius.cabal
+++ b/pontarius.cabal
@@ -22,7 +22,7 @@ Tested-With: GHC == 7.4.1
 -- Extra-Tmp-Files:
 
 Library
-  hs-source-dirs: src
+  hs-source-dirs: source
   Exposed: True
   Build-Depends: base          >4 && <5
                , conduit           -any
@@ -50,29 +50,6 @@ Library
                , xml-types-pickle  -any
                , data-default      -any
                , stringprep        >= 0.1.5
-  Exposed-modules: Network.XMPP
-                 , Network.XMPP.Bind
-                 , Network.XMPP.Concurrent
-                 , Network.XMPP.IM
-                 , Network.XMPP.Marshal
-                 , Network.XMPP.Monad
-                 , Network.XMPP.Message
-                 , Network.XMPP.Pickle
-                 , Network.XMPP.Presence
-                 , Network.XMPP.SASL
-                 , Network.XMPP.Session
-                 , Network.XMPP.Stream
-                 , Network.XMPP.TLS
-                 , Network.XMPP.Types
-  Other-modules:   
-                 Network.XMPP.JID
-                 , Network.XMPP.Concurrent.Types
-                 , Network.XMPP.Concurrent.IQ
-                 , Network.XMPP.Concurrent.Threads
-                 , Network.XMPP.Concurrent.Monad
-                 , Text.XML.Stream.Elements
-                 , Data.Conduit.BufferedSource
-                 , Data.Conduit.TLS
   GHC-Options: -Wall
 
 
diff --git a/src/Data/Conduit/BufferedSource.hs b/source/Data/Conduit/BufferedSource.hs
similarity index 100%
rename from src/Data/Conduit/BufferedSource.hs
rename to source/Data/Conduit/BufferedSource.hs
diff --git a/src/Data/Conduit/TLS.hs b/source/Data/Conduit/TLS.hs
similarity index 100%
rename from src/Data/Conduit/TLS.hs
rename to source/Data/Conduit/TLS.hs
diff --git a/src/Example.hs b/source/Example.hs
similarity index 100%
rename from src/Example.hs
rename to source/Example.hs
diff --git a/src/Network/XMPP.hs b/source/Network/XMPP.hs
similarity index 100%
rename from src/Network/XMPP.hs
rename to source/Network/XMPP.hs
diff --git a/src/Network/XMPP/Bind.hs b/source/Network/XMPP/Bind.hs
similarity index 100%
rename from src/Network/XMPP/Bind.hs
rename to source/Network/XMPP/Bind.hs
diff --git a/src/Network/XMPP/Concurrent.hs b/source/Network/XMPP/Concurrent.hs
similarity index 100%
rename from src/Network/XMPP/Concurrent.hs
rename to source/Network/XMPP/Concurrent.hs
diff --git a/src/Network/XMPP/Concurrent/IQ.hs b/source/Network/XMPP/Concurrent/IQ.hs
similarity index 100%
rename from src/Network/XMPP/Concurrent/IQ.hs
rename to source/Network/XMPP/Concurrent/IQ.hs
diff --git a/src/Network/XMPP/Concurrent/Monad.hs b/source/Network/XMPP/Concurrent/Monad.hs
similarity index 100%
rename from src/Network/XMPP/Concurrent/Monad.hs
rename to source/Network/XMPP/Concurrent/Monad.hs
diff --git a/src/Network/XMPP/Concurrent/Threads.hs b/source/Network/XMPP/Concurrent/Threads.hs
similarity index 100%
rename from src/Network/XMPP/Concurrent/Threads.hs
rename to source/Network/XMPP/Concurrent/Threads.hs
diff --git a/src/Network/XMPP/Concurrent/Types.hs b/source/Network/XMPP/Concurrent/Types.hs
similarity index 100%
rename from src/Network/XMPP/Concurrent/Types.hs
rename to source/Network/XMPP/Concurrent/Types.hs
diff --git a/src/Network/XMPP/IM.hs b/source/Network/XMPP/IM.hs
similarity index 100%
rename from src/Network/XMPP/IM.hs
rename to source/Network/XMPP/IM.hs
diff --git a/src/Network/XMPP/IM/Message.hs b/source/Network/XMPP/IM/Message.hs
similarity index 100%
rename from src/Network/XMPP/IM/Message.hs
rename to source/Network/XMPP/IM/Message.hs
diff --git a/src/Network/XMPP/IM/Presence.hs b/source/Network/XMPP/IM/Presence.hs
similarity index 100%
rename from src/Network/XMPP/IM/Presence.hs
rename to source/Network/XMPP/IM/Presence.hs
diff --git a/src/Network/XMPP/JID.hs b/source/Network/XMPP/JID.hs
similarity index 100%
rename from src/Network/XMPP/JID.hs
rename to source/Network/XMPP/JID.hs
diff --git a/src/Network/XMPP/Marshal.hs b/source/Network/XMPP/Marshal.hs
similarity index 100%
rename from src/Network/XMPP/Marshal.hs
rename to source/Network/XMPP/Marshal.hs
diff --git a/src/Network/XMPP/Message.hs b/source/Network/XMPP/Message.hs
similarity index 100%
rename from src/Network/XMPP/Message.hs
rename to source/Network/XMPP/Message.hs
diff --git a/src/Network/XMPP/Monad.hs b/source/Network/XMPP/Monad.hs
similarity index 100%
rename from src/Network/XMPP/Monad.hs
rename to source/Network/XMPP/Monad.hs
diff --git a/src/Network/XMPP/Pickle.hs b/source/Network/XMPP/Pickle.hs
similarity index 100%
rename from src/Network/XMPP/Pickle.hs
rename to source/Network/XMPP/Pickle.hs
diff --git a/src/Network/XMPP/Presence.hs b/source/Network/XMPP/Presence.hs
similarity index 100%
rename from src/Network/XMPP/Presence.hs
rename to source/Network/XMPP/Presence.hs
diff --git a/src/Network/XMPP/SASL.hs b/source/Network/XMPP/SASL.hs
similarity index 100%
rename from src/Network/XMPP/SASL.hs
rename to source/Network/XMPP/SASL.hs
diff --git a/src/Network/XMPP/Session.hs b/source/Network/XMPP/Session.hs
similarity index 100%
rename from src/Network/XMPP/Session.hs
rename to source/Network/XMPP/Session.hs
diff --git a/src/Network/XMPP/Stream.hs b/source/Network/XMPP/Stream.hs
similarity index 100%
rename from src/Network/XMPP/Stream.hs
rename to source/Network/XMPP/Stream.hs
diff --git a/src/Network/XMPP/TLS.hs b/source/Network/XMPP/TLS.hs
similarity index 100%
rename from src/Network/XMPP/TLS.hs
rename to source/Network/XMPP/TLS.hs
diff --git a/src/Network/XMPP/Types.hs b/source/Network/XMPP/Types.hs
similarity index 100%
rename from src/Network/XMPP/Types.hs
rename to source/Network/XMPP/Types.hs
diff --git a/src/Network/XMPP/Utilities.hs b/source/Network/XMPP/Utilities.hs
similarity index 100%
rename from src/Network/XMPP/Utilities.hs
rename to source/Network/XMPP/Utilities.hs
diff --git a/src/Tests.hs b/source/Tests.hs
similarity index 100%
rename from src/Tests.hs
rename to source/Tests.hs
diff --git a/src/Text/XML/Stream/Elements.hs b/source/Text/XML/Stream/Elements.hs
similarity index 100%
rename from src/Text/XML/Stream/Elements.hs
rename to source/Text/XML/Stream/Elements.hs
diff --git a/src/Utils.hs b/source/Utils.hs
similarity index 100%
rename from src/Utils.hs
rename to source/Utils.hs