diff --git a/app/views/notify/ci/builds/_build.html.haml b/app/views/notify/links/ci/builds/_build.html.haml
similarity index 100%
rename from app/views/notify/ci/builds/_build.html.haml
rename to app/views/notify/links/ci/builds/_build.html.haml
diff --git a/app/views/notify/ci/builds/_build.text.erb b/app/views/notify/links/ci/builds/_build.text.erb
similarity index 100%
rename from app/views/notify/ci/builds/_build.text.erb
rename to app/views/notify/links/ci/builds/_build.text.erb
diff --git a/app/views/notify/generic_commit_statuses/_generic_commit_status.html.haml b/app/views/notify/links/generic_commit_statuses/_generic_commit_status.html.haml
similarity index 100%
rename from app/views/notify/generic_commit_statuses/_generic_commit_status.html.haml
rename to app/views/notify/links/generic_commit_statuses/_generic_commit_status.html.haml
diff --git a/app/views/notify/generic_commit_statuses/_generic_commit_status.text.erb b/app/views/notify/links/generic_commit_statuses/_generic_commit_status.text.erb
similarity index 100%
rename from app/views/notify/generic_commit_statuses/_generic_commit_status.text.erb
rename to app/views/notify/links/generic_commit_statuses/_generic_commit_status.text.erb
diff --git a/app/views/notify/pipeline_failed_email.html.haml b/app/views/notify/pipeline_failed_email.html.haml
index 58d331acb33..001d9c48555 100644
--- a/app/views/notify/pipeline_failed_email.html.haml
+++ b/app/views/notify/pipeline_failed_email.html.haml
@@ -158,7 +158,7 @@
                                             %td{style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#8c8c8c;font-weight:500;font-size:15px;vertical-align:middle;"}
                                               = build.stage
                                     %td{align: "right", style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:20px 0;color:#8c8c8c;font-weight:500;font-size:15px;"}
-                                      = render "notify/#{build.to_partial_path}", pipeline: @pipeline, build: build
+                                      = render "notify/links/#{build.to_partial_path}", pipeline: @pipeline, build: build
                                   %tr.build-log
                                     - if build.has_trace?
                                       %td{colspan: "2", style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:0 0 15px;"}
diff --git a/app/views/notify/pipeline_failed_email.text.erb b/app/views/notify/pipeline_failed_email.text.erb
index ddb21cc17e8..ab91c7ef350 100644
--- a/app/views/notify/pipeline_failed_email.text.erb
+++ b/app/views/notify/pipeline_failed_email.text.erb
@@ -19,7 +19,7 @@ Commit Author: <%= commit.author_name %>
 Pipeline #<%= @pipeline.id %> ( <%= pipeline_url(@pipeline) %> ) had <%= failed.size %> failed <%= 'build'.pluralize(failed.size) %>.
 
 <% failed.each do |build| -%>
-<%= render "notify/#{build.to_partial_path}", pipeline: @pipeline, build: build %>
+<%= render "notify/links/#{build.to_partial_path}", pipeline: @pipeline, build: build %>
 Stage: <%= build.stage %>
 Name: <%= build.name %>
 <% if build.has_trace? -%>