diff --git a/spec/features/projects/issues/rss_spec.rb b/spec/features/issues/rss_spec.rb
similarity index 100%
rename from spec/features/projects/issues/rss_spec.rb
rename to spec/features/issues/rss_spec.rb
diff --git a/spec/features/projects/issues/user_comments_on_issue_spec.rb b/spec/features/issues/user_comments_on_issue_spec.rb
similarity index 100%
rename from spec/features/projects/issues/user_comments_on_issue_spec.rb
rename to spec/features/issues/user_comments_on_issue_spec.rb
diff --git a/spec/features/projects/issues/user_creates_issue_spec.rb b/spec/features/issues/user_creates_issue_spec.rb
similarity index 100%
rename from spec/features/projects/issues/user_creates_issue_spec.rb
rename to spec/features/issues/user_creates_issue_spec.rb
diff --git a/spec/features/projects/issues/user_edits_issue_spec.rb b/spec/features/issues/user_edits_issue_spec.rb
similarity index 100%
rename from spec/features/projects/issues/user_edits_issue_spec.rb
rename to spec/features/issues/user_edits_issue_spec.rb
diff --git a/spec/features/projects/issues/user_sorts_issues_spec.rb b/spec/features/issues/user_sorts_issues_spec.rb
similarity index 100%
rename from spec/features/projects/issues/user_sorts_issues_spec.rb
rename to spec/features/issues/user_sorts_issues_spec.rb
diff --git a/spec/features/projects/issues/user_toggles_subscription_spec.rb b/spec/features/issues/user_toggles_subscription_spec.rb
similarity index 100%
rename from spec/features/projects/issues/user_toggles_subscription_spec.rb
rename to spec/features/issues/user_toggles_subscription_spec.rb
diff --git a/spec/features/projects/issues/user_views_issue_spec.rb b/spec/features/issues/user_views_issue_spec.rb
similarity index 100%
rename from spec/features/projects/issues/user_views_issue_spec.rb
rename to spec/features/issues/user_views_issue_spec.rb
diff --git a/spec/features/projects/issues/user_views_issues_spec.rb b/spec/features/issues/user_views_issues_spec.rb
similarity index 100%
rename from spec/features/projects/issues/user_views_issues_spec.rb
rename to spec/features/issues/user_views_issues_spec.rb
diff --git a/spec/features/projects/merge_requests/user_accepts_merge_request_spec.rb b/spec/features/merge_request/user_accepts_merge_request_spec.rb
similarity index 100%
rename from spec/features/projects/merge_requests/user_accepts_merge_request_spec.rb
rename to spec/features/merge_request/user_accepts_merge_request_spec.rb
diff --git a/spec/features/projects/merge_requests/user_closes_merge_request_spec.rb b/spec/features/merge_request/user_closes_merge_request_spec.rb
similarity index 100%
rename from spec/features/projects/merge_requests/user_closes_merge_request_spec.rb
rename to spec/features/merge_request/user_closes_merge_request_spec.rb
diff --git a/spec/features/projects/merge_requests/user_comments_on_commit_spec.rb b/spec/features/merge_request/user_comments_on_commit_spec.rb
similarity index 100%
rename from spec/features/projects/merge_requests/user_comments_on_commit_spec.rb
rename to spec/features/merge_request/user_comments_on_commit_spec.rb
diff --git a/spec/features/projects/merge_requests/user_comments_on_diff_spec.rb b/spec/features/merge_request/user_comments_on_diff_spec.rb
similarity index 100%
rename from spec/features/projects/merge_requests/user_comments_on_diff_spec.rb
rename to spec/features/merge_request/user_comments_on_diff_spec.rb
diff --git a/spec/features/projects/merge_requests/user_comments_on_merge_request_spec.rb b/spec/features/merge_request/user_comments_on_merge_request_spec.rb
similarity index 100%
rename from spec/features/projects/merge_requests/user_comments_on_merge_request_spec.rb
rename to spec/features/merge_request/user_comments_on_merge_request_spec.rb
diff --git a/spec/features/projects/merge_requests/user_creates_merge_request_spec.rb b/spec/features/merge_request/user_creates_merge_request_spec.rb
similarity index 100%
rename from spec/features/projects/merge_requests/user_creates_merge_request_spec.rb
rename to spec/features/merge_request/user_creates_merge_request_spec.rb
diff --git a/spec/features/projects/merge_requests/user_edits_merge_request_spec.rb b/spec/features/merge_request/user_edits_merge_request_spec.rb
similarity index 100%
rename from spec/features/projects/merge_requests/user_edits_merge_request_spec.rb
rename to spec/features/merge_request/user_edits_merge_request_spec.rb
diff --git a/spec/features/projects/merge_requests/user_manages_subscription_spec.rb b/spec/features/merge_request/user_manages_subscription_spec.rb
similarity index 100%
rename from spec/features/projects/merge_requests/user_manages_subscription_spec.rb
rename to spec/features/merge_request/user_manages_subscription_spec.rb
diff --git a/spec/features/projects/merge_requests/user_merges_merge_request_spec.rb b/spec/features/merge_request/user_merges_merge_request_spec.rb
similarity index 100%
rename from spec/features/projects/merge_requests/user_merges_merge_request_spec.rb
rename to spec/features/merge_request/user_merges_merge_request_spec.rb
diff --git a/spec/features/projects/merge_requests/user_rebases_merge_request_spec.rb b/spec/features/merge_request/user_rebases_merge_request_spec.rb
similarity index 100%
rename from spec/features/projects/merge_requests/user_rebases_merge_request_spec.rb
rename to spec/features/merge_request/user_rebases_merge_request_spec.rb
diff --git a/spec/features/projects/merge_requests/user_reopens_merge_request_spec.rb b/spec/features/merge_request/user_reopens_merge_request_spec.rb
similarity index 100%
rename from spec/features/projects/merge_requests/user_reopens_merge_request_spec.rb
rename to spec/features/merge_request/user_reopens_merge_request_spec.rb
diff --git a/spec/features/projects/merge_requests/user_reverts_merge_request_spec.rb b/spec/features/merge_request/user_reverts_merge_request_spec.rb
similarity index 100%
rename from spec/features/projects/merge_requests/user_reverts_merge_request_spec.rb
rename to spec/features/merge_request/user_reverts_merge_request_spec.rb
diff --git a/spec/features/projects/merge_requests/user_views_diffs_spec.rb b/spec/features/merge_request/user_views_diffs_spec.rb
similarity index 100%
rename from spec/features/projects/merge_requests/user_views_diffs_spec.rb
rename to spec/features/merge_request/user_views_diffs_spec.rb
diff --git a/spec/features/projects/merge_requests/user_views_open_merge_request_spec.rb b/spec/features/merge_request/user_views_open_merge_request_spec.rb
similarity index 100%
rename from spec/features/projects/merge_requests/user_views_open_merge_request_spec.rb
rename to spec/features/merge_request/user_views_open_merge_request_spec.rb
diff --git a/spec/features/projects/merge_requests/user_views_user_status_on_merge_request_spec.rb b/spec/features/merge_request/user_views_user_status_on_merge_request_spec.rb
similarity index 100%
rename from spec/features/projects/merge_requests/user_views_user_status_on_merge_request_spec.rb
rename to spec/features/merge_request/user_views_user_status_on_merge_request_spec.rb
diff --git a/spec/features/projects/merge_requests/user_sorts_merge_requests_spec.rb b/spec/features/merge_requests/user_sorts_merge_requests_spec.rb
similarity index 100%
rename from spec/features/projects/merge_requests/user_sorts_merge_requests_spec.rb
rename to spec/features/merge_requests/user_sorts_merge_requests_spec.rb
diff --git a/spec/features/projects/merge_requests/user_views_all_merge_requests_spec.rb b/spec/features/merge_requests/user_views_all_merge_requests_spec.rb
similarity index 100%
rename from spec/features/projects/merge_requests/user_views_all_merge_requests_spec.rb
rename to spec/features/merge_requests/user_views_all_merge_requests_spec.rb
diff --git a/spec/features/projects/merge_requests/user_views_closed_merge_requests_spec.rb b/spec/features/merge_requests/user_views_closed_merge_requests_spec.rb
similarity index 100%
rename from spec/features/projects/merge_requests/user_views_closed_merge_requests_spec.rb
rename to spec/features/merge_requests/user_views_closed_merge_requests_spec.rb
diff --git a/spec/features/projects/merge_requests/user_views_merged_merge_requests_spec.rb b/spec/features/merge_requests/user_views_merged_merge_requests_spec.rb
similarity index 100%
rename from spec/features/projects/merge_requests/user_views_merged_merge_requests_spec.rb
rename to spec/features/merge_requests/user_views_merged_merge_requests_spec.rb
diff --git a/spec/features/projects/merge_requests/user_views_open_merge_requests_spec.rb b/spec/features/merge_requests/user_views_open_merge_requests_spec.rb
similarity index 100%
rename from spec/features/projects/merge_requests/user_views_open_merge_requests_spec.rb
rename to spec/features/merge_requests/user_views_open_merge_requests_spec.rb