diff --git a/.gitignore b/.gitignore
index e6a663d..d9f61b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
 *.pyc
 *~
 *.db
-dbsettings.py
+app/conf/dbsettings.py
 logs/
-settingslocal.py
+app/conf/settingslocal.py
 env
 *.pid
-brokersettings.py
+app/conf/brokersettings.py
diff --git a/__init__.py b/app/__init__.py
similarity index 100%
rename from __init__.py
rename to app/__init__.py
diff --git a/api/__init__.py b/app/api/__init__.py
similarity index 100%
rename from api/__init__.py
rename to app/api/__init__.py
diff --git a/api/admin.py b/app/api/admin.py
similarity index 100%
rename from api/admin.py
rename to app/api/admin.py
diff --git a/api/auth.py b/app/api/auth.py
similarity index 100%
rename from api/auth.py
rename to app/api/auth.py
diff --git a/api/handlers/__init__.py b/app/api/handlers/__init__.py
similarity index 100%
rename from api/handlers/__init__.py
rename to app/api/handlers/__init__.py
diff --git a/api/handlers/v1.py b/app/api/handlers/v1.py
similarity index 100%
rename from api/handlers/v1.py
rename to app/api/handlers/v1.py
diff --git a/api/handlers/v2.py b/app/api/handlers/v2.py
similarity index 100%
rename from api/handlers/v2.py
rename to app/api/handlers/v2.py
diff --git a/api/migrations/0001_initial.py b/app/api/migrations/0001_initial.py
similarity index 100%
rename from api/migrations/0001_initial.py
rename to app/api/migrations/0001_initial.py
diff --git a/api/migrations/__init__.py b/app/api/migrations/__init__.py
similarity index 100%
rename from api/migrations/__init__.py
rename to app/api/migrations/__init__.py
diff --git a/api/models.py b/app/api/models.py
similarity index 100%
rename from api/models.py
rename to app/api/models.py
diff --git a/api/urls.py b/app/api/urls.py
similarity index 100%
rename from api/urls.py
rename to app/api/urls.py
diff --git a/api/views.py b/app/api/views.py
similarity index 100%
rename from api/views.py
rename to app/api/views.py
diff --git a/conf/__init__.py b/app/conf/__init__.py
similarity index 100%
rename from conf/__init__.py
rename to app/conf/__init__.py
diff --git a/conf/brokersettings.py.example b/app/conf/brokersettings.py.example
similarity index 100%
rename from conf/brokersettings.py.example
rename to app/conf/brokersettings.py.example
diff --git a/conf/dbsettings.py.example b/app/conf/dbsettings.py.example
similarity index 100%
rename from conf/dbsettings.py.example
rename to app/conf/dbsettings.py.example
diff --git a/eve_api/__init__.py b/app/eve_api/__init__.py
similarity index 100%
rename from eve_api/__init__.py
rename to app/eve_api/__init__.py
diff --git a/eve_api/admin.py b/app/eve_api/admin.py
similarity index 100%
rename from eve_api/admin.py
rename to app/eve_api/admin.py
diff --git a/eve_api/api_exceptions.py b/app/eve_api/api_exceptions.py
similarity index 100%
rename from eve_api/api_exceptions.py
rename to app/eve_api/api_exceptions.py
diff --git a/eve_api/app_defines.py b/app/eve_api/app_defines.py
similarity index 100%
rename from eve_api/app_defines.py
rename to app/eve_api/app_defines.py
diff --git a/eve_api/forms.py b/app/eve_api/forms.py
similarity index 100%
rename from eve_api/forms.py
rename to app/eve_api/forms.py
diff --git a/eve_api/migrations/0001_initial.py b/app/eve_api/migrations/0001_initial.py
similarity index 100%
rename from eve_api/migrations/0001_initial.py
rename to app/eve_api/migrations/0001_initial.py
diff --git a/eve_api/migrations/0002_auto__del_field_eveplayercharacter_director_update__add_field_eveplaye.py b/app/eve_api/migrations/0002_auto__del_field_eveplayercharacter_director_update__add_field_eveplaye.py
similarity index 100%
rename from eve_api/migrations/0002_auto__del_field_eveplayercharacter_director_update__add_field_eveplaye.py
rename to app/eve_api/migrations/0002_auto__del_field_eveplayercharacter_director_update__add_field_eveplaye.py
diff --git a/eve_api/migrations/0003_auto__add_eveplayercharacterrole.py b/app/eve_api/migrations/0003_auto__add_eveplayercharacterrole.py
similarity index 100%
rename from eve_api/migrations/0003_auto__add_eveplayercharacterrole.py
rename to app/eve_api/migrations/0003_auto__add_eveplayercharacterrole.py
diff --git a/eve_api/migrations/0004_auto.py b/app/eve_api/migrations/0004_auto.py
similarity index 100%
rename from eve_api/migrations/0004_auto.py
rename to app/eve_api/migrations/0004_auto.py
diff --git a/eve_api/migrations/0005_auto__add_field_eveplayercharacterrole_roleid.py b/app/eve_api/migrations/0005_auto__add_field_eveplayercharacterrole_roleid.py
similarity index 100%
rename from eve_api/migrations/0005_auto__add_field_eveplayercharacterrole_roleid.py
rename to app/eve_api/migrations/0005_auto__add_field_eveplayercharacterrole_roleid.py
diff --git a/eve_api/migrations/0006_auto__add_field_eveplayercharacter_corporation_date__add_field_eveplay.py b/app/eve_api/migrations/0006_auto__add_field_eveplayercharacter_corporation_date__add_field_eveplay.py
similarity index 100%
rename from eve_api/migrations/0006_auto__add_field_eveplayercharacter_corporation_date__add_field_eveplay.py
rename to app/eve_api/migrations/0006_auto__add_field_eveplayercharacter_corporation_date__add_field_eveplay.py
diff --git a/eve_api/migrations/0007_auto__chg_field_eveplayercharacter_security_status__add_field_eveplaye.py b/app/eve_api/migrations/0007_auto__chg_field_eveplayercharacter_security_status__add_field_eveplaye.py
similarity index 100%
rename from eve_api/migrations/0007_auto__chg_field_eveplayercharacter_security_status__add_field_eveplaye.py
rename to app/eve_api/migrations/0007_auto__chg_field_eveplayercharacter_security_status__add_field_eveplaye.py
diff --git a/eve_api/migrations/0008_auto__add_eveplayercharacterskill__add_eveskill__del_field_eveplayerch.py b/app/eve_api/migrations/0008_auto__add_eveplayercharacterskill__add_eveskill__del_field_eveplayerch.py
similarity index 100%
rename from eve_api/migrations/0008_auto__add_eveplayercharacterskill__add_eveskill__del_field_eveplayerch.py
rename to app/eve_api/migrations/0008_auto__add_eveplayercharacterskill__add_eveskill__del_field_eveplayerch.py
diff --git a/eve_api/migrations/0009_auto__add_field_eveplayercharacterskill_skillpoints.py b/app/eve_api/migrations/0009_auto__add_field_eveplayercharacterskill_skillpoints.py
similarity index 100%
rename from eve_api/migrations/0009_auto__add_field_eveplayercharacterskill_skillpoints.py
rename to app/eve_api/migrations/0009_auto__add_field_eveplayercharacterskill_skillpoints.py
diff --git a/eve_api/migrations/0010_auto__add_eveskillgroup__add_field_eveskill_group.py b/app/eve_api/migrations/0010_auto__add_eveskillgroup__add_field_eveskill_group.py
similarity index 100%
rename from eve_api/migrations/0010_auto__add_eveskillgroup__add_field_eveskill_group.py
rename to app/eve_api/migrations/0010_auto__add_eveskillgroup__add_field_eveskill_group.py
diff --git a/eve_api/migrations/0011_add_skills_index.py b/app/eve_api/migrations/0011_add_skills_index.py
similarity index 100%
rename from eve_api/migrations/0011_add_skills_index.py
rename to app/eve_api/migrations/0011_add_skills_index.py
diff --git a/eve_api/migrations/__init__.py b/app/eve_api/migrations/__init__.py
similarity index 100%
rename from eve_api/migrations/__init__.py
rename to app/eve_api/migrations/__init__.py
diff --git a/eve_api/models/__init__.py b/app/eve_api/models/__init__.py
similarity index 100%
rename from eve_api/models/__init__.py
rename to app/eve_api/models/__init__.py
diff --git a/eve_api/models/account.py b/app/eve_api/models/account.py
similarity index 100%
rename from eve_api/models/account.py
rename to app/eve_api/models/account.py
diff --git a/eve_api/models/alliance.py b/app/eve_api/models/alliance.py
similarity index 100%
rename from eve_api/models/alliance.py
rename to app/eve_api/models/alliance.py
diff --git a/eve_api/models/character.py b/app/eve_api/models/character.py
similarity index 100%
rename from eve_api/models/character.py
rename to app/eve_api/models/character.py
diff --git a/eve_api/models/corporation.py b/app/eve_api/models/corporation.py
similarity index 100%
rename from eve_api/models/corporation.py
rename to app/eve_api/models/corporation.py
diff --git a/eve_api/models/static.py b/app/eve_api/models/static.py
similarity index 100%
rename from eve_api/models/static.py
rename to app/eve_api/models/static.py
diff --git a/eve_api/tasks/__init__.py b/app/eve_api/tasks/__init__.py
similarity index 100%
rename from eve_api/tasks/__init__.py
rename to app/eve_api/tasks/__init__.py
diff --git a/eve_api/tasks/account.py b/app/eve_api/tasks/account.py
similarity index 100%
rename from eve_api/tasks/account.py
rename to app/eve_api/tasks/account.py
diff --git a/eve_api/tasks/alliance.py b/app/eve_api/tasks/alliance.py
similarity index 100%
rename from eve_api/tasks/alliance.py
rename to app/eve_api/tasks/alliance.py
diff --git a/eve_api/tasks/character.py b/app/eve_api/tasks/character.py
similarity index 100%
rename from eve_api/tasks/character.py
rename to app/eve_api/tasks/character.py
diff --git a/eve_api/tasks/corporation.py b/app/eve_api/tasks/corporation.py
similarity index 100%
rename from eve_api/tasks/corporation.py
rename to app/eve_api/tasks/corporation.py
diff --git a/eve_api/tasks/static.py b/app/eve_api/tasks/static.py
similarity index 100%
rename from eve_api/tasks/static.py
rename to app/eve_api/tasks/static.py
diff --git a/eve_api/templates/eve_api/add.html b/app/eve_api/templates/eve_api/add.html
similarity index 100%
rename from eve_api/templates/eve_api/add.html
rename to app/eve_api/templates/eve_api/add.html
diff --git a/eve_api/templates/eve_api/character.html b/app/eve_api/templates/eve_api/character.html
similarity index 100%
rename from eve_api/templates/eve_api/character.html
rename to app/eve_api/templates/eve_api/character.html
diff --git a/eve_api/templates/eve_api/character_list.html b/app/eve_api/templates/eve_api/character_list.html
similarity index 100%
rename from eve_api/templates/eve_api/character_list.html
rename to app/eve_api/templates/eve_api/character_list.html
diff --git a/eve_api/templates/eve_api/corporation.html b/app/eve_api/templates/eve_api/corporation.html
similarity index 100%
rename from eve_api/templates/eve_api/corporation.html
rename to app/eve_api/templates/eve_api/corporation.html
diff --git a/eve_api/templates/eve_api/log.html b/app/eve_api/templates/eve_api/log.html
similarity index 100%
rename from eve_api/templates/eve_api/log.html
rename to app/eve_api/templates/eve_api/log.html
diff --git a/eve_api/templatetags/__init__.py b/app/eve_api/templatetags/__init__.py
similarity index 100%
rename from eve_api/templatetags/__init__.py
rename to app/eve_api/templatetags/__init__.py
diff --git a/eve_api/templatetags/naturaltimediff.py b/app/eve_api/templatetags/naturaltimediff.py
similarity index 100%
rename from eve_api/templatetags/naturaltimediff.py
rename to app/eve_api/templatetags/naturaltimediff.py
diff --git a/eve_api/urls.py b/app/eve_api/urls.py
similarity index 100%
rename from eve_api/urls.py
rename to app/eve_api/urls.py
diff --git a/eve_api/utils.py b/app/eve_api/utils.py
similarity index 100%
rename from eve_api/utils.py
rename to app/eve_api/utils.py
diff --git a/eve_api/views.py b/app/eve_api/views.py
similarity index 100%
rename from eve_api/views.py
rename to app/eve_api/views.py
diff --git a/eve_proxy/__init__.py b/app/eve_proxy/__init__.py
similarity index 100%
rename from eve_proxy/__init__.py
rename to app/eve_proxy/__init__.py
diff --git a/eve_proxy/admin.py b/app/eve_proxy/admin.py
similarity index 100%
rename from eve_proxy/admin.py
rename to app/eve_proxy/admin.py
diff --git a/eve_proxy/exceptions.py b/app/eve_proxy/exceptions.py
similarity index 100%
rename from eve_proxy/exceptions.py
rename to app/eve_proxy/exceptions.py
diff --git a/eve_proxy/migrations/0001_initial.py b/app/eve_proxy/migrations/0001_initial.py
similarity index 100%
rename from eve_proxy/migrations/0001_initial.py
rename to app/eve_proxy/migrations/0001_initial.py
diff --git a/eve_proxy/migrations/0002_auto__add_unique_cacheddocument_url_path.py b/app/eve_proxy/migrations/0002_auto__add_unique_cacheddocument_url_path.py
similarity index 100%
rename from eve_proxy/migrations/0002_auto__add_unique_cacheddocument_url_path.py
rename to app/eve_proxy/migrations/0002_auto__add_unique_cacheddocument_url_path.py
diff --git a/eve_proxy/migrations/0003_auto__del_field_cacheddocument_id__add_field_cacheddocument_doc_key__d.py b/app/eve_proxy/migrations/0003_auto__del_field_cacheddocument_id__add_field_cacheddocument_doc_key__d.py
similarity index 100%
rename from eve_proxy/migrations/0003_auto__del_field_cacheddocument_id__add_field_cacheddocument_doc_key__d.py
rename to app/eve_proxy/migrations/0003_auto__del_field_cacheddocument_id__add_field_cacheddocument_doc_key__d.py
diff --git a/eve_proxy/migrations/__init__.py b/app/eve_proxy/migrations/__init__.py
similarity index 100%
rename from eve_proxy/migrations/__init__.py
rename to app/eve_proxy/migrations/__init__.py
diff --git a/eve_proxy/models.py b/app/eve_proxy/models.py
similarity index 100%
rename from eve_proxy/models.py
rename to app/eve_proxy/models.py
diff --git a/eve_proxy/tasks.py b/app/eve_proxy/tasks.py
similarity index 100%
rename from eve_proxy/tasks.py
rename to app/eve_proxy/tasks.py
diff --git a/eve_proxy/tests.py b/app/eve_proxy/tests.py
similarity index 100%
rename from eve_proxy/tests.py
rename to app/eve_proxy/tests.py
diff --git a/eve_proxy/urls.py b/app/eve_proxy/urls.py
similarity index 100%
rename from eve_proxy/urls.py
rename to app/eve_proxy/urls.py
diff --git a/eve_proxy/views.py b/app/eve_proxy/views.py
similarity index 100%
rename from eve_proxy/views.py
rename to app/eve_proxy/views.py
diff --git a/groups/__init__.py b/app/groups/__init__.py
similarity index 100%
rename from groups/__init__.py
rename to app/groups/__init__.py
diff --git a/groups/admin.py b/app/groups/admin.py
similarity index 100%
rename from groups/admin.py
rename to app/groups/admin.py
diff --git a/groups/app_defines.py b/app/groups/app_defines.py
similarity index 100%
rename from groups/app_defines.py
rename to app/groups/app_defines.py
diff --git a/groups/forms.py b/app/groups/forms.py
similarity index 100%
rename from groups/forms.py
rename to app/groups/forms.py
diff --git a/groups/migrations/0001_initial.py b/app/groups/migrations/0001_initial.py
similarity index 100%
rename from groups/migrations/0001_initial.py
rename to app/groups/migrations/0001_initial.py
diff --git a/groups/migrations/0002_groupinformation.py b/app/groups/migrations/0002_groupinformation.py
similarity index 100%
rename from groups/migrations/0002_groupinformation.py
rename to app/groups/migrations/0002_groupinformation.py
diff --git a/groups/migrations/0003_auto__add_field_groupinformation_parent.py b/app/groups/migrations/0003_auto__add_field_groupinformation_parent.py
similarity index 100%
rename from groups/migrations/0003_auto__add_field_groupinformation_parent.py
rename to app/groups/migrations/0003_auto__add_field_groupinformation_parent.py
diff --git a/groups/migrations/__init__.py b/app/groups/migrations/__init__.py
similarity index 100%
rename from groups/migrations/__init__.py
rename to app/groups/migrations/__init__.py
diff --git a/groups/models.py b/app/groups/models.py
similarity index 100%
rename from groups/models.py
rename to app/groups/models.py
diff --git a/groups/tests.py b/app/groups/tests.py
similarity index 100%
rename from groups/tests.py
rename to app/groups/tests.py
diff --git a/groups/urls.py b/app/groups/urls.py
similarity index 100%
rename from groups/urls.py
rename to app/groups/urls.py
diff --git a/groups/views.py b/app/groups/views.py
similarity index 100%
rename from groups/views.py
rename to app/groups/views.py
diff --git a/hr/__init__.py b/app/hr/__init__.py
similarity index 100%
rename from hr/__init__.py
rename to app/hr/__init__.py
diff --git a/hr/admin.py b/app/hr/admin.py
similarity index 100%
rename from hr/admin.py
rename to app/hr/admin.py
diff --git a/hr/app_defines.py b/app/hr/app_defines.py
similarity index 100%
rename from hr/app_defines.py
rename to app/hr/app_defines.py
diff --git a/hr/forms.py b/app/hr/forms.py
similarity index 100%
rename from hr/forms.py
rename to app/hr/forms.py
diff --git a/hr/migrations/0001_initial.py b/app/hr/migrations/0001_initial.py
similarity index 100%
rename from hr/migrations/0001_initial.py
rename to app/hr/migrations/0001_initial.py
diff --git a/hr/migrations/0002_auto__add_field_blacklist_expiry_date.py b/app/hr/migrations/0002_auto__add_field_blacklist_expiry_date.py
similarity index 100%
rename from hr/migrations/0002_auto__add_field_blacklist_expiry_date.py
rename to app/hr/migrations/0002_auto__add_field_blacklist_expiry_date.py
diff --git a/hr/migrations/0003_auto__add_field_blacklist_source.py b/app/hr/migrations/0003_auto__add_field_blacklist_source.py
similarity index 100%
rename from hr/migrations/0003_auto__add_field_blacklist_source.py
rename to app/hr/migrations/0003_auto__add_field_blacklist_source.py
diff --git a/hr/migrations/0004_auto__add_blacklistsource__chg_field_blacklist_source.py b/app/hr/migrations/0004_auto__add_blacklistsource__chg_field_blacklist_source.py
similarity index 100%
rename from hr/migrations/0004_auto__add_blacklistsource__chg_field_blacklist_source.py
rename to app/hr/migrations/0004_auto__add_blacklistsource__chg_field_blacklist_source.py
diff --git a/hr/migrations/0005_create_blacklist_sources.py b/app/hr/migrations/0005_create_blacklist_sources.py
similarity index 100%
rename from hr/migrations/0005_create_blacklist_sources.py
rename to app/hr/migrations/0005_create_blacklist_sources.py
diff --git a/hr/migrations/0006_auto__add_field_blacklistsource_ticker.py b/app/hr/migrations/0006_auto__add_field_blacklistsource_ticker.py
similarity index 100%
rename from hr/migrations/0006_auto__add_field_blacklistsource_ticker.py
rename to app/hr/migrations/0006_auto__add_field_blacklistsource_ticker.py
diff --git a/hr/migrations/0007_auto__add_field_recommendation_recommendation_date__add_field_applicat.py b/app/hr/migrations/0007_auto__add_field_recommendation_recommendation_date__add_field_applicat.py
similarity index 100%
rename from hr/migrations/0007_auto__add_field_recommendation_recommendation_date__add_field_applicat.py
rename to app/hr/migrations/0007_auto__add_field_recommendation_recommendation_date__add_field_applicat.py
diff --git a/hr/migrations/__init__.py b/app/hr/migrations/__init__.py
similarity index 100%
rename from hr/migrations/__init__.py
rename to app/hr/migrations/__init__.py
diff --git a/hr/models.py b/app/hr/models.py
similarity index 100%
rename from hr/models.py
rename to app/hr/models.py
diff --git a/hr/tasks.py b/app/hr/tasks.py
similarity index 100%
rename from hr/tasks.py
rename to app/hr/tasks.py
diff --git a/hr/templates/hr/applications/accept.html b/app/hr/templates/hr/applications/accept.html
similarity index 100%
rename from hr/templates/hr/applications/accept.html
rename to app/hr/templates/hr/applications/accept.html
diff --git a/hr/templates/hr/applications/add.html b/app/hr/templates/hr/applications/add.html
similarity index 100%
rename from hr/templates/hr/applications/add.html
rename to app/hr/templates/hr/applications/add.html
diff --git a/hr/templates/hr/applications/add_message.html b/app/hr/templates/hr/applications/add_message.html
similarity index 100%
rename from hr/templates/hr/applications/add_message.html
rename to app/hr/templates/hr/applications/add_message.html
diff --git a/hr/templates/hr/applications/add_note.html b/app/hr/templates/hr/applications/add_note.html
similarity index 100%
rename from hr/templates/hr/applications/add_note.html
rename to app/hr/templates/hr/applications/add_note.html
diff --git a/hr/templates/hr/applications/admin/view_list.html b/app/hr/templates/hr/applications/admin/view_list.html
similarity index 100%
rename from hr/templates/hr/applications/admin/view_list.html
rename to app/hr/templates/hr/applications/admin/view_list.html
diff --git a/hr/templates/hr/applications/noadd.html b/app/hr/templates/hr/applications/noadd.html
similarity index 100%
rename from hr/templates/hr/applications/noadd.html
rename to app/hr/templates/hr/applications/noadd.html
diff --git a/hr/templates/hr/applications/reject.html b/app/hr/templates/hr/applications/reject.html
similarity index 100%
rename from hr/templates/hr/applications/reject.html
rename to app/hr/templates/hr/applications/reject.html
diff --git a/hr/templates/hr/applications/view.html b/app/hr/templates/hr/applications/view.html
similarity index 100%
rename from hr/templates/hr/applications/view.html
rename to app/hr/templates/hr/applications/view.html
diff --git a/hr/templates/hr/applications/view_list.html b/app/hr/templates/hr/applications/view_list.html
similarity index 100%
rename from hr/templates/hr/applications/view_list.html
rename to app/hr/templates/hr/applications/view_list.html
diff --git a/hr/templates/hr/emails/accepted.txt b/app/hr/templates/hr/emails/accepted.txt
similarity index 100%
rename from hr/templates/hr/emails/accepted.txt
rename to app/hr/templates/hr/emails/accepted.txt
diff --git a/hr/templates/hr/emails/accepted_subject.txt b/app/hr/templates/hr/emails/accepted_subject.txt
similarity index 100%
rename from hr/templates/hr/emails/accepted_subject.txt
rename to app/hr/templates/hr/emails/accepted_subject.txt
diff --git a/hr/templates/hr/emails/message.txt b/app/hr/templates/hr/emails/message.txt
similarity index 100%
rename from hr/templates/hr/emails/message.txt
rename to app/hr/templates/hr/emails/message.txt
diff --git a/hr/templates/hr/emails/message_subject.txt b/app/hr/templates/hr/emails/message_subject.txt
similarity index 100%
rename from hr/templates/hr/emails/message_subject.txt
rename to app/hr/templates/hr/emails/message_subject.txt
diff --git a/hr/templates/hr/emails/rejected.txt b/app/hr/templates/hr/emails/rejected.txt
similarity index 100%
rename from hr/templates/hr/emails/rejected.txt
rename to app/hr/templates/hr/emails/rejected.txt
diff --git a/hr/templates/hr/emails/rejected_subject.txt b/app/hr/templates/hr/emails/rejected_subject.txt
similarity index 100%
rename from hr/templates/hr/emails/rejected_subject.txt
rename to app/hr/templates/hr/emails/rejected_subject.txt
diff --git a/hr/templates/hr/index.html b/app/hr/templates/hr/index.html
similarity index 100%
rename from hr/templates/hr/index.html
rename to app/hr/templates/hr/index.html
diff --git a/hr/templates/hr/recommendations/add.html b/app/hr/templates/hr/recommendations/add.html
similarity index 100%
rename from hr/templates/hr/recommendations/add.html
rename to app/hr/templates/hr/recommendations/add.html
diff --git a/hr/templates/hr/recommendations/view_list.html b/app/hr/templates/hr/recommendations/view_list.html
similarity index 100%
rename from hr/templates/hr/recommendations/view_list.html
rename to app/hr/templates/hr/recommendations/view_list.html
diff --git a/hr/templatetags/__init__.py b/app/hr/templatetags/__init__.py
similarity index 100%
rename from hr/templatetags/__init__.py
rename to app/hr/templatetags/__init__.py
diff --git a/hr/templatetags/if_extra.py b/app/hr/templatetags/if_extra.py
similarity index 100%
rename from hr/templatetags/if_extra.py
rename to app/hr/templatetags/if_extra.py
diff --git a/hr/tests.py b/app/hr/tests.py
similarity index 100%
rename from hr/tests.py
rename to app/hr/tests.py
diff --git a/hr/urls.py b/app/hr/urls.py
similarity index 100%
rename from hr/urls.py
rename to app/hr/urls.py
diff --git a/hr/utils.py b/app/hr/utils.py
similarity index 100%
rename from hr/utils.py
rename to app/hr/utils.py
diff --git a/hr/views.py b/app/hr/views.py
similarity index 100%
rename from hr/views.py
rename to app/hr/views.py
diff --git a/manage.py b/app/manage.py
similarity index 91%
rename from manage.py
rename to app/manage.py
index b643a76..8121562 100755
--- a/manage.py
+++ b/app/manage.py
@@ -3,7 +3,7 @@ import sys
 import os.path
 
 pwd = os.path.dirname(os.path.abspath(__file__))
