diff --git a/common/static/coffee/src/discussion/content.coffee b/common/static/common/js/discussion/content.js
similarity index 100%
rename from common/static/coffee/src/discussion/content.coffee
rename to common/static/common/js/discussion/content.js
diff --git a/common/static/coffee/src/discussion/discussion.coffee b/common/static/common/js/discussion/discussion.js
similarity index 100%
rename from common/static/coffee/src/discussion/discussion.coffee
rename to common/static/common/js/discussion/discussion.js
diff --git a/common/static/coffee/src/discussion/discussion_module_view.coffee b/common/static/common/js/discussion/discussion_module_view.js
similarity index 100%
rename from common/static/coffee/src/discussion/discussion_module_view.coffee
rename to common/static/common/js/discussion/discussion_module_view.js
diff --git a/common/static/coffee/src/discussion/discussion_router.coffee b/common/static/common/js/discussion/discussion_router.js
similarity index 100%
rename from common/static/coffee/src/discussion/discussion_router.coffee
rename to common/static/common/js/discussion/discussion_router.js
diff --git a/common/static/coffee/src/discussion/main.coffee b/common/static/common/js/discussion/main.js
similarity index 100%
rename from common/static/coffee/src/discussion/main.coffee
rename to common/static/common/js/discussion/main.js
diff --git a/common/static/coffee/src/discussion/models/discussion_course_settings.coffee b/common/static/common/js/discussion/models/discussion_course_settings.js
similarity index 100%
rename from common/static/coffee/src/discussion/models/discussion_course_settings.coffee
rename to common/static/common/js/discussion/models/discussion_course_settings.js
diff --git a/common/static/coffee/src/discussion/models/discussion_user.coffee b/common/static/common/js/discussion/models/discussion_user.js
similarity index 100%
rename from common/static/coffee/src/discussion/models/discussion_user.coffee
rename to common/static/common/js/discussion/models/discussion_user.js
diff --git a/common/static/coffee/src/discussion/utils.coffee b/common/static/common/js/discussion/utils.js
similarity index 100%
rename from common/static/coffee/src/discussion/utils.coffee
rename to common/static/common/js/discussion/utils.js
diff --git a/common/static/coffee/src/discussion/views/discussion_content_view.coffee b/common/static/common/js/discussion/views/discussion_content_view.js
similarity index 100%
rename from common/static/coffee/src/discussion/views/discussion_content_view.coffee
rename to common/static/common/js/discussion/views/discussion_content_view.js
diff --git a/common/static/coffee/src/discussion/views/discussion_thread_edit_view.js b/common/static/common/js/discussion/views/discussion_thread_edit_view.js
similarity index 100%
rename from common/static/coffee/src/discussion/views/discussion_thread_edit_view.js
rename to common/static/common/js/discussion/views/discussion_thread_edit_view.js
diff --git a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/common/static/common/js/discussion/views/discussion_thread_list_view.js
similarity index 100%
rename from common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
rename to common/static/common/js/discussion/views/discussion_thread_list_view.js
diff --git a/common/static/coffee/src/discussion/views/discussion_thread_profile_view.coffee b/common/static/common/js/discussion/views/discussion_thread_profile_view.js
similarity index 100%
rename from common/static/coffee/src/discussion/views/discussion_thread_profile_view.coffee
rename to common/static/common/js/discussion/views/discussion_thread_profile_view.js
diff --git a/common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee b/common/static/common/js/discussion/views/discussion_thread_show_view.js
similarity index 100%
rename from common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee
rename to common/static/common/js/discussion/views/discussion_thread_show_view.js
diff --git a/common/static/coffee/src/discussion/views/discussion_thread_view.coffee b/common/static/common/js/discussion/views/discussion_thread_view.js
similarity index 100%
rename from common/static/coffee/src/discussion/views/discussion_thread_view.coffee
rename to common/static/common/js/discussion/views/discussion_thread_view.js
diff --git a/common/static/coffee/src/discussion/views/discussion_topic_menu_view.js b/common/static/common/js/discussion/views/discussion_topic_menu_view.js
similarity index 100%
rename from common/static/coffee/src/discussion/views/discussion_topic_menu_view.js
rename to common/static/common/js/discussion/views/discussion_topic_menu_view.js
diff --git a/common/static/coffee/src/discussion/views/discussion_user_profile_view.coffee b/common/static/common/js/discussion/views/discussion_user_profile_view.js
similarity index 100%
rename from common/static/coffee/src/discussion/views/discussion_user_profile_view.coffee
rename to common/static/common/js/discussion/views/discussion_user_profile_view.js
diff --git a/common/static/coffee/src/discussion/views/new_post_view.coffee b/common/static/common/js/discussion/views/new_post_view.js
similarity index 100%
rename from common/static/coffee/src/discussion/views/new_post_view.coffee
rename to common/static/common/js/discussion/views/new_post_view.js
diff --git a/common/static/coffee/src/discussion/views/response_comment_edit_view.coffee b/common/static/common/js/discussion/views/response_comment_edit_view.js
similarity index 100%
rename from common/static/coffee/src/discussion/views/response_comment_edit_view.coffee
rename to common/static/common/js/discussion/views/response_comment_edit_view.js
diff --git a/common/static/coffee/src/discussion/views/response_comment_show_view.coffee b/common/static/common/js/discussion/views/response_comment_show_view.js
similarity index 100%
rename from common/static/coffee/src/discussion/views/response_comment_show_view.coffee
rename to common/static/common/js/discussion/views/response_comment_show_view.js
diff --git a/common/static/coffee/src/discussion/views/response_comment_view.coffee b/common/static/common/js/discussion/views/response_comment_view.js
similarity index 100%
rename from common/static/coffee/src/discussion/views/response_comment_view.coffee
rename to common/static/common/js/discussion/views/response_comment_view.js
diff --git a/common/static/coffee/src/discussion/views/thread_response_edit_view.coffee b/common/static/common/js/discussion/views/thread_response_edit_view.js
similarity index 100%
rename from common/static/coffee/src/discussion/views/thread_response_edit_view.coffee
rename to common/static/common/js/discussion/views/thread_response_edit_view.js
diff --git a/common/static/coffee/src/discussion/views/thread_response_show_view.coffee b/common/static/common/js/discussion/views/thread_response_show_view.js
similarity index 100%
rename from common/static/coffee/src/discussion/views/thread_response_show_view.coffee
rename to common/static/common/js/discussion/views/thread_response_show_view.js
diff --git a/common/static/coffee/src/discussion/views/thread_response_view.coffee b/common/static/common/js/discussion/views/thread_response_view.js
similarity index 100%
rename from common/static/coffee/src/discussion/views/thread_response_view.coffee
rename to common/static/common/js/discussion/views/thread_response_view.js
diff --git a/common/static/coffee/spec/discussion/content_spec.coffee b/common/static/common/js/spec/discussion/content_spec.js
similarity index 100%
rename from common/static/coffee/spec/discussion/content_spec.coffee
rename to common/static/common/js/spec/discussion/content_spec.js
diff --git a/common/static/coffee/spec/discussion/utils_spec.coffee b/common/static/common/js/spec/discussion/utils_spec.js
similarity index 100%
rename from common/static/coffee/spec/discussion/utils_spec.coffee
rename to common/static/common/js/spec/discussion/utils_spec.js
diff --git a/common/static/coffee/spec/discussion/view/discussion_content_view_spec.coffee b/common/static/common/js/spec/discussion/view/discussion_content_view_spec.js
similarity index 100%
rename from common/static/coffee/spec/discussion/view/discussion_content_view_spec.coffee
rename to common/static/common/js/spec/discussion/view/discussion_content_view_spec.js
diff --git a/common/static/coffee/spec/discussion/view/discussion_thread_edit_view_spec.js b/common/static/common/js/spec/discussion/view/discussion_thread_edit_view_spec.js
similarity index 100%
rename from common/static/coffee/spec/discussion/view/discussion_thread_edit_view_spec.js
rename to common/static/common/js/spec/discussion/view/discussion_thread_edit_view_spec.js
diff --git a/common/static/coffee/spec/discussion/view/discussion_thread_list_view_spec.coffee b/common/static/common/js/spec/discussion/view/discussion_thread_list_view_spec.js
similarity index 100%
rename from common/static/coffee/spec/discussion/view/discussion_thread_list_view_spec.coffee
rename to common/static/common/js/spec/discussion/view/discussion_thread_list_view_spec.js
diff --git a/common/static/coffee/spec/discussion/view/discussion_thread_profile_view_spec.coffee b/common/static/common/js/spec/discussion/view/discussion_thread_profile_view_spec.js
similarity index 100%
rename from common/static/coffee/spec/discussion/view/discussion_thread_profile_view_spec.coffee
rename to common/static/common/js/spec/discussion/view/discussion_thread_profile_view_spec.js
diff --git a/common/static/coffee/spec/discussion/view/discussion_thread_show_view_spec.coffee b/common/static/common/js/spec/discussion/view/discussion_thread_show_view_spec.js
similarity index 100%
rename from common/static/coffee/spec/discussion/view/discussion_thread_show_view_spec.coffee
rename to common/static/common/js/spec/discussion/view/discussion_thread_show_view_spec.js
diff --git a/common/static/coffee/spec/discussion/view/discussion_thread_view_spec.coffee b/common/static/common/js/spec/discussion/view/discussion_thread_view_spec.js
similarity index 100%
rename from common/static/coffee/spec/discussion/view/discussion_thread_view_spec.coffee
rename to common/static/common/js/spec/discussion/view/discussion_thread_view_spec.js
diff --git a/common/static/coffee/spec/discussion/view/discussion_topic_menu_view_spec.js b/common/static/common/js/spec/discussion/view/discussion_topic_menu_view_spec.js
similarity index 100%
rename from common/static/coffee/spec/discussion/view/discussion_topic_menu_view_spec.js
rename to common/static/common/js/spec/discussion/view/discussion_topic_menu_view_spec.js
diff --git a/common/static/coffee/spec/discussion/view/discussion_user_profile_view_spec.coffee b/common/static/common/js/spec/discussion/view/discussion_user_profile_view_spec.js
similarity index 100%
rename from common/static/coffee/spec/discussion/view/discussion_user_profile_view_spec.coffee
rename to common/static/common/js/spec/discussion/view/discussion_user_profile_view_spec.js
diff --git a/common/static/coffee/spec/discussion/view/discussion_view_spec_helper.coffee b/common/static/common/js/spec/discussion/view/discussion_view_spec_helper.js
similarity index 100%
rename from common/static/coffee/spec/discussion/view/discussion_view_spec_helper.coffee
rename to common/static/common/js/spec/discussion/view/discussion_view_spec_helper.js
diff --git a/common/static/coffee/spec/discussion/view/new_post_view_spec.coffee b/common/static/common/js/spec/discussion/view/new_post_view_spec.js
similarity index 100%
rename from common/static/coffee/spec/discussion/view/new_post_view_spec.coffee
rename to common/static/common/js/spec/discussion/view/new_post_view_spec.js
diff --git a/common/static/coffee/spec/discussion/view/response_comment_show_view_spec.coffee b/common/static/common/js/spec/discussion/view/response_comment_show_view_spec.js
similarity index 100%
rename from common/static/coffee/spec/discussion/view/response_comment_show_view_spec.coffee
rename to common/static/common/js/spec/discussion/view/response_comment_show_view_spec.js
diff --git a/common/static/coffee/spec/discussion/view/response_comment_view_spec.coffee b/common/static/common/js/spec/discussion/view/response_comment_view_spec.js
similarity index 100%
rename from common/static/coffee/spec/discussion/view/response_comment_view_spec.coffee
rename to common/static/common/js/spec/discussion/view/response_comment_view_spec.js
diff --git a/common/static/coffee/spec/discussion/view/thread_response_show_view_spec.coffee b/common/static/common/js/spec/discussion/view/thread_response_show_view_spec.js
similarity index 100%
rename from common/static/coffee/spec/discussion/view/thread_response_show_view_spec.coffee
rename to common/static/common/js/spec/discussion/view/thread_response_show_view_spec.js
diff --git a/common/static/coffee/spec/discussion/view/thread_response_view_spec.coffee b/common/static/common/js/spec/discussion/view/thread_response_view_spec.js
similarity index 100%
rename from common/static/coffee/spec/discussion/view/thread_response_view_spec.coffee
rename to common/static/common/js/spec/discussion/view/thread_response_view_spec.js
diff --git a/common/static/coffee/spec/discussion/discussion_spec_helper.coffee b/common/static/common/js/spec_helpers/discussion_spec_helper.js
similarity index 100%
rename from common/static/coffee/spec/discussion/discussion_spec_helper.coffee
rename to common/static/common/js/spec_helpers/discussion_spec_helper.js