diff --git a/cms/djangoapps/__init__.py b/cms/djangoapps/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/cms/djangoapps/contentstore/tests/test_contentstore.py b/cms/djangoapps/contentstore/tests/test_contentstore.py
index 983b7babd8..1d2b651485 100644
--- a/cms/djangoapps/contentstore/tests/test_contentstore.py
+++ b/cms/djangoapps/contentstore/tests/test_contentstore.py
@@ -13,7 +13,7 @@ import copy
 from json import loads
 
 from django.contrib.auth.models import User
-from cms.djangoapps.contentstore.utils import get_modulestore
+from contentstore.utils import get_modulestore
 
 from utils import ModuleStoreTestCase, parse_json
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
diff --git a/cms/djangoapps/contentstore/tests/test_course_settings.py b/cms/djangoapps/contentstore/tests/test_course_settings.py
index 136af04190..9cf0bf4085 100644
--- a/cms/djangoapps/contentstore/tests/test_course_settings.py
+++ b/cms/djangoapps/contentstore/tests/test_course_settings.py
@@ -10,16 +10,16 @@ from django.core.urlresolvers import reverse
 from django.utils.timezone import UTC
 
 from xmodule.modulestore import Location
-from cms.djangoapps.models.settings.course_details import (CourseDetails,
+from models.settings.course_details import (CourseDetails,
                                                     CourseSettingsEncoder)
-from cms.djangoapps.models.settings.course_grading import CourseGradingModel
-from cms.djangoapps.contentstore.utils import get_modulestore
+from models.settings.course_grading import CourseGradingModel
+from contentstore.utils import get_modulestore
 
 from django.test import TestCase
 from utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 
-from cms.djangoapps.models.settings.course_metadata import CourseMetadata
+from models.settings.course_metadata import CourseMetadata
 from xmodule.modulestore.xml_importer import import_from_xml
 from xmodule.modulestore.django import modulestore
 
diff --git a/cms/djangoapps/contentstore/tests/test_course_updates.py b/cms/djangoapps/contentstore/tests/test_course_updates.py
index c57f1322f5..6a3a1e21f7 100644
--- a/cms/djangoapps/contentstore/tests/test_course_updates.py
+++ b/cms/djangoapps/contentstore/tests/test_course_updates.py
@@ -1,4 +1,4 @@
-from cms.djangoapps.contentstore.tests.test_course_settings import CourseTestCase
+from contentstore.tests.test_course_settings import CourseTestCase
 from django.core.urlresolvers import reverse
 import json
 
diff --git a/cms/djangoapps/contentstore/tests/test_utils.py b/cms/djangoapps/contentstore/tests/test_utils.py
index 09e3b045f9..4ab40d17a8 100644
--- a/cms/djangoapps/contentstore/tests/test_utils.py
+++ b/cms/djangoapps/contentstore/tests/test_utils.py
@@ -1,4 +1,4 @@
-from  cms.djangoapps.contentstore import utils
+from  contentstore import utils
 import mock
 from django.test import TestCase
 
diff --git a/cms/djangoapps/contentstore/tests/tests.py b/cms/djangoapps/contentstore/tests/tests.py
index c4a46459e2..98380fd0af 100644
--- a/cms/djangoapps/contentstore/tests/tests.py
+++ b/cms/djangoapps/contentstore/tests/tests.py
@@ -8,7 +8,7 @@ import json
 from fs.osfs import OSFS
 import copy
 
-from cms.djangoapps.contentstore.utils import get_modulestore
+from contentstore.utils import get_modulestore
 
 from xmodule.modulestore import Location
 from xmodule.modulestore.store_utilities import clone_course
diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py
index 0350c9ed1a..259ae5728d 100644
--- a/cms/djangoapps/contentstore/views.py
+++ b/cms/djangoapps/contentstore/views.py
@@ -58,12 +58,12 @@ from contentstore.course_info_model import get_course_updates,\
 from cache_toolbox.core import del_cached_content
 from xmodule.timeparse import stringify_time
 from contentstore.module_info_model import get_module_info, set_module_info
-from cms.djangoapps.models.settings.course_details import CourseDetails,\
+from models.settings.course_details import CourseDetails,\
     CourseSettingsEncoder
-from cms.djangoapps.models.settings.course_grading import CourseGradingModel
-from cms.djangoapps.contentstore.utils import get_modulestore
+from models.settings.course_grading import CourseGradingModel
+from contentstore.utils import get_modulestore
 from django.shortcuts import redirect
-from cms.djangoapps.models.settings.course_metadata import CourseMetadata
+from models.settings.course_metadata import CourseMetadata
 
 # to install PIL on MacOSX: 'easy_install http://dist.repoze.org/PIL-1.1.6.tar.gz'
 
diff --git a/cms/djangoapps/models/settings/course_details.py b/cms/djangoapps/models/settings/course_details.py
index 1962a6a33a..d3cd5fe164 100644
--- a/cms/djangoapps/models/settings/course_details.py
+++ b/cms/djangoapps/models/settings/course_details.py
@@ -7,8 +7,8 @@ from json.encoder import JSONEncoder
 import time
 from contentstore.utils import get_modulestore
 from util.converters import jsdate_to_time, time_to_date
-from cms.djangoapps.models.settings import course_grading
-from cms.djangoapps.contentstore.utils import update_item
+from models.settings import course_grading
+from contentstore.utils import update_item
 import re
 import logging
 
diff --git a/common/lib/capa/capa/responsetypes.py b/common/lib/capa/capa/responsetypes.py
index 49ccb9b415..e87fa4f74c 100644
--- a/common/lib/capa/capa/responsetypes.py
+++ b/common/lib/capa/capa/responsetypes.py
@@ -231,16 +231,14 @@ class LoncapaResponse(object):
         # hint specified by function?
         hintfn = hintgroup.get('hintfn')
         if hintfn:
-            '''
-            Hint is determined by a function defined in the <script> context; evaluate
-            that function to obtain list of hint, hintmode for each answer_id.
+            # Hint is determined by a function defined in the <script> context; evaluate
+            # that function to obtain list of hint, hintmode for each answer_id.
 
-            The function should take arguments (answer_ids, student_answers, new_cmap, old_cmap)
-            and it should modify new_cmap as appropriate.
+            # The function should take arguments (answer_ids, student_answers, new_cmap, old_cmap)
+            # and it should modify new_cmap as appropriate.
 
-            We may extend this in the future to add another argument which provides a
-            callback procedure to a social hint generation system.
-            '''
+            # We may extend this in the future to add another argument which provides a
+            # callback procedure to a social hint generation system.
             if not hintfn in self.context:
                 msg = 'missing specified hint function %s in script context' % hintfn
                 msg += "\nSee XML source line %s" % getattr(self.xml, 'sourceline', '<unavailable>')
@@ -329,7 +327,7 @@ class LoncapaResponse(object):
         """ Render a <div> for a message that applies to the entire response.
 
         *response_msg* is a string, which may contain XHTML markup
-        
+
         Returns an etree element representing the response message <div> """
         # First try wrapping the text in a <div> and parsing
         # it as an XHTML tree
@@ -1104,7 +1102,7 @@ def sympy_check2():
                 # the form:
                 # {'overall_message': STRING,
                 #  'input_list': [{ 'ok': BOOLEAN, 'msg': STRING }, ...] }
-                # 
+                #
                 # This allows the function to return an 'overall message'
                 # that applies to the entire problem, as well as correct/incorrect
                 # status and messages for individual inputs
@@ -1988,7 +1986,7 @@ class AnnotationResponse(LoncapaResponse):
 
         for inputfield in self.inputfields:
             option_scoring = dict([(option['id'], {
-                    'correctness': choices.get(option['choice']), 
+                    'correctness': choices.get(option['choice']),
                     'points': scoring.get(option['choice'])
                 }) for option in self._find_options(inputfield) ])