-activate_this = os.path.join(pwd,'env','bin','activate_this.py')
+activate_this = os.path.join(pwd,'..', 'env','bin','activate_this.py')
 try:
     execfile(activate_this, dict(__file__=activate_this))
 except IOError:
diff --git a/media/css/style.css b/app/media/css/style.css
similarity index 100%
rename from media/css/style.css
rename to app/media/css/style.css
diff --git a/media/css/tables.css b/app/media/css/tables.css
similarity index 100%
rename from media/css/tables.css
rename to app/media/css/tables.css
diff --git a/media/img/404.png b/app/media/img/404.png
similarity index 100%
rename from media/img/404.png
rename to app/media/img/404.png
diff --git a/media/img/b0rtb0rtb0rt.png b/app/media/img/b0rtb0rtb0rt.png
similarity index 100%
rename from media/img/b0rtb0rtb0rt.png
rename to app/media/img/b0rtb0rtb0rt.png
diff --git a/media/img/dreddit_logo.jpg b/app/media/img/dreddit_logo.jpg
similarity index 100%
rename from media/img/dreddit_logo.jpg
rename to app/media/img/dreddit_logo.jpg
diff --git a/media/img/favicon.ico b/app/media/img/favicon.ico
similarity index 100%
rename from media/img/favicon.ico
rename to app/media/img/favicon.ico
diff --git a/media/img/ganked.jpg b/app/media/img/ganked.jpg
similarity index 100%
rename from media/img/ganked.jpg
rename to app/media/img/ganked.jpg
diff --git a/media/img/shutdown.jpg b/app/media/img/shutdown.jpg
similarity index 100%
rename from media/img/shutdown.jpg
rename to app/media/img/shutdown.jpg
diff --git a/media/img/skills/level0.gif b/app/media/img/skills/level0.gif
similarity index 100%
rename from media/img/skills/level0.gif
rename to app/media/img/skills/level0.gif
diff --git a/media/img/skills/level1.gif b/app/media/img/skills/level1.gif
similarity index 100%
rename from media/img/skills/level1.gif
rename to app/media/img/skills/level1.gif
diff --git a/media/img/skills/level2.gif b/app/media/img/skills/level2.gif
similarity index 100%
rename from media/img/skills/level2.gif
rename to app/media/img/skills/level2.gif
diff --git a/media/img/skills/level3.gif b/app/media/img/skills/level3.gif
similarity index 100%
rename from media/img/skills/level3.gif
rename to app/media/img/skills/level3.gif
diff --git a/media/img/skills/level4.gif b/app/media/img/skills/level4.gif
similarity index 100%
rename from media/img/skills/level4.gif
rename to app/media/img/skills/level4.gif
diff --git a/media/img/skills/level5.gif b/app/media/img/skills/level5.gif
similarity index 100%
rename from media/img/skills/level5.gif
rename to app/media/img/skills/level5.gif
diff --git a/media/img/spinner.gif b/app/media/img/spinner.gif
similarity index 100%
rename from media/img/spinner.gif
rename to app/media/img/spinner.gif
diff --git a/reddit/__init__.py b/app/reddit/__init__.py
similarity index 100%
rename from reddit/__init__.py
rename to app/reddit/__init__.py
diff --git a/reddit/admin.py b/app/reddit/admin.py
similarity index 100%
rename from reddit/admin.py
rename to app/reddit/admin.py
diff --git a/reddit/api.py b/app/reddit/api.py
similarity index 100%
rename from reddit/api.py
rename to app/reddit/api.py
diff --git a/reddit/forms.py b/app/reddit/forms.py
similarity index 100%
rename from reddit/forms.py
rename to app/reddit/forms.py
diff --git a/reddit/migrations/0001_initial.py b/app/reddit/migrations/0001_initial.py
similarity index 100%
rename from reddit/migrations/0001_initial.py
rename to app/reddit/migrations/0001_initial.py
diff --git a/reddit/migrations/__init__.py b/app/reddit/migrations/__init__.py
similarity index 100%
rename from reddit/migrations/__init__.py
rename to app/reddit/migrations/__init__.py
diff --git a/reddit/models.py b/app/reddit/models.py
similarity index 100%
rename from reddit/models.py
rename to app/reddit/models.py
diff --git a/reddit/tasks.py b/app/reddit/tasks.py
similarity index 100%
rename from reddit/tasks.py
rename to app/reddit/tasks.py
diff --git a/reddit/templates/reddit/add_reddit_account.html b/app/reddit/templates/reddit/add_reddit_account.html
similarity index 100%
rename from reddit/templates/reddit/add_reddit_account.html
rename to app/reddit/templates/reddit/add_reddit_account.html
diff --git a/reddit/urls.py b/app/reddit/urls.py
similarity index 100%
rename from reddit/urls.py
rename to app/reddit/urls.py
diff --git a/reddit/views.py b/app/reddit/views.py
similarity index 100%
rename from reddit/views.py
rename to app/reddit/views.py
diff --git a/settings.py b/app/settings.py
similarity index 100%
rename from settings.py
rename to app/settings.py
diff --git a/sso/__init__.py b/app/sso/__init__.py
similarity index 100%
rename from sso/__init__.py
rename to app/sso/__init__.py
diff --git a/sso/admin.py b/app/sso/admin.py
similarity index 100%
rename from sso/admin.py
rename to app/sso/admin.py
diff --git a/sso/backends.py b/app/sso/backends.py
similarity index 100%
rename from sso/backends.py
rename to app/sso/backends.py
diff --git a/sso/forms.py b/app/sso/forms.py
similarity index 100%
rename from sso/forms.py
rename to app/sso/forms.py
diff --git a/sso/middleware.py b/app/sso/middleware.py
similarity index 100%
rename from sso/middleware.py
rename to app/sso/middleware.py
diff --git a/sso/migrations/0001_initial.py b/app/sso/migrations/0001_initial.py
similarity index 100%
rename from sso/migrations/0001_initial.py
rename to app/sso/migrations/0001_initial.py
diff --git a/sso/migrations/0002_auto__del_field_ssouser_website__del_field_ssouser_xmpp__del_field_sso.py b/app/sso/migrations/0002_auto__del_field_ssouser_website__del_field_ssouser_xmpp__del_field_sso.py
similarity index 100%
rename from sso/migrations/0002_auto__del_field_ssouser_website__del_field_ssouser_xmpp__del_field_sso.py
rename to app/sso/migrations/0002_auto__del_field_ssouser_website__del_field_ssouser_xmpp__del_field_sso.py
diff --git a/sso/migrations/0003_auto__add_ssousernote.py b/app/sso/migrations/0003_auto__add_ssousernote.py
similarity index 100%
rename from sso/migrations/0003_auto__add_ssousernote.py
rename to app/sso/migrations/0003_auto__add_ssousernote.py
diff --git a/sso/migrations/0004_auto__add_field_serviceaccount_character.py b/app/sso/migrations/0004_auto__add_field_serviceaccount_character.py
similarity index 100%
rename from sso/migrations/0004_auto__add_field_serviceaccount_character.py
rename to app/sso/migrations/0004_auto__add_field_serviceaccount_character.py
diff --git a/sso/migrations/0005_auto__add_ssouseripaddress.py b/app/sso/migrations/0005_auto__add_ssouseripaddress.py
similarity index 100%
rename from sso/migrations/0005_auto__add_ssouseripaddress.py
rename to app/sso/migrations/0005_auto__add_ssouseripaddress.py
diff --git a/sso/migrations/__init__.py b/app/sso/migrations/__init__.py
similarity index 100%
rename from sso/migrations/__init__.py
rename to app/sso/migrations/__init__.py
diff --git a/sso/models.py b/app/sso/models.py
similarity index 100%
rename from sso/models.py
rename to app/sso/models.py
diff --git a/sso/services/__init__.py b/app/sso/services/__init__.py
similarity index 100%
rename from sso/services/__init__.py
rename to app/sso/services/__init__.py
diff --git a/sso/services/dummy/__init__.py b/app/sso/services/dummy/__init__.py
similarity index 100%
rename from sso/services/dummy/__init__.py
rename to app/sso/services/dummy/__init__.py
diff --git a/sso/services/ipb/__init__.py b/app/sso/services/ipb/__init__.py
similarity index 100%
rename from sso/services/ipb/__init__.py
rename to app/sso/services/ipb/__init__.py
diff --git a/sso/services/jabber/__init__.py b/app/sso/services/jabber/__init__.py
similarity index 100%
rename from sso/services/jabber/__init__.py
rename to app/sso/services/jabber/__init__.py
diff --git a/sso/services/miningbuddy/__init__.py b/app/sso/services/miningbuddy/__init__.py
similarity index 100%
rename from sso/services/miningbuddy/__init__.py
rename to app/sso/services/miningbuddy/__init__.py
diff --git a/sso/services/mumble/MumbleCtlIce.py b/app/sso/services/mumble/MumbleCtlIce.py
similarity index 100%
rename from sso/services/mumble/MumbleCtlIce.py
rename to app/sso/services/mumble/MumbleCtlIce.py
diff --git a/sso/services/mumble/__init__.py b/app/sso/services/mumble/__init__.py
similarity index 100%
rename from sso/services/mumble/__init__.py
rename to app/sso/services/mumble/__init__.py
diff --git a/sso/services/mumble/mctl.py b/app/sso/services/mumble/mctl.py
similarity index 100%
rename from sso/services/mumble/mctl.py
rename to app/sso/services/mumble/mctl.py
diff --git a/sso/services/phpbb/__init__.py b/app/sso/services/phpbb/__init__.py
similarity index 100%
rename from sso/services/phpbb/__init__.py
rename to app/sso/services/phpbb/__init__.py
diff --git a/sso/services/postracker/__init__.py b/app/sso/services/postracker/__init__.py
similarity index 100%
rename from sso/services/postracker/__init__.py
rename to app/sso/services/postracker/__init__.py
diff --git a/sso/services/qms/__init__.py b/app/sso/services/qms/__init__.py
similarity index 100%
rename from sso/services/qms/__init__.py
rename to app/sso/services/qms/__init__.py
diff --git a/sso/services/smf/__init__.py b/app/sso/services/smf/__init__.py
similarity index 100%
rename from sso/services/smf/__init__.py
rename to app/sso/services/smf/__init__.py
diff --git a/sso/services/ts3/__init__.py b/app/sso/services/ts3/__init__.py
similarity index 100%
rename from sso/services/ts3/__init__.py
rename to app/sso/services/ts3/__init__.py
diff --git a/sso/services/ts3/ts3.py b/app/sso/services/ts3/ts3.py
similarity index 100%
rename from sso/services/ts3/ts3.py
rename to app/sso/services/ts3/ts3.py
diff --git a/sso/services/wiki/__init__.py b/app/sso/services/wiki/__init__.py
similarity index 100%
rename from sso/services/wiki/__init__.py
rename to app/sso/services/wiki/__init__.py
diff --git a/sso/tasks.py b/app/sso/tasks.py
similarity index 100%
rename from sso/tasks.py
rename to app/sso/tasks.py
diff --git a/sso/templatetags/__init__.py b/app/sso/templatetags/__init__.py
similarity index 100%
rename from sso/templatetags/__init__.py
rename to app/sso/templatetags/__init__.py
diff --git a/sso/templatetags/installed.py b/app/sso/templatetags/installed.py
similarity index 100%
rename from sso/templatetags/installed.py
rename to app/sso/templatetags/installed.py
diff --git a/sso/templatetags/naturaltimediff.py b/app/sso/templatetags/naturaltimediff.py
similarity index 100%
rename from sso/templatetags/naturaltimediff.py
rename to app/sso/templatetags/naturaltimediff.py
diff --git a/sso/tests.py b/app/sso/tests.py
similarity index 100%
rename from sso/tests.py
rename to app/sso/tests.py
diff --git a/sso/urls.py b/app/sso/urls.py
similarity index 100%
rename from sso/urls.py
rename to app/sso/urls.py
diff --git a/sso/views.py b/app/sso/views.py
similarity index 100%
rename from sso/views.py
rename to app/sso/views.py
diff --git a/templates/404.html b/app/templates/404.html
similarity index 100%
rename from templates/404.html
rename to app/templates/404.html
diff --git a/templates/500.html b/app/templates/500.html
similarity index 100%
rename from templates/500.html
rename to app/templates/500.html
diff --git a/templates/apipassword.html b/app/templates/apipassword.html
similarity index 100%
rename from templates/apipassword.html
rename to app/templates/apipassword.html
diff --git a/templates/base.html b/app/templates/base.html
similarity index 100%
rename from templates/base.html
rename to app/templates/base.html
diff --git a/templates/groups/create_request.html b/app/templates/groups/create_request.html
similarity index 100%
rename from templates/groups/create_request.html
rename to app/templates/groups/create_request.html
diff --git a/templates/groups/group_admin.html b/app/templates/groups/group_admin.html
similarity index 100%
rename from templates/groups/group_admin.html
rename to app/templates/groups/group_admin.html
diff --git a/templates/groups/group_list.html b/app/templates/groups/group_list.html
similarity index 100%
rename from templates/groups/group_list.html
rename to app/templates/groups/group_list.html
diff --git a/templates/oauth/challenge.html b/app/templates/oauth/challenge.html
similarity index 100%
rename from templates/oauth/challenge.html
rename to app/templates/oauth/challenge.html
diff --git a/templates/off.html b/app/templates/off.html
similarity index 100%
rename from templates/off.html
rename to app/templates/off.html
diff --git a/templates/piston/authorize_token.html b/app/templates/piston/authorize_token.html
similarity index 100%
rename from templates/piston/authorize_token.html
rename to app/templates/piston/authorize_token.html
diff --git a/templates/registration/activate.html b/app/templates/registration/activate.html
similarity index 100%
rename from templates/registration/activate.html
rename to app/templates/registration/activate.html
diff --git a/templates/registration/activation_email.txt b/app/templates/registration/activation_email.txt
similarity index 100%
rename from templates/registration/activation_email.txt
rename to app/templates/registration/activation_email.txt
diff --git a/templates/registration/activation_email_subject.txt b/app/templates/registration/activation_email_subject.txt
similarity index 100%
rename from templates/registration/activation_email_subject.txt
rename to app/templates/registration/activation_email_subject.txt
diff --git a/templates/registration/imprint.html b/app/templates/registration/imprint.html
similarity index 100%
rename from templates/registration/imprint.html
rename to app/templates/registration/imprint.html
diff --git a/templates/registration/login.html b/app/templates/registration/login.html
similarity index 100%
rename from templates/registration/login.html
rename to app/templates/registration/login.html
diff --git a/templates/registration/logout.html b/app/templates/registration/logout.html
similarity index 100%
rename from templates/registration/logout.html
rename to app/templates/registration/logout.html
diff --git a/templates/registration/registration_complete.html b/app/templates/registration/registration_complete.html
similarity index 100%
rename from templates/registration/registration_complete.html
rename to app/templates/registration/registration_complete.html
diff --git a/templates/registration/registration_form.html b/app/templates/registration/registration_form.html
similarity index 100%
rename from templates/registration/registration_form.html
rename to app/templates/registration/registration_form.html
diff --git a/templates/sso/apipassword.html b/app/templates/sso/apipassword.html
similarity index 100%
rename from templates/sso/apipassword.html
rename to app/templates/sso/apipassword.html
diff --git a/templates/sso/index.html b/app/templates/sso/index.html
similarity index 100%
rename from templates/sso/index.html
rename to app/templates/sso/index.html
diff --git a/templates/sso/lookup/lookuplist.html b/app/templates/sso/lookup/lookuplist.html
similarity index 100%
rename from templates/sso/lookup/lookuplist.html
rename to app/templates/sso/lookup/lookuplist.html
diff --git a/templates/sso/lookup/user.html b/app/templates/sso/lookup/user.html
similarity index 100%
rename from templates/sso/lookup/user.html
rename to app/templates/sso/lookup/user.html
diff --git a/templates/sso/lookup/userlookup.html b/app/templates/sso/lookup/userlookup.html
similarity index 100%
rename from templates/sso/lookup/userlookup.html
rename to app/templates/sso/lookup/userlookup.html
diff --git a/templates/sso/profile.html b/app/templates/sso/profile.html
similarity index 100%
rename from templates/sso/profile.html
rename to app/templates/sso/profile.html
diff --git a/templates/sso/serviceaccount/add.html b/app/templates/sso/serviceaccount/add.html
similarity index 100%
rename from templates/sso/serviceaccount/add.html
rename to app/templates/sso/serviceaccount/add.html
diff --git a/templates/sso/serviceaccount/created.html b/app/templates/sso/serviceaccount/created.html
similarity index 100%
rename from templates/sso/serviceaccount/created.html
rename to app/templates/sso/serviceaccount/created.html
diff --git a/templates/sso/serviceaccount/deleteconfirm.html b/app/templates/sso/serviceaccount/deleteconfirm.html
similarity index 100%
rename from templates/sso/serviceaccount/deleteconfirm.html
rename to app/templates/sso/serviceaccount/deleteconfirm.html
diff --git a/templates/sso/serviceaccount/index.html b/app/templates/sso/serviceaccount/index.html
similarity index 100%
rename from templates/sso/serviceaccount/index.html
rename to app/templates/sso/serviceaccount/index.html
diff --git a/templates/sso/serviceaccount/noneavailable.html b/app/templates/sso/serviceaccount/noneavailable.html
similarity index 100%
rename from templates/sso/serviceaccount/noneavailable.html
rename to app/templates/sso/serviceaccount/noneavailable.html
diff --git a/templates/sso/serviceaccount/reset.html b/app/templates/sso/serviceaccount/reset.html
similarity index 100%
rename from templates/sso/serviceaccount/reset.html
rename to app/templates/sso/serviceaccount/reset.html
diff --git a/templates/sso/serviceaccount/resetcomplete.html b/app/templates/sso/serviceaccount/resetcomplete.html
similarity index 100%
rename from templates/sso/serviceaccount/resetcomplete.html
rename to app/templates/sso/serviceaccount/resetcomplete.html
diff --git a/tools/__init__.py b/app/tools/__init__.py
similarity index 100%
rename from tools/__init__.py
rename to app/tools/__init__.py
diff --git a/tools/management/__init__.py b/app/tools/management/__init__.py
similarity index 100%
rename from tools/management/__init__.py
rename to app/tools/management/__init__.py
diff --git a/tools/management/commands/__init__.py b/app/tools/management/commands/__init__.py
similarity index 100%
rename from tools/management/commands/__init__.py
rename to app/tools/management/commands/__init__.py
diff --git a/tools/management/commands/edk-apikeys.py b/app/tools/management/commands/edk-apikeys.py
similarity index 100%
rename from tools/management/commands/edk-apikeys.py
rename to app/tools/management/commands/edk-apikeys.py
diff --git a/tools/management/commands/extract-emails.py b/app/tools/management/commands/extract-emails.py
similarity index 100%
rename from tools/management/commands/extract-emails.py
rename to app/tools/management/commands/extract-emails.py
diff --git a/tools/management/commands/munin.py b/app/tools/management/commands/munin.py
similarity index 100%
rename from tools/management/commands/munin.py
rename to app/tools/management/commands/munin.py
diff --git a/tools/management/commands/pep8.py b/app/tools/management/commands/pep8.py
similarity index 100%
rename from tools/management/commands/pep8.py
rename to app/tools/management/commands/pep8.py
diff --git a/tools/management/commands/ts3remove.py b/app/tools/management/commands/ts3remove.py
similarity index 100%
rename from tools/management/commands/ts3remove.py
rename to app/tools/management/commands/ts3remove.py
diff --git a/tools/management/commands/update-directors.py b/app/tools/management/commands/update-directors.py
similarity index 100%
rename from tools/management/commands/update-directors.py
rename to app/tools/management/commands/update-directors.py
diff --git a/tools/models.py b/app/tools/models.py
similarity index 100%
rename from tools/models.py
rename to app/tools/models.py
diff --git a/tools/views.py b/app/tools/views.py
similarity index 100%
rename from tools/views.py
rename to app/tools/views.py
diff --git a/urls.py b/app/urls.py
similarity index 100%
rename from urls.py
rename to app/urls.py
diff --git a/utils.py b/app/utils.py
similarity index 100%
rename from utils.py
rename to app/utils.py
diff --git a/auth_wsgi.py b/auth_wsgi.py
index e2b4519..543d305 100644
--- a/auth_wsgi.py
+++ b/auth_wsgi.py
@@ -1,5 +1,7 @@
+import sys
 import os
 import django.core.handlers.wsgi
 
-os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "../")))
+os.environ['DJANGO_SETTINGS_MODULE'] = 'app.settings'
 application = django.core.handlers.wsgi.WSGIHandler()
diff --git a/setup-env.sh b/bin/setup-env.sh
similarity index 100%
rename from setup-env.sh
rename to bin/setup-env.sh
diff --git a/auth_uwsgi.xml b/etc/auth_uwsgi.xml
similarity index 100%
rename from auth_uwsgi.xml
rename to etc/auth_uwsgi.xml