Updating the settings files to pick up the new applications

settings/base.py

@@ -129,10 +129,8 @@ INSTALLED_APPS = (
     'django.contrib.staticfiles',
     'django.contrib.admin',
     'django.contrib.admindocs',
-    'peer_grading',
-    'common_grading',
     'submissions',
-    'openresponse.peer',
+    'openassessment.peer',
 )
 
 # A sample logging configuration. The only tangible logging

settings/test.py

@@ -5,7 +5,7 @@ Test-specific Django settings.
 # Inherit from base settings
 from .base import *
 
-TEST_APPS = ('peer_grading', 'common_grading',)
+TEST_APPS = ('openassessment.peer', 'submissions',)
 
 # Configure nose
 NOSE_ARGS = [

setup.py

@@ -2,7 +2,7 @@
 
 from setuptools import setup
 
-PACKAGES = ['common_grading', 'peer_grading']
+PACKAGES = ['submissions', 'openassessment.peer']
 
 
 def is_requirement(line):
@@ -39,5 +39,6 @@ setup(
         'Programming Language :: Python',
     ],
     packages=PACKAGES,
+    package_dir={'': 'apps'},
     install_requires=REQUIREMENTS,
 )