diff --git a/MANIFEST.in b/MANIFEST.in
index 7c37e1258..f6d605773 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,6 @@
-include LICENCE
+include LICENSE
 include README
+include INSTALL
 recursive-include glade/ *.glade
 recursive-include include/ *.hpp *.ipp
 recursive-include pixmaps/ *.png *.svg *.xpm
diff --git a/setup.py b/setup.py
index fe3cc4b00..02deb11bb 100644
--- a/setup.py
+++ b/setup.py
@@ -31,9 +31,6 @@ for removal in removals:
 for addition in additions:
 	cv["OPT"] = cv["OPT"] + " " + addition
 
-
-
-
 import platform, os
 
 pythonVersion = platform.python_version()[0:3]
@@ -82,15 +79,16 @@ deluge_core = Extension('deluge_core',
 										 'cpp/kademlia/traversal_algorithm.cpp'])
 
 
-setup(name="deluge", fullname="Deluge Bittorrent Client", version="0.5.0",
+setup(name="deluge", fullname="Deluge BitTorrent Client", version="0.5.0",
 	author="Zach Tibbitts, Alon Zakai",
 	author_email="zach@collegegeek.org, kripkensteiner@gmail.com",
 	description="A bittorrent client written in PyGTK",
 	url="http://deluge-torrent.org",
 	license="GPLv2",
 	scripts=["scripts/deluge"],
-	py_modules=["deluge", "deluge_stats", "delugegtk", "dgtk", "dcommon", "delugeplugins"],
-	data_files=[("share/deluge/glade", ["glade/delugegtk.glade", "glade/dgtkpopups.glade", "glade/dgtkpref.glade"]),
-				("share/deluge/pixmaps", ["pixmaps/deluge32.png","pixmaps/deluge128.png"])],
+	packages=['deluge'],
+	package_dir = {'deluge': 'src'},
+	package_data={'deluge': ['glade/*.glade']},
+	ext_package='deluge',
 	ext_modules=[deluge_core]
 	)
diff --git a/dcommon.py b/src/dcommon.py
similarity index 100%
rename from dcommon.py
rename to src/dcommon.py
diff --git a/deluge.py b/src/deluge.py
similarity index 100%
rename from deluge.py
rename to src/deluge.py
diff --git a/deluge_stats.py b/src/deluge_stats.py
similarity index 100%
rename from deluge_stats.py
rename to src/deluge_stats.py
diff --git a/delugegtk.py b/src/delugegtk.py
similarity index 100%
rename from delugegtk.py
rename to src/delugegtk.py
diff --git a/delugeplugins.py b/src/delugeplugins.py
similarity index 100%
rename from delugeplugins.py
rename to src/delugeplugins.py
diff --git a/dgtk.py b/src/dgtk.py
similarity index 100%
rename from dgtk.py
rename to src/dgtk.py
diff --git a/test.py b/test.py
deleted file mode 100644
index 4ce23f329..000000000
--- a/test.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#/* 
-#Copyright: A. Zakai ('Kripken') <kripkensteiner@gmail.com> http://6thsenseless.blogspot.com
-#
-#2006-15-9
-#
-#This code is licensed under the terms of the GNU General Public License (GPL),
-#version 2 or above; See /usr/share/common-licenses/GPL , or see
-#http://www.fsf.org/licensing/licenses/gpl.html
-#*/
-
-
-import deluge
-from   time    import sleep
-import os
-
-manager = deluge.Manager("DL", "0500", "deluge - testing only",
-									 os.path.expanduser("~") + "/Temp")# blank_slate=True)
-
-#manager.set_pref('max_upload_rate', 6*1024)
-
-##my_torrent = manager.add_torrent("ubuntu.iso.torrent", ".", True)
-
-##print "Unique ID:", my_torrent
-
-print "PREFS:", manager.prefs
-
-try:
-	while True:
-		print "STATE:", manager.get_state()
-		print "# torrents:", manager.get_num_torrents()
-		for unique_ID in manager.get_unique_IDs():
-			state =  manager.get_torrent_state(unique_ID)
-			for key in state.keys():
-				print key, state[key]
-		manager.handle_events()
-		print ""
-		sleep(2)
-except KeyboardInterrupt:
-	print "Shutting down..."
-	manager.quit()