diff --git a/app/assets/javascripts/templates/registration.html.haml b/app/views/registration/_modal.html.haml
similarity index 100%
rename from app/assets/javascripts/templates/registration.html.haml
rename to app/views/registration/_modal.html.haml
diff --git a/app/views/registration/index.html.haml b/app/views/registration/index.html.haml
index 2af462cf54..aa53455739 100644
--- a/app/views/registration/index.html.haml
+++ b/app/views/registration/index.html.haml
@@ -5,7 +5,32 @@
 = inject_available_countries
 = inject_enterprise_attributes
 
+%script{type: "text/ng-template", id: "registration/about.html"}
+  = render partial: "registration/steps/about"
+%script{type: "text/ng-template", id: "registration/contact.html"}
+  = render partial: "registration/steps/contact"
+%script{type: "text/ng-template", id: "registration/details.html"}
+  = render partial: "registration/steps/details"
+%script{type: "text/ng-template", id: "registration/finished.html"}
+  = render partial: "registration/steps/finished"
+%script{type: "text/ng-template", id: "registration/images.html"}
+  = render partial: "registration/steps/images"
+%script{type: "text/ng-template", id: "registration/limit_reached.html"}
+  = render partial: "registration/steps/limit_reached"
+%script{type: "text/ng-template", id: "registration/images/logo.html"}
+  = render partial: "registration/steps/logo"
+%script{type: "text/ng-template", id: "registration/images/promo.html"}
+  = render partial: "registration/steps/promo"
+%script{type: "text/ng-template", id: "registration/social.html"}
+  = render partial: "registration/steps/social"
+%script{type: "text/ng-template", id: "registration/steps.html"}
+  = render partial: "registration/steps/steps"
+%script{type: "text/ng-template", id: "registration/type.html"}
+  = render partial: "registration/steps/type"
+
 %script{type: "text/ng-template", id: "registration/introduction.html"}
-  = render partial: "registration/introduction"
+  = render partial: "registration/steps/introduction"
+%script{type: "text/ng-template", id: "registration.html"}
+  = render "modal"
 
 %div{ "ng-controller" => "RegistrationCtrl" }
diff --git a/app/assets/javascripts/templates/registration/about.html.haml b/app/views/registration/steps/_about.html.haml
similarity index 100%
rename from app/assets/javascripts/templates/registration/about.html.haml
rename to app/views/registration/steps/_about.html.haml
diff --git a/app/assets/javascripts/templates/registration/contact.html.haml b/app/views/registration/steps/_contact.html.haml
similarity index 100%
rename from app/assets/javascripts/templates/registration/contact.html.haml
rename to app/views/registration/steps/_contact.html.haml
diff --git a/app/assets/javascripts/templates/registration/details.html.haml b/app/views/registration/steps/_details.html.haml
similarity index 100%
rename from app/assets/javascripts/templates/registration/details.html.haml
rename to app/views/registration/steps/_details.html.haml
diff --git a/app/assets/javascripts/templates/registration/finished.html.haml b/app/views/registration/steps/_finished.html.haml
similarity index 100%
rename from app/assets/javascripts/templates/registration/finished.html.haml
rename to app/views/registration/steps/_finished.html.haml
diff --git a/app/assets/javascripts/templates/registration/images.html.haml b/app/views/registration/steps/_images.html.haml
similarity index 100%
rename from app/assets/javascripts/templates/registration/images.html.haml
rename to app/views/registration/steps/_images.html.haml
diff --git a/app/views/registration/_introduction.html.haml b/app/views/registration/steps/_introduction.html.haml
similarity index 100%
rename from app/views/registration/_introduction.html.haml
rename to app/views/registration/steps/_introduction.html.haml
diff --git a/app/assets/javascripts/templates/registration/limit_reached.html.haml b/app/views/registration/steps/_limit_reached.html.haml
similarity index 100%
rename from app/assets/javascripts/templates/registration/limit_reached.html.haml
rename to app/views/registration/steps/_limit_reached.html.haml
diff --git a/app/assets/javascripts/templates/registration/images/logo.html.haml b/app/views/registration/steps/_logo.html.haml
similarity index 100%
rename from app/assets/javascripts/templates/registration/images/logo.html.haml
rename to app/views/registration/steps/_logo.html.haml
diff --git a/app/assets/javascripts/templates/registration/images/promo.html.haml b/app/views/registration/steps/_promo.html.haml
similarity index 100%
rename from app/assets/javascripts/templates/registration/images/promo.html.haml
rename to app/views/registration/steps/_promo.html.haml
diff --git a/app/assets/javascripts/templates/registration/social.html.haml b/app/views/registration/steps/_social.html.haml
similarity index 100%
rename from app/assets/javascripts/templates/registration/social.html.haml
rename to app/views/registration/steps/_social.html.haml
diff --git a/app/assets/javascripts/templates/registration/steps.html.haml b/app/views/registration/steps/_steps.html.haml
similarity index 100%
rename from app/assets/javascripts/templates/registration/steps.html.haml
rename to app/views/registration/steps/_steps.html.haml
diff --git a/app/assets/javascripts/templates/registration/type.html.haml b/app/views/registration/steps/_type.html.haml
similarity index 100%
rename from app/assets/javascripts/templates/registration/type.html.haml
rename to app/views/registration/steps/_type.html.haml