diff --git a/cache_toolbox/templatetags/__init__.py b/djangoapps/circuit/__init__.py similarity index 100% rename from cache_toolbox/templatetags/__init__.py rename to djangoapps/circuit/__init__.py diff --git a/circuit/models.py b/djangoapps/circuit/models.py similarity index 100% rename from circuit/models.py rename to djangoapps/circuit/models.py diff --git a/circuit/tests.py b/djangoapps/circuit/tests.py similarity index 100% rename from circuit/tests.py rename to djangoapps/circuit/tests.py diff --git a/circuit/views.py b/djangoapps/circuit/views.py similarity index 100% rename from circuit/views.py rename to djangoapps/circuit/views.py diff --git a/circuit/__init__.py b/djangoapps/courseware/__init__.py similarity index 100% rename from circuit/__init__.py rename to djangoapps/courseware/__init__.py diff --git a/courseware/capa/__init__.py b/djangoapps/courseware/capa/__init__.py similarity index 100% rename from courseware/capa/__init__.py rename to djangoapps/courseware/capa/__init__.py diff --git a/courseware/capa/calc.py b/djangoapps/courseware/capa/calc.py similarity index 100% rename from courseware/capa/calc.py rename to djangoapps/courseware/capa/calc.py diff --git a/courseware/capa/capa_problem.py b/djangoapps/courseware/capa/capa_problem.py similarity index 100% rename from courseware/capa/capa_problem.py rename to djangoapps/courseware/capa/capa_problem.py diff --git a/courseware/capa/eia.py b/djangoapps/courseware/capa/eia.py similarity index 100% rename from courseware/capa/eia.py rename to djangoapps/courseware/capa/eia.py diff --git a/courseware/capa/inputtypes.py b/djangoapps/courseware/capa/inputtypes.py similarity index 100% rename from courseware/capa/inputtypes.py rename to djangoapps/courseware/capa/inputtypes.py diff --git a/courseware/capa/responsetypes.py b/djangoapps/courseware/capa/responsetypes.py similarity index 100% rename from courseware/capa/responsetypes.py rename to djangoapps/courseware/capa/responsetypes.py diff --git a/courseware/capa/unit.py b/djangoapps/courseware/capa/unit.py similarity index 100% rename from courseware/capa/unit.py rename to djangoapps/courseware/capa/unit.py diff --git a/courseware/capa/util.py b/djangoapps/courseware/capa/util.py similarity index 100% rename from courseware/capa/util.py rename to djangoapps/courseware/capa/util.py diff --git a/courseware/content_parser.py b/djangoapps/courseware/content_parser.py similarity index 100% rename from courseware/content_parser.py rename to djangoapps/courseware/content_parser.py diff --git a/courseware/grades.py b/djangoapps/courseware/grades.py similarity index 100% rename from courseware/grades.py rename to djangoapps/courseware/grades.py diff --git a/courseware/__init__.py b/djangoapps/courseware/management/__init__.py similarity index 100% rename from courseware/__init__.py rename to djangoapps/courseware/management/__init__.py diff --git a/courseware/management/__init__.py b/djangoapps/courseware/management/commands/__init__.py similarity index 100% rename from courseware/management/__init__.py rename to djangoapps/courseware/management/commands/__init__.py diff --git a/courseware/management/commands/check_course.py b/djangoapps/courseware/management/commands/check_course.py similarity index 100% rename from courseware/management/commands/check_course.py rename to djangoapps/courseware/management/commands/check_course.py diff --git a/courseware/migrations/0001_initial.py b/djangoapps/courseware/migrations/0001_initial.py similarity index 100% rename from courseware/migrations/0001_initial.py rename to djangoapps/courseware/migrations/0001_initial.py diff --git a/courseware/migrations/0002_add_indexes.py b/djangoapps/courseware/migrations/0002_add_indexes.py similarity index 100% rename from courseware/migrations/0002_add_indexes.py rename to djangoapps/courseware/migrations/0002_add_indexes.py diff --git a/courseware/migrations/0003_done_grade_cache.py b/djangoapps/courseware/migrations/0003_done_grade_cache.py similarity index 100% rename from courseware/migrations/0003_done_grade_cache.py rename to djangoapps/courseware/migrations/0003_done_grade_cache.py diff --git a/courseware/management/commands/__init__.py b/djangoapps/courseware/migrations/__init__.py similarity index 100% rename from courseware/management/commands/__init__.py rename to djangoapps/courseware/migrations/__init__.py diff --git a/courseware/models.py b/djangoapps/courseware/models.py similarity index 100% rename from courseware/models.py rename to djangoapps/courseware/models.py diff --git a/courseware/module_render.py b/djangoapps/courseware/module_render.py similarity index 100% rename from courseware/module_render.py rename to djangoapps/courseware/module_render.py diff --git a/courseware/modules/__init__.py b/djangoapps/courseware/modules/__init__.py similarity index 100% rename from courseware/modules/__init__.py rename to djangoapps/courseware/modules/__init__.py diff --git a/courseware/modules/capa_module.py b/djangoapps/courseware/modules/capa_module.py similarity index 100% rename from courseware/modules/capa_module.py rename to djangoapps/courseware/modules/capa_module.py diff --git a/courseware/modules/html_module.py b/djangoapps/courseware/modules/html_module.py similarity index 100% rename from courseware/modules/html_module.py rename to djangoapps/courseware/modules/html_module.py diff --git a/courseware/modules/schematic_module.py b/djangoapps/courseware/modules/schematic_module.py similarity index 100% rename from courseware/modules/schematic_module.py rename to djangoapps/courseware/modules/schematic_module.py diff --git a/courseware/modules/seq_module.py b/djangoapps/courseware/modules/seq_module.py similarity index 100% rename from courseware/modules/seq_module.py rename to djangoapps/courseware/modules/seq_module.py diff --git a/courseware/modules/template_module.py b/djangoapps/courseware/modules/template_module.py similarity index 100% rename from courseware/modules/template_module.py rename to djangoapps/courseware/modules/template_module.py diff --git a/courseware/modules/vertical_module.py b/djangoapps/courseware/modules/vertical_module.py similarity index 100% rename from courseware/modules/vertical_module.py rename to djangoapps/courseware/modules/vertical_module.py diff --git a/courseware/modules/video_module.py b/djangoapps/courseware/modules/video_module.py similarity index 100% rename from courseware/modules/video_module.py rename to djangoapps/courseware/modules/video_module.py diff --git a/courseware/modules/x_module.py b/djangoapps/courseware/modules/x_module.py similarity index 100% rename from courseware/modules/x_module.py rename to djangoapps/courseware/modules/x_module.py diff --git a/courseware/progress.py b/djangoapps/courseware/progress.py similarity index 100% rename from courseware/progress.py rename to djangoapps/courseware/progress.py diff --git a/courseware/tests.py b/djangoapps/courseware/tests.py similarity index 100% rename from courseware/tests.py rename to djangoapps/courseware/tests.py diff --git a/courseware/urls.py b/djangoapps/courseware/urls.py similarity index 100% rename from courseware/urls.py rename to djangoapps/courseware/urls.py diff --git a/courseware/views.py b/djangoapps/courseware/views.py similarity index 100% rename from courseware/views.py rename to djangoapps/courseware/views.py diff --git a/simplewiki/__init__.py b/djangoapps/simplewiki/__init__.py similarity index 100% rename from simplewiki/__init__.py rename to djangoapps/simplewiki/__init__.py diff --git a/simplewiki/admin.py b/djangoapps/simplewiki/admin.py similarity index 100% rename from simplewiki/admin.py rename to djangoapps/simplewiki/admin.py diff --git a/simplewiki/mdx_circuit.py b/djangoapps/simplewiki/mdx_circuit.py similarity index 100% rename from simplewiki/mdx_circuit.py rename to djangoapps/simplewiki/mdx_circuit.py diff --git a/simplewiki/mdx_image.py b/djangoapps/simplewiki/mdx_image.py similarity index 100% rename from simplewiki/mdx_image.py rename to djangoapps/simplewiki/mdx_image.py diff --git a/simplewiki/mdx_mathjax.py b/djangoapps/simplewiki/mdx_mathjax.py similarity index 100% rename from simplewiki/mdx_mathjax.py rename to djangoapps/simplewiki/mdx_mathjax.py diff --git a/simplewiki/mdx_video.py b/djangoapps/simplewiki/mdx_video.py similarity index 100% rename from simplewiki/mdx_video.py rename to djangoapps/simplewiki/mdx_video.py diff --git a/simplewiki/mdx_wikipath.py b/djangoapps/simplewiki/mdx_wikipath.py similarity index 100% rename from simplewiki/mdx_wikipath.py rename to djangoapps/simplewiki/mdx_wikipath.py diff --git a/simplewiki/media/css/autosuggest_inquisitor.css b/djangoapps/simplewiki/media/css/autosuggest_inquisitor.css similarity index 100% rename from simplewiki/media/css/autosuggest_inquisitor.css rename to djangoapps/simplewiki/media/css/autosuggest_inquisitor.css diff --git a/simplewiki/media/css/base.css b/djangoapps/simplewiki/media/css/base.css similarity index 100% rename from simplewiki/media/css/base.css rename to djangoapps/simplewiki/media/css/base.css diff --git a/simplewiki/media/css/base_print.css b/djangoapps/simplewiki/media/css/base_print.css similarity index 100% rename from simplewiki/media/css/base_print.css rename to djangoapps/simplewiki/media/css/base_print.css diff --git a/simplewiki/media/css/img_inquisitor/_source/as_pointer.png b/djangoapps/simplewiki/media/css/img_inquisitor/_source/as_pointer.png similarity index 100% rename from simplewiki/media/css/img_inquisitor/_source/as_pointer.png rename to djangoapps/simplewiki/media/css/img_inquisitor/_source/as_pointer.png diff --git a/simplewiki/media/css/img_inquisitor/_source/li_corner.png b/djangoapps/simplewiki/media/css/img_inquisitor/_source/li_corner.png similarity index 100% rename from simplewiki/media/css/img_inquisitor/_source/li_corner.png rename to djangoapps/simplewiki/media/css/img_inquisitor/_source/li_corner.png diff --git a/simplewiki/media/css/img_inquisitor/_source/ul_corner.png b/djangoapps/simplewiki/media/css/img_inquisitor/_source/ul_corner.png similarity index 100% rename from simplewiki/media/css/img_inquisitor/_source/ul_corner.png rename to djangoapps/simplewiki/media/css/img_inquisitor/_source/ul_corner.png diff --git a/simplewiki/media/css/img_inquisitor/as_pointer.gif b/djangoapps/simplewiki/media/css/img_inquisitor/as_pointer.gif similarity index 100% rename from simplewiki/media/css/img_inquisitor/as_pointer.gif rename to djangoapps/simplewiki/media/css/img_inquisitor/as_pointer.gif diff --git a/simplewiki/media/css/img_inquisitor/hl_corner_bl.gif b/djangoapps/simplewiki/media/css/img_inquisitor/hl_corner_bl.gif similarity index 100% rename from simplewiki/media/css/img_inquisitor/hl_corner_bl.gif rename to djangoapps/simplewiki/media/css/img_inquisitor/hl_corner_bl.gif diff --git a/simplewiki/media/css/img_inquisitor/hl_corner_br.gif b/djangoapps/simplewiki/media/css/img_inquisitor/hl_corner_br.gif similarity index 100% rename from simplewiki/media/css/img_inquisitor/hl_corner_br.gif rename to djangoapps/simplewiki/media/css/img_inquisitor/hl_corner_br.gif diff --git a/simplewiki/media/css/img_inquisitor/hl_corner_tl.gif b/djangoapps/simplewiki/media/css/img_inquisitor/hl_corner_tl.gif similarity index 100% rename from simplewiki/media/css/img_inquisitor/hl_corner_tl.gif rename to djangoapps/simplewiki/media/css/img_inquisitor/hl_corner_tl.gif diff --git a/simplewiki/media/css/img_inquisitor/hl_corner_tr.gif b/djangoapps/simplewiki/media/css/img_inquisitor/hl_corner_tr.gif similarity index 100% rename from simplewiki/media/css/img_inquisitor/hl_corner_tr.gif rename to djangoapps/simplewiki/media/css/img_inquisitor/hl_corner_tr.gif diff --git a/simplewiki/media/css/img_inquisitor/ul_corner_bl.gif b/djangoapps/simplewiki/media/css/img_inquisitor/ul_corner_bl.gif similarity index 100% rename from simplewiki/media/css/img_inquisitor/ul_corner_bl.gif rename to djangoapps/simplewiki/media/css/img_inquisitor/ul_corner_bl.gif diff --git a/simplewiki/media/css/img_inquisitor/ul_corner_br.gif b/djangoapps/simplewiki/media/css/img_inquisitor/ul_corner_br.gif similarity index 100% rename from simplewiki/media/css/img_inquisitor/ul_corner_br.gif rename to djangoapps/simplewiki/media/css/img_inquisitor/ul_corner_br.gif diff --git a/simplewiki/media/css/img_inquisitor/ul_corner_tl.gif b/djangoapps/simplewiki/media/css/img_inquisitor/ul_corner_tl.gif similarity index 100% rename from simplewiki/media/css/img_inquisitor/ul_corner_tl.gif rename to djangoapps/simplewiki/media/css/img_inquisitor/ul_corner_tl.gif diff --git a/simplewiki/media/css/img_inquisitor/ul_corner_tr.gif b/djangoapps/simplewiki/media/css/img_inquisitor/ul_corner_tr.gif similarity index 100% rename from simplewiki/media/css/img_inquisitor/ul_corner_tr.gif rename to djangoapps/simplewiki/media/css/img_inquisitor/ul_corner_tr.gif diff --git a/simplewiki/media/img/box_corner_bl.gif b/djangoapps/simplewiki/media/img/box_corner_bl.gif similarity index 100% rename from simplewiki/media/img/box_corner_bl.gif rename to djangoapps/simplewiki/media/img/box_corner_bl.gif diff --git a/simplewiki/media/img/box_corner_br.gif b/djangoapps/simplewiki/media/img/box_corner_br.gif similarity index 100% rename from simplewiki/media/img/box_corner_br.gif rename to djangoapps/simplewiki/media/img/box_corner_br.gif diff --git a/simplewiki/media/img/box_corner_tl.gif b/djangoapps/simplewiki/media/img/box_corner_tl.gif similarity index 100% rename from simplewiki/media/img/box_corner_tl.gif rename to djangoapps/simplewiki/media/img/box_corner_tl.gif diff --git a/simplewiki/media/img/box_corner_tr.gif b/djangoapps/simplewiki/media/img/box_corner_tr.gif similarity index 100% rename from simplewiki/media/img/box_corner_tr.gif rename to djangoapps/simplewiki/media/img/box_corner_tr.gif diff --git a/simplewiki/media/img/delete.gif b/djangoapps/simplewiki/media/img/delete.gif similarity index 100% rename from simplewiki/media/img/delete.gif rename to djangoapps/simplewiki/media/img/delete.gif diff --git a/simplewiki/media/img/delete_grey.gif b/djangoapps/simplewiki/media/img/delete_grey.gif similarity index 100% rename from simplewiki/media/img/delete_grey.gif rename to djangoapps/simplewiki/media/img/delete_grey.gif diff --git a/simplewiki/media/js/bsn.AutoSuggest_c_2.0.js b/djangoapps/simplewiki/media/js/bsn.AutoSuggest_c_2.0.js similarity index 100% rename from simplewiki/media/js/bsn.AutoSuggest_c_2.0.js rename to djangoapps/simplewiki/media/js/bsn.AutoSuggest_c_2.0.js diff --git a/simplewiki/models.py b/djangoapps/simplewiki/models.py similarity index 100% rename from simplewiki/models.py rename to djangoapps/simplewiki/models.py diff --git a/simplewiki/settings.py b/djangoapps/simplewiki/settings.py similarity index 100% rename from simplewiki/settings.py rename to djangoapps/simplewiki/settings.py diff --git a/courseware/migrations/__init__.py b/djangoapps/simplewiki/templatetags/__init__.py similarity index 100% rename from courseware/migrations/__init__.py rename to djangoapps/simplewiki/templatetags/__init__.py diff --git a/simplewiki/templatetags/simplewiki_utils.py b/djangoapps/simplewiki/templatetags/simplewiki_utils.py similarity index 100% rename from simplewiki/templatetags/simplewiki_utils.py rename to djangoapps/simplewiki/templatetags/simplewiki_utils.py diff --git a/simplewiki/tests.py b/djangoapps/simplewiki/tests.py similarity index 100% rename from simplewiki/tests.py rename to djangoapps/simplewiki/tests.py diff --git a/simplewiki/urls.py b/djangoapps/simplewiki/urls.py similarity index 100% rename from simplewiki/urls.py rename to djangoapps/simplewiki/urls.py diff --git a/simplewiki/usage.txt b/djangoapps/simplewiki/usage.txt similarity index 100% rename from simplewiki/usage.txt rename to djangoapps/simplewiki/usage.txt diff --git a/simplewiki/views.py b/djangoapps/simplewiki/views.py similarity index 100% rename from simplewiki/views.py rename to djangoapps/simplewiki/views.py diff --git a/simplewiki/views_attachments.py b/djangoapps/simplewiki/views_attachments.py similarity index 100% rename from simplewiki/views_attachments.py rename to djangoapps/simplewiki/views_attachments.py diff --git a/django_future/__init__.py b/djangoapps/static_template_view/__init__.py similarity index 100% rename from django_future/__init__.py rename to djangoapps/static_template_view/__init__.py diff --git a/perfstats/models.py b/djangoapps/static_template_view/models.py similarity index 100% rename from perfstats/models.py rename to djangoapps/static_template_view/models.py diff --git a/perfstats/tests.py b/djangoapps/static_template_view/tests.py similarity index 100% rename from perfstats/tests.py rename to djangoapps/static_template_view/tests.py diff --git a/static_template_view/views.py b/djangoapps/static_template_view/views.py similarity index 100% rename from static_template_view/views.py rename to djangoapps/static_template_view/views.py diff --git a/perfstats/__init__.py b/djangoapps/staticbook/__init__.py similarity index 100% rename from perfstats/__init__.py rename to djangoapps/staticbook/__init__.py diff --git a/static_template_view/models.py b/djangoapps/staticbook/models.py similarity index 100% rename from static_template_view/models.py rename to djangoapps/staticbook/models.py diff --git a/static_template_view/tests.py b/djangoapps/staticbook/tests.py similarity index 100% rename from static_template_view/tests.py rename to djangoapps/staticbook/tests.py diff --git a/staticbook/views.py b/djangoapps/staticbook/views.py similarity index 100% rename from staticbook/views.py rename to djangoapps/staticbook/views.py diff --git a/simplewiki/templatetags/__init__.py b/djangoapps/student/__init__.py similarity index 100% rename from simplewiki/templatetags/__init__.py rename to djangoapps/student/__init__.py diff --git a/static_template_view/__init__.py b/djangoapps/student/management/__init__.py similarity index 100% rename from static_template_view/__init__.py rename to djangoapps/student/management/__init__.py diff --git a/staticbook/__init__.py b/djangoapps/student/management/commands/__init__.py similarity index 100% rename from staticbook/__init__.py rename to djangoapps/student/management/commands/__init__.py diff --git a/student/management/commands/assigngroups.py b/djangoapps/student/management/commands/assigngroups.py similarity index 100% rename from student/management/commands/assigngroups.py rename to djangoapps/student/management/commands/assigngroups.py diff --git a/student/management/commands/emaillist.py b/djangoapps/student/management/commands/emaillist.py similarity index 100% rename from student/management/commands/emaillist.py rename to djangoapps/student/management/commands/emaillist.py diff --git a/student/management/commands/massemail.py b/djangoapps/student/management/commands/massemail.py similarity index 100% rename from student/management/commands/massemail.py rename to djangoapps/student/management/commands/massemail.py diff --git a/student/management/commands/massemailtxt.py b/djangoapps/student/management/commands/massemailtxt.py similarity index 100% rename from student/management/commands/massemailtxt.py rename to djangoapps/student/management/commands/massemailtxt.py diff --git a/student/management/commands/userinfo.py b/djangoapps/student/management/commands/userinfo.py similarity index 100% rename from student/management/commands/userinfo.py rename to djangoapps/student/management/commands/userinfo.py diff --git a/student/migrations/0001_initial.py b/djangoapps/student/migrations/0001_initial.py similarity index 100% rename from student/migrations/0001_initial.py rename to djangoapps/student/migrations/0001_initial.py diff --git a/student/migrations/0002_text_to_varchar_and_indexes.py b/djangoapps/student/migrations/0002_text_to_varchar_and_indexes.py similarity index 100% rename from student/migrations/0002_text_to_varchar_and_indexes.py rename to djangoapps/student/migrations/0002_text_to_varchar_and_indexes.py diff --git a/student/migrations/0003_auto__add_usertestgroup.py b/djangoapps/student/migrations/0003_auto__add_usertestgroup.py similarity index 100% rename from student/migrations/0003_auto__add_usertestgroup.py rename to djangoapps/student/migrations/0003_auto__add_usertestgroup.py diff --git a/student/migrations/0004_add_email_index.py b/djangoapps/student/migrations/0004_add_email_index.py similarity index 100% rename from student/migrations/0004_add_email_index.py rename to djangoapps/student/migrations/0004_add_email_index.py diff --git a/student/__init__.py b/djangoapps/student/migrations/__init__.py similarity index 100% rename from student/__init__.py rename to djangoapps/student/migrations/__init__.py diff --git a/student/models.py b/djangoapps/student/models.py similarity index 100% rename from student/models.py rename to djangoapps/student/models.py diff --git a/staticbook/tests.py b/djangoapps/student/tests.py similarity index 100% rename from staticbook/tests.py rename to djangoapps/student/tests.py diff --git a/student/views.py b/djangoapps/student/views.py similarity index 100% rename from student/views.py rename to djangoapps/student/views.py diff --git a/student/management/__init__.py b/djangoapps/track/__init__.py similarity index 100% rename from student/management/__init__.py rename to djangoapps/track/__init__.py diff --git a/track/middleware.py b/djangoapps/track/middleware.py similarity index 100% rename from track/middleware.py rename to djangoapps/track/middleware.py diff --git a/staticbook/models.py b/djangoapps/track/models.py similarity index 100% rename from staticbook/models.py rename to djangoapps/track/models.py diff --git a/student/tests.py b/djangoapps/track/tests.py similarity index 100% rename from student/tests.py rename to djangoapps/track/tests.py diff --git a/track/views.py b/djangoapps/track/views.py similarity index 100% rename from track/views.py rename to djangoapps/track/views.py diff --git a/cache_toolbox/COPYING b/lib/cache_toolbox/COPYING similarity index 100% rename from cache_toolbox/COPYING rename to lib/cache_toolbox/COPYING diff --git a/cache_toolbox/README.rst b/lib/cache_toolbox/README.rst similarity index 100% rename from cache_toolbox/README.rst rename to lib/cache_toolbox/README.rst diff --git a/cache_toolbox/__init__.py b/lib/cache_toolbox/__init__.py similarity index 100% rename from cache_toolbox/__init__.py rename to lib/cache_toolbox/__init__.py diff --git a/cache_toolbox/app_settings.py b/lib/cache_toolbox/app_settings.py similarity index 100% rename from cache_toolbox/app_settings.py rename to lib/cache_toolbox/app_settings.py diff --git a/cache_toolbox/core.py b/lib/cache_toolbox/core.py similarity index 100% rename from cache_toolbox/core.py rename to lib/cache_toolbox/core.py diff --git a/cache_toolbox/middleware.py b/lib/cache_toolbox/middleware.py similarity index 100% rename from cache_toolbox/middleware.py rename to lib/cache_toolbox/middleware.py diff --git a/cache_toolbox/model.py b/lib/cache_toolbox/model.py similarity index 100% rename from cache_toolbox/model.py rename to lib/cache_toolbox/model.py diff --git a/cache_toolbox/relation.py b/lib/cache_toolbox/relation.py similarity index 100% rename from cache_toolbox/relation.py rename to lib/cache_toolbox/relation.py diff --git a/student/management/commands/__init__.py b/lib/cache_toolbox/templatetags/__init__.py similarity index 100% rename from student/management/commands/__init__.py rename to lib/cache_toolbox/templatetags/__init__.py diff --git a/cache_toolbox/templatetags/cache_toolbox.py b/lib/cache_toolbox/templatetags/cache_toolbox.py similarity index 100% rename from cache_toolbox/templatetags/cache_toolbox.py rename to lib/cache_toolbox/templatetags/cache_toolbox.py diff --git a/student/migrations/__init__.py b/lib/django_future/__init__.py similarity index 100% rename from student/migrations/__init__.py rename to lib/django_future/__init__.py diff --git a/django_future/csrf.py b/lib/django_future/csrf.py similarity index 100% rename from django_future/csrf.py rename to lib/django_future/csrf.py diff --git a/mitxmako/README b/lib/mitxmako/README similarity index 100% rename from mitxmako/README rename to lib/mitxmako/README diff --git a/mitxmako/__init__.py b/lib/mitxmako/__init__.py similarity index 100% rename from mitxmako/__init__.py rename to lib/mitxmako/__init__.py diff --git a/mitxmako/middleware.py b/lib/mitxmako/middleware.py similarity index 100% rename from mitxmako/middleware.py rename to lib/mitxmako/middleware.py diff --git a/mitxmako/shortcuts.py b/lib/mitxmako/shortcuts.py similarity index 100% rename from mitxmako/shortcuts.py rename to lib/mitxmako/shortcuts.py diff --git a/mitxmako/template.py b/lib/mitxmako/template.py similarity index 100% rename from mitxmako/template.py rename to lib/mitxmako/template.py diff --git a/track/__init__.py b/lib/perfstats/__init__.py similarity index 100% rename from track/__init__.py rename to lib/perfstats/__init__.py diff --git a/perfstats/middleware.py b/lib/perfstats/middleware.py similarity index 100% rename from perfstats/middleware.py rename to lib/perfstats/middleware.py diff --git a/track/models.py b/lib/perfstats/models.py similarity index 100% rename from track/models.py rename to lib/perfstats/models.py diff --git a/track/tests.py b/lib/perfstats/tests.py similarity index 100% rename from track/tests.py rename to lib/perfstats/tests.py diff --git a/perfstats/views.py b/lib/perfstats/views.py similarity index 100% rename from perfstats/views.py rename to lib/perfstats/views.py diff --git a/util/__init__.py b/lib/util/__init__.py similarity index 100% rename from util/__init__.py rename to lib/util/__init__.py diff --git a/util/middleware.py b/lib/util/middleware.py similarity index 100% rename from util/middleware.py rename to lib/util/middleware.py diff --git a/util/models.py b/lib/util/models.py similarity index 100% rename from util/models.py rename to lib/util/models.py diff --git a/util/tests.py b/lib/util/tests.py similarity index 100% rename from util/tests.py rename to lib/util/tests.py diff --git a/util/views.py b/lib/util/views.py similarity index 100% rename from util/views.py rename to lib/util/views.py