diff --git a/app_setup/setup.yml b/app_setup/setup.yml
index 26d13bc0cf..8ceea16a65 100644
--- a/app_setup/setup.yml
+++ b/app_setup/setup.yml
@@ -54,7 +54,7 @@
         template: src=templates/settings.py.j2 dest=${working_dir}/acom/settings.py
 
       #- name: sync Django database
-      #  shell: python ${working_dir}/acom/manage.py syncdb
+      #  shell: python ${working_dir}/manage.py syncdb
 
       - name: sync django database
         django_manage: >
diff --git a/app_setup/templates/settings.py.j2 b/app_setup/templates/settings.py.j2
index 5c90dba074..f19f01d0bf 100644
--- a/app_setup/templates/settings.py.j2
+++ b/app_setup/templates/settings.py.j2
@@ -96,7 +96,7 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.messages',
-    'main',
+    'lib.main',
     'south',
 
     # Uncomment the next line to enable the admin:
diff --git a/acom/__init__.py b/lib/__init__.py
similarity index 100%
rename from acom/__init__.py
rename to lib/__init__.py
diff --git a/acom/main/__init__.py b/lib/main/__init__.py
similarity index 100%
rename from acom/main/__init__.py
rename to lib/main/__init__.py
diff --git a/acom/main/migrations/0001_initial.py b/lib/main/migrations/0001_initial.py
similarity index 100%
rename from acom/main/migrations/0001_initial.py
rename to lib/main/migrations/0001_initial.py
diff --git a/acom/main/migrations/__init__.py b/lib/main/migrations/__init__.py
similarity index 100%
rename from acom/main/migrations/__init__.py
rename to lib/main/migrations/__init__.py
diff --git a/acom/main/models/__init__.py b/lib/main/models/__init__.py
similarity index 100%
rename from acom/main/models/__init__.py
rename to lib/main/models/__init__.py
diff --git a/acom/main/tests.py b/lib/main/tests.py
similarity index 100%
rename from acom/main/tests.py
rename to lib/main/tests.py
diff --git a/acom/main/views.py b/lib/main/views.py
similarity index 100%
rename from acom/main/views.py
rename to lib/main/views.py
diff --git a/acom/urls.py b/lib/urls.py
similarity index 100%
rename from acom/urls.py
rename to lib/urls.py
diff --git a/manage.py b/manage.py
index 51308839b4..2e5a5476dd 100755
--- a/manage.py
+++ b/manage.py
@@ -4,6 +4,6 @@ import os
 import sys
 
 if __name__ == '__main__':
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'acom.settings')
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'lib.settings')
     from django.core.management import execute_from_command_line
     execute_from_command_line(sys.argv)