diff --git a/Makefile b/Makefile
index e7dfaad0ca..08467bcd07 100644
--- a/Makefile
+++ b/Makefile
@@ -2,31 +2,31 @@ clean:
 	find . -type f -regex ".*\.py[co]$$" -delete
 
 zero:
-	python acom/manage.py migrate main zero 
+	python manage.py migrate main zero 
 
 setup:
 	ansible-playbook app_setup/setup.yml --verbose -i "127.0.0.1," -c local -e working_dir=`pwd`
 
 syncdb:
 	# only run from initial setup
-	python acom/manage.py syncdb
+	python manage.py syncdb
 
 runserver:
 	# run for testing the server
-	python acom/manage.py runserver
+	python manage.py runserver
 
 # already done and should not have to happen again:
 #
 south_init:
-	PYTHON_PATH=./acom python acom/manage.py schemamigration main --initial
+	python manage.py schemamigration main --initial
 
 dbchange:
 	# run this each time we make changes to the model
-	PYTHON_PATH=./acom python acom/manage.py schemamigration main --auto
+	python manage.py schemamigration main --auto
 
 migrate:
         # run this to apply changes to the model
-	PYTHON_PATH=./acom python acom/manage.py migrate
+	python manage.py migrate
 
 dbshell:
 	# access database shell
@@ -34,5 +34,5 @@ dbshell:
 	sudo -u postgres psql -d acom
 
 test:
-	PYTHON_PATH=./acom python acom/manage.py test main
+	python manage.py test main
          
diff --git a/app_setup/setup.yml b/app_setup/setup.yml
index 6887fa30f1..26d13bc0cf 100644
--- a/app_setup/setup.yml
+++ b/app_setup/setup.yml
@@ -59,9 +59,9 @@
       - name: sync django database
         django_manage: >
           command=syncdb
-          app_path=${working_dir}/acom
+          app_path=${working_dir}
 
       - name: run south migrations
-        command: python ${working_dir}/acom/manage.py migrate main
+        command: python ${working_dir}/manage.py migrate main
 
 
diff --git a/acom/manage.py b/manage.py
similarity index 100%
rename from acom/manage.py
rename to manage.py