diff --git a/dusken/dusken/__init__.py b/dusken/__init__.py
similarity index 100%
rename from dusken/dusken/__init__.py
rename to dusken/__init__.py
diff --git a/dusken/main/admin.py b/dusken/admin.py
similarity index 92%
rename from dusken/main/admin.py
rename to dusken/admin.py
index ac6b13b..958a432 100644
--- a/dusken/main/admin.py
+++ b/dusken/admin.py
@@ -1,5 +1,5 @@
 from django.contrib import admin
-from main.models import Member
+from dusken.models import Member
 
 class MemberAdmin(admin.ModelAdmin):
     fieldsets = [
diff --git a/dusken/main/__init__.py b/dusken/api/__init__.py
similarity index 100%
rename from dusken/main/__init__.py
rename to dusken/api/__init__.py
diff --git a/dusken/main/api/group.py b/dusken/api/group.py
similarity index 93%
rename from dusken/main/api/group.py
rename to dusken/api/group.py
index 8d5c0c3..83572ad 100644
--- a/dusken/main/api/group.py
+++ b/dusken/api/group.py
@@ -1,6 +1,6 @@
 from tastypie.authorization import Authorization
 from tastypie.resources import ModelResource, ALL
-from main.models import Group
+from dusken.models import Group
 
 
 class GroupResource(ModelResource):
diff --git a/dusken/main/api/groupmembership.py b/dusken/api/groupmembership.py
similarity index 100%
rename from dusken/main/api/groupmembership.py
rename to dusken/api/groupmembership.py
diff --git a/dusken/main/api/groupsbymember.py b/dusken/api/groupsbymember.py
similarity index 98%
rename from dusken/main/api/groupsbymember.py
rename to dusken/api/groupsbymember.py
index e13e2ca..701d2de 100644
--- a/dusken/main/api/groupsbymember.py
+++ b/dusken/api/groupsbymember.py
@@ -2,7 +2,7 @@ from tastypie import fields
 from tastypie.authorization import Authorization
 from tastypie.bundle import Bundle
 from tastypie.resources import Resource
-from main.models import Member, Group
+from dusken.models import Member, Group
 
 class GroupsByMemberObject(object):
     def __init__(self):
diff --git a/dusken/main/api/member.py b/dusken/api/member.py
similarity index 98%
rename from dusken/main/api/member.py
rename to dusken/api/member.py
index 53b891f..939ee6d 100644
--- a/dusken/main/api/member.py
+++ b/dusken/api/member.py
@@ -4,7 +4,7 @@ from tastypie.authorization import Authorization
 from tastypie.exceptions import ImmediateHttpResponse
 from tastypie.http import HttpForbidden
 from tastypie.resources import ModelResource, ALL
-from main.models import *
+from dusken.models import *
 
 
 class MemberResource(ModelResource):
diff --git a/dusken/main/api/membersbygroup.py b/dusken/api/membersbygroup.py
similarity index 98%
rename from dusken/main/api/membersbygroup.py
rename to dusken/api/membersbygroup.py
index ae06e3a..e2867f1 100644
--- a/dusken/main/api/membersbygroup.py
+++ b/dusken/api/membersbygroup.py
@@ -2,7 +2,7 @@ from tastypie import fields
 from tastypie.authorization import Authorization
 from tastypie.bundle import Bundle
 from tastypie.resources import Resource
-from main.models import Member, Group
+from dusken.models import Member, Group
 
 class MembersByGroupObject(object):
     def __init__(self):
diff --git a/dusken/main/api/membership.py b/dusken/api/membership.py
similarity index 93%
rename from dusken/main/api/membership.py
rename to dusken/api/membership.py
index db0d53a..9550461 100644
--- a/dusken/main/api/membership.py
+++ b/dusken/api/membership.py
@@ -1,8 +1,8 @@
 from tastypie import fields
 from tastypie.resources import ModelResource, ALL, ALL_WITH_RELATIONS
 from tastypie.authorization import Authorization
-from main.api.member import MemberResource
-from main.models import *
+from dusken.api.member import MemberResource
+from dusken.models import *
 
 
 class MembershipResource(ModelResource):
diff --git a/dusken/dusken/urls.py b/dusken/dusken/urls.py
deleted file mode 100644
index d8070ce..0000000
--- a/dusken/dusken/urls.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from django.conf.urls import patterns, include, url
-from django.contrib import admin
-admin.autodiscover()
-
-urlpatterns = patterns('',
-    url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    url(r'^admin/', include(admin.site.urls)),
-
-    url(r'^', include('main.urls')),
-)
diff --git a/dusken/main/tests/support/__init__.py b/dusken/main/tests/support/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/dusken/main/urls.py b/dusken/main/urls.py
deleted file mode 100644
index 58b5c8d..0000000
--- a/dusken/main/urls.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from django.conf.urls.defaults import *
-from tastypie.api import Api
-from main.api.member import MemberResource
-from main.api.membership import MembershipResource
-from main.api.group import GroupResource
-from main.api.groupsbymember import GroupsByMemberResource
-from main.api.membersbygroup import MembersByGroupResource
-
-v1_api = Api(api_name='v1')
-v1_api.register(MemberResource())
-v1_api.register(MembershipResource())
-v1_api.register(GroupResource())
-v1_api.register(GroupsByMemberResource())
-v1_api.register(MembersByGroupResource())
-
-urlpatterns = patterns('',
-    (r'^api/', include(v1_api.urls)),
-)
diff --git a/dusken/main/models.py b/dusken/models.py
similarity index 100%
rename from dusken/main/models.py
rename to dusken/models.py
diff --git a/dusken/dusken/settings-sample.py b/dusken/settings-sample.py
similarity index 99%
rename from dusken/dusken/settings-sample.py
rename to dusken/settings-sample.py
index dab01c9..563a923 100644
--- a/dusken/dusken/settings-sample.py
+++ b/dusken/settings-sample.py
@@ -117,12 +117,12 @@ INSTALLED_APPS = (
     'django.contrib.staticfiles',
     'django.contrib.admin',
     'django.contrib.admindocs',
-    'main',
+    'dusken',
     'tastypie'
 )
 
 # Profile of the User class used for authentication.
-AUTH_PROFILE_MODULE = 'main.Member'
+AUTH_PROFILE_MODULE = 'dusken.Member'
 
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
diff --git a/dusken/main/tests/__init__.py b/dusken/tests/__init__.py
similarity index 100%
rename from dusken/main/tests/__init__.py
rename to dusken/tests/__init__.py
diff --git a/dusken/main/tests/group.py b/dusken/tests/group.py
similarity index 97%
rename from dusken/main/tests/group.py
rename to dusken/tests/group.py
index dd04d91..f6c4c8f 100644
--- a/dusken/main/tests/group.py
+++ b/dusken/tests/group.py
@@ -1,7 +1,7 @@
 import logging
 
 from support.test import ResourceTestCase
-from main.models import Group
+from dusken.models import Group
 
 class GroupTest(ResourceTestCase):
 	fixtures = [ 'testdata.json' ]
diff --git a/dusken/main/tests/member.py b/dusken/tests/member.py
similarity index 99%
rename from dusken/main/tests/member.py
rename to dusken/tests/member.py
index ff27214..bbf310a 100644
--- a/dusken/main/tests/member.py
+++ b/dusken/tests/member.py
@@ -1,7 +1,7 @@
 import logging
 
 from support.test import ResourceTestCase
-from main.models import Member
+from dusken.models import Member
 
 class MemberTest(ResourceTestCase):
     def assertValidMemberData(self, member):
diff --git a/dusken/main/tests/membersbygroup.py b/dusken/tests/membersbygroup.py
similarity index 94%
rename from dusken/main/tests/membersbygroup.py
rename to dusken/tests/membersbygroup.py
index 6c908ed..fec6920 100644
--- a/dusken/main/tests/membersbygroup.py
+++ b/dusken/tests/membersbygroup.py
@@ -1,7 +1,7 @@
 import logging
 
 from support.test import ResourceTestCase
-from main.models import Group, Member
+from dusken.models import Group, Member
 
 class MembersByGroupTest(ResourceTestCase):
 	def setUp(self):
diff --git a/dusken/main/api/__init__.py b/dusken/tests/support/__init__.py
similarity index 100%
rename from dusken/main/api/__init__.py
rename to dusken/tests/support/__init__.py
diff --git a/dusken/main/tests/support/test.py b/dusken/tests/support/test.py
similarity index 100%
rename from dusken/main/tests/support/test.py
rename to dusken/tests/support/test.py
diff --git a/dusken/urls.py b/dusken/urls.py
new file mode 100644
index 0000000..167049c
--- /dev/null
+++ b/dusken/urls.py
@@ -0,0 +1,25 @@
+from django.conf.urls.defaults import *
+from django.conf.urls import patterns, include, url
+from django.contrib import admin
+from tastypie.api import Api
+
+from dusken.api.member import MemberResource
+from dusken.api.membership import MembershipResource
+from dusken.api.group import GroupResource
+from dusken.api.groupsbymember import GroupsByMemberResource
+from dusken.api.membersbygroup import MembersByGroupResource
+
+admin.autodiscover()
+
+v1_api = Api(api_name='v1')
+v1_api.register(MemberResource())
+v1_api.register(MembershipResource())
+v1_api.register(GroupResource())
+v1_api.register(GroupsByMemberResource())
+v1_api.register(MembersByGroupResource())
+
+urlpatterns = patterns('',
+    url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
+    url(r'^admin/', include(admin.site.urls)),
+    url(r'^api/', include(v1_api.urls)),
+)
diff --git a/dusken/main/views.py b/dusken/views.py
similarity index 100%
rename from dusken/main/views.py
rename to dusken/views.py
diff --git a/dusken/dusken/wsgi.py b/dusken/wsgi.py
similarity index 100%
rename from dusken/dusken/wsgi.py
rename to dusken/wsgi.py
diff --git a/dusken/manage.py b/manage.py
similarity index 100%
rename from dusken/manage.py
rename to manage.py
diff --git a/requirements.txt b/requirements.txt
index d5b452d..71b0cab 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,7 @@
 Django==1.5
 MySQL-python==1.2.4
 South==0.7.6
-argparse==1.2.1
-distribute==0.6.34
 django-tastypie==0.9.14
-mimeparse==0.1.3
 psycopg2==2.4.5
 python-dateutil==1.5
-wsgiref==0.1.2
+django-extensions==1.1.1