diff --git a/.hsproject b/.hsproject
index 95dc96d..e69de29 100644
--- a/.hsproject
+++ b/.hsproject
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<haskellProject>
-  <sourcePath path="Source"/>
-<compiler>ghcCompiler</compiler></haskellProject>
diff --git a/.project b/.project
index 90af380..8477522 100644
--- a/.project
+++ b/.project
@@ -5,6 +5,26 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>net.sf.eclipsefp.haskell.core.partitioned.uuagc.UuagcBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>net.sf.eclipsefp.haskell.core.partitioned.happy.HappyBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>net.sf.eclipsefp.haskell.core.partitioned.alex.AlexBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>net.sf.eclipsefp.haskell.core.hlint.HLintBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>net.sf.eclipsefp.haskell.core.builder.HaskellBuilder</name>
 			<arguments>
diff --git a/Source/Examples/EchoClient.hs b/Examples/EchoClient.hs
similarity index 98%
rename from Source/Examples/EchoClient.hs
rename to Examples/EchoClient.hs
index a25dd24..966dd49 100644
--- a/Source/Examples/EchoClient.hs
+++ b/Examples/EchoClient.hs
@@ -21,7 +21,7 @@ userName = "pontarius"
 serverIdentifier = "jonkristensen.com"
 portNumber = 5222
 resource = "pontarius"
-password = "substrat44"
+password = ""
 
 
 -- The main function initializes Pontarius XMPP and specifies the (XMPPT)
diff --git a/Source/Network/XMPP.hs b/Network/XMPP.hs
similarity index 100%
rename from Source/Network/XMPP.hs
rename to Network/XMPP.hs
diff --git a/Source/Network/XMPP/Address.hs b/Network/XMPP/Address.hs
similarity index 100%
rename from Source/Network/XMPP/Address.hs
rename to Network/XMPP/Address.hs
diff --git a/Source/Network/XMPP/SASL.hs b/Network/XMPP/SASL.hs
similarity index 100%
rename from Source/Network/XMPP/SASL.hs
rename to Network/XMPP/SASL.hs
diff --git a/Source/Network/XMPP/Session.hs b/Network/XMPP/Session.hs
similarity index 100%
rename from Source/Network/XMPP/Session.hs
rename to Network/XMPP/Session.hs
diff --git a/Source/Network/XMPP/SessionOld.hs b/Network/XMPP/SessionOld.hs
similarity index 100%
rename from Source/Network/XMPP/SessionOld.hs
rename to Network/XMPP/SessionOld.hs
diff --git a/Source/Network/XMPP/Stanza.hs b/Network/XMPP/Stanza.hs
similarity index 100%
rename from Source/Network/XMPP/Stanza.hs
rename to Network/XMPP/Stanza.hs
diff --git a/Source/Network/XMPP/Stream.hs b/Network/XMPP/Stream.hs
similarity index 100%
rename from Source/Network/XMPP/Stream.hs
rename to Network/XMPP/Stream.hs
diff --git a/Source/Network/XMPP/TLS.hs b/Network/XMPP/TLS.hs
similarity index 100%
rename from Source/Network/XMPP/TLS.hs
rename to Network/XMPP/TLS.hs
diff --git a/Source/Network/XMPP/Types.hs b/Network/XMPP/Types.hs
similarity index 100%
rename from Source/Network/XMPP/Types.hs
rename to Network/XMPP/Types.hs
diff --git a/Source/Network/XMPP/Utilities.hs b/Network/XMPP/Utilities.hs
similarity index 100%
rename from Source/Network/XMPP/Utilities.hs
rename to Network/XMPP/Utilities.hs
diff --git a/pontarius-xmpp.cabal b/pontarius-xmpp.cabal
index f109526..639203a 100644
--- a/pontarius-xmpp.cabal
+++ b/pontarius-xmpp.cabal
@@ -25,7 +25,6 @@ Tested-With: GHC ==7.0.2
 -- Extra-Tmp-Files:
 
 Library
-  Exposed-Modules: Network.XMPP
   Exposed: True
   Build-Depends: base >= 2 && < 5, parsec, enumerator, crypto-api ==0.6.3,
                      base64-string, pureMD5, utf8-string, network, xml-types,
@@ -34,7 +33,7 @@ Library
                      stringprep, asn1-data, cryptohash ==0.7.0,
                      time, certificate, ranges, uuid
   -- Other-Modules:
-  HS-Source-Dirs: Source
+  -- HS-Source-Dirs:
   -- Extensions:
   -- Build-Tools:
   -- Buildable: