diff --git a/lms/templates/student_account/access.underscore b/lms/djangoapps/student_account/templates/student_account/access.underscore
similarity index 100%
rename from lms/templates/student_account/access.underscore
rename to lms/djangoapps/student_account/templates/student_account/access.underscore
diff --git a/lms/templates/student_account/account.underscore b/lms/djangoapps/student_account/templates/student_account/account.underscore
similarity index 100%
rename from lms/templates/student_account/account.underscore
rename to lms/djangoapps/student_account/templates/student_account/account.underscore
diff --git a/lms/templates/student_account/account_settings.html b/lms/djangoapps/student_account/templates/student_account/account_settings.html
similarity index 100%
rename from lms/templates/student_account/account_settings.html
rename to lms/djangoapps/student_account/templates/student_account/account_settings.html
diff --git a/lms/templates/student_account/account_settings.underscore b/lms/djangoapps/student_account/templates/student_account/account_settings.underscore
similarity index 100%
rename from lms/templates/student_account/account_settings.underscore
rename to lms/djangoapps/student_account/templates/student_account/account_settings.underscore
diff --git a/lms/templates/student_account/account_settings_section.underscore b/lms/djangoapps/student_account/templates/student_account/account_settings_section.underscore
similarity index 100%
rename from lms/templates/student_account/account_settings_section.underscore
rename to lms/djangoapps/student_account/templates/student_account/account_settings_section.underscore
diff --git a/lms/templates/student_account/finish_auth.html b/lms/djangoapps/student_account/templates/student_account/finish_auth.html
similarity index 100%
rename from lms/templates/student_account/finish_auth.html
rename to lms/djangoapps/student_account/templates/student_account/finish_auth.html
diff --git a/lms/templates/student_account/form_field.underscore b/lms/djangoapps/student_account/templates/student_account/form_field.underscore
similarity index 100%
rename from lms/templates/student_account/form_field.underscore
rename to lms/djangoapps/student_account/templates/student_account/form_field.underscore
diff --git a/lms/templates/student_account/hinted_login.underscore b/lms/djangoapps/student_account/templates/student_account/hinted_login.underscore
similarity index 100%
rename from lms/templates/student_account/hinted_login.underscore
rename to lms/djangoapps/student_account/templates/student_account/hinted_login.underscore
diff --git a/lms/templates/student_account/institution_login.underscore b/lms/djangoapps/student_account/templates/student_account/institution_login.underscore
similarity index 100%
rename from lms/templates/student_account/institution_login.underscore
rename to lms/djangoapps/student_account/templates/student_account/institution_login.underscore
diff --git a/lms/templates/student_account/institution_register.underscore b/lms/djangoapps/student_account/templates/student_account/institution_register.underscore
similarity index 100%
rename from lms/templates/student_account/institution_register.underscore
rename to lms/djangoapps/student_account/templates/student_account/institution_register.underscore
diff --git a/lms/templates/student_account/login.underscore b/lms/djangoapps/student_account/templates/student_account/login.underscore
similarity index 100%
rename from lms/templates/student_account/login.underscore
rename to lms/djangoapps/student_account/templates/student_account/login.underscore
diff --git a/lms/templates/student_account/login_and_register.html b/lms/djangoapps/student_account/templates/student_account/login_and_register.html
similarity index 100%
rename from lms/templates/student_account/login_and_register.html
rename to lms/djangoapps/student_account/templates/student_account/login_and_register.html
diff --git a/lms/templates/student_account/password_reset.underscore b/lms/djangoapps/student_account/templates/student_account/password_reset.underscore
similarity index 100%
rename from lms/templates/student_account/password_reset.underscore
rename to lms/djangoapps/student_account/templates/student_account/password_reset.underscore
diff --git a/lms/templates/student_account/register.underscore b/lms/djangoapps/student_account/templates/student_account/register.underscore
similarity index 100%
rename from lms/templates/student_account/register.underscore
rename to lms/djangoapps/student_account/templates/student_account/register.underscore
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 8d6c33da6c..c0676be04b 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1914,6 +1914,7 @@ INSTALLED_APPS = (
     'lms.djangoapps.grades.apps.GradesConfig',
 
     # Student support tools
+    'lms.djangoapps.student_account',
     'support',
 
     # External auth (OpenID, shib)
@@ -2105,6 +2106,7 @@ INSTALLED_APPS = (
 
     # additional release utilities to ease automation
     'release_util',
+
 )
 
 # Migrations which are not in the standard module "migrations"