diff --git a/app/templates/groups/create_request.html b/app/groups/templates/groups/create_request.html
similarity index 100%
rename from app/templates/groups/create_request.html
rename to app/groups/templates/groups/create_request.html
diff --git a/app/templates/groups/group_admin.html b/app/groups/templates/groups/group_admin.html
similarity index 100%
rename from app/templates/groups/group_admin.html
rename to app/groups/templates/groups/group_admin.html
diff --git a/app/templates/groups/group_list.html b/app/groups/templates/groups/group_list.html
similarity index 100%
rename from app/templates/groups/group_list.html
rename to app/groups/templates/groups/group_list.html
diff --git a/app/templates/sso/apipassword.html b/app/sso/templates/sso/apipassword.html
similarity index 100%
rename from app/templates/sso/apipassword.html
rename to app/sso/templates/sso/apipassword.html
diff --git a/app/templates/sso/emailchange.html b/app/sso/templates/sso/emailchange.html
similarity index 100%
rename from app/templates/sso/emailchange.html
rename to app/sso/templates/sso/emailchange.html
diff --git a/app/templates/sso/index.html b/app/sso/templates/sso/index.html
similarity index 100%
rename from app/templates/sso/index.html
rename to app/sso/templates/sso/index.html
diff --git a/app/templates/sso/lookup/lookuplist.html b/app/sso/templates/sso/lookup/lookuplist.html
similarity index 100%
rename from app/templates/sso/lookup/lookuplist.html
rename to app/sso/templates/sso/lookup/lookuplist.html
diff --git a/app/templates/sso/lookup/user.html b/app/sso/templates/sso/lookup/user.html
similarity index 100%
rename from app/templates/sso/lookup/user.html
rename to app/sso/templates/sso/lookup/user.html
diff --git a/app/templates/sso/lookup/userlookup.html b/app/sso/templates/sso/lookup/userlookup.html
similarity index 100%
rename from app/templates/sso/lookup/userlookup.html
rename to app/sso/templates/sso/lookup/userlookup.html
diff --git a/app/templates/sso/profile.html b/app/sso/templates/sso/profile.html
similarity index 100%
rename from app/templates/sso/profile.html
rename to app/sso/templates/sso/profile.html
diff --git a/app/templates/sso/serviceaccount/add.html b/app/sso/templates/sso/serviceaccount/add.html
similarity index 100%
rename from app/templates/sso/serviceaccount/add.html
rename to app/sso/templates/sso/serviceaccount/add.html
diff --git a/app/templates/sso/serviceaccount/created.html b/app/sso/templates/sso/serviceaccount/created.html
similarity index 100%
rename from app/templates/sso/serviceaccount/created.html
rename to app/sso/templates/sso/serviceaccount/created.html
diff --git a/app/templates/sso/serviceaccount/deleteconfirm.html b/app/sso/templates/sso/serviceaccount/deleteconfirm.html
similarity index 100%
rename from app/templates/sso/serviceaccount/deleteconfirm.html
rename to app/sso/templates/sso/serviceaccount/deleteconfirm.html
diff --git a/app/templates/sso/serviceaccount/index.html b/app/sso/templates/sso/serviceaccount/index.html
similarity index 100%
rename from app/templates/sso/serviceaccount/index.html
rename to app/sso/templates/sso/serviceaccount/index.html
diff --git a/app/templates/sso/serviceaccount/noneavailable.html b/app/sso/templates/sso/serviceaccount/noneavailable.html
similarity index 100%
rename from app/templates/sso/serviceaccount/noneavailable.html
rename to app/sso/templates/sso/serviceaccount/noneavailable.html
diff --git a/app/templates/sso/serviceaccount/reset.html b/app/sso/templates/sso/serviceaccount/reset.html
similarity index 100%
rename from app/templates/sso/serviceaccount/reset.html
rename to app/sso/templates/sso/serviceaccount/reset.html
diff --git a/app/templates/sso/serviceaccount/resetcomplete.html b/app/sso/templates/sso/serviceaccount/resetcomplete.html
similarity index 100%
rename from app/templates/sso/serviceaccount/resetcomplete.html
rename to app/sso/templates/sso/serviceaccount/resetcomplete.html