diff --git a/app/assets/javascripts/angular-new/controllers/build_list_controller.js.erb b/app/assets/javascripts/angular-new/build_lists/build_list_controller.js.erb
similarity index 100%
rename from app/assets/javascripts/angular-new/controllers/build_list_controller.js.erb
rename to app/assets/javascripts/angular-new/build_lists/build_list_controller.js.erb
diff --git a/app/assets/javascripts/angular-new/templates/build_list_notification.nghaml b/app/assets/javascripts/angular-new/templates/build_list_notification.html.haml
similarity index 100%
rename from app/assets/javascripts/angular-new/templates/build_list_notification.nghaml
rename to app/assets/javascripts/angular-new/templates/build_list_notification.html.haml
diff --git a/app/assets/javascripts/angular-new/templates/git_delete_branch_notification.nghaml b/app/assets/javascripts/angular-new/templates/git_delete_branch_notification.html.haml
similarity index 100%
rename from app/assets/javascripts/angular-new/templates/git_delete_branch_notification.nghaml
rename to app/assets/javascripts/angular-new/templates/git_delete_branch_notification.html.haml
diff --git a/app/assets/javascripts/angular-new/templates/git_new_push_notification.nghaml b/app/assets/javascripts/angular-new/templates/git_new_push_notification.html.haml
similarity index 100%
rename from app/assets/javascripts/angular-new/templates/git_new_push_notification.nghaml
rename to app/assets/javascripts/angular-new/templates/git_new_push_notification.html.haml
diff --git a/app/assets/javascripts/angular-new/templates/issue_assign_notification.nghaml b/app/assets/javascripts/angular-new/templates/issue_assign_notification.html.haml
similarity index 100%
rename from app/assets/javascripts/angular-new/templates/issue_assign_notification.nghaml
rename to app/assets/javascripts/angular-new/templates/issue_assign_notification.html.haml
diff --git a/app/assets/javascripts/angular-new/templates/new_comment_commit_notification.nghaml b/app/assets/javascripts/angular-new/templates/new_comment_commit_notification.html.haml
similarity index 100%
rename from app/assets/javascripts/angular-new/templates/new_comment_commit_notification.nghaml
rename to app/assets/javascripts/angular-new/templates/new_comment_commit_notification.html.haml
diff --git a/app/assets/javascripts/angular-new/templates/new_comment_notification.nghaml b/app/assets/javascripts/angular-new/templates/new_comment_notification.html.haml
similarity index 100%
rename from app/assets/javascripts/angular-new/templates/new_comment_notification.nghaml
rename to app/assets/javascripts/angular-new/templates/new_comment_notification.html.haml
diff --git a/app/assets/javascripts/angular-new/templates/new_issue_notification.nghaml b/app/assets/javascripts/angular-new/templates/new_issue_notification.html.haml
similarity index 100%
rename from app/assets/javascripts/angular-new/templates/new_issue_notification.nghaml
rename to app/assets/javascripts/angular-new/templates/new_issue_notification.html.haml
diff --git a/app/assets/javascripts/angular-new/templates/new_user_notification.nghaml b/app/assets/javascripts/angular-new/templates/new_user_notification.html.haml
similarity index 100%
rename from app/assets/javascripts/angular-new/templates/new_user_notification.nghaml
rename to app/assets/javascripts/angular-new/templates/new_user_notification.html.haml
diff --git a/app/assets/javascripts/angular-new/templates/wiki_new_commit_notification.nghaml b/app/assets/javascripts/angular-new/templates/wiki_new_commit_notification.html.haml
similarity index 100%
rename from app/assets/javascripts/angular-new/templates/wiki_new_commit_notification.nghaml
rename to app/assets/javascripts/angular-new/templates/wiki_new_commit_notification.html.haml
diff --git a/app/assets/javascripts/new_application.js b/app/assets/javascripts/new_application.js
index 656517dd8..c79d78d81 100644
--- a/app/assets/javascripts/new_application.js
+++ b/app/assets/javascripts/new_application.js
@@ -21,6 +21,8 @@
 //= require angular-cookies
 //= require soundmanager2-nodebug-jsmin
 
+//= require angular-rails-templates
+
 //= require moment
 //= require angularjs/angular-moment