diff --git a/features/dashboard/active_tab.feature b/features/dashboard/active_tab.feature
index 22dfa2f7840acadbd1535ce5c21cbd58bdf2319c..08b87808f337eac54d8b70809af9b78a532b5f5b 100644
--- a/features/dashboard/active_tab.feature
+++ b/features/dashboard/active_tab.feature
@@ -1,5 +1,5 @@
@dashboard
-Feature: Dashboard active tab
+Feature: Dashboard Active Tab
Background:
Given I sign in as a user
diff --git a/features/dashboard/archived_projects.feature b/features/dashboard/archived_projects.feature
index e23238d225c3f3a0eabc57146a15cdc1b83d6eca..3af93bc373c50e346457734f2815dffbbb14cab4 100644
--- a/features/dashboard/archived_projects.feature
+++ b/features/dashboard/archived_projects.feature
@@ -1,5 +1,5 @@
@dashboard
-Feature: Dashboard with archived projects
+Feature: Dashboard Archived Projects
Background:
Given I sign in as a user
And I own project "Shop"
diff --git a/features/dashboard/event_filters.feature b/features/dashboard/event_filters.feature
index 41de0ae83179ad1cff37f5f0ee5a660fdc8789da..ec5680caba68c0726eea82b09f97645eddc081ef 100644
--- a/features/dashboard/event_filters.feature
+++ b/features/dashboard/event_filters.feature
@@ -1,5 +1,5 @@
@dashboard
-Feature: Event filters
+Feature: Event Filters
Background:
Given I sign in as a user
And I own a project
diff --git a/features/dashboard/help.feature b/features/dashboard/help.feature
index 56a0a860ab9153a9d3d31d562961adfc51c020ef..bca2772897b0a78722834360da8323ecc978777d 100644
--- a/features/dashboard/help.feature
+++ b/features/dashboard/help.feature
@@ -1,5 +1,5 @@
@dashboard
-Feature: Help
+Feature: Dashboard Help
Background:
Given I sign in as a user
And I visit the "Rake Tasks" help page
diff --git a/features/dashboard/projects.feature b/features/dashboard/projects.feature
index 5214cfc28eff9dd3cecb67f495be8be08ff6d7e5..bb4e84f01590ded42a4c2d5c3e6dbeaeed13134f 100644
--- a/features/dashboard/projects.feature
+++ b/features/dashboard/projects.feature
@@ -1,5 +1,5 @@
@dashboard
-Feature: Dashboard projects
+Feature: Dashboard Projects
Background:
Given I sign in as a user
And I own project "Shop"
diff --git a/features/dashboard/shortcuts.feature b/features/dashboard/shortcuts.feature
index 7c25b3926c9d780c1156489530f71d02808668e3..41d79aa6ec86d454736ebb682eddf66368380f13 100644
--- a/features/dashboard/shortcuts.feature
+++ b/features/dashboard/shortcuts.feature
@@ -1,5 +1,5 @@
@dashboard
-Feature: Dashboard shortcuts
+Feature: Dashboard Shortcuts
Background:
Given I sign in as a user
And I visit dashboard page
diff --git a/features/explore/public_groups.feature b/features/explore/groups.feature
similarity index 99%
rename from features/explore/public_groups.feature
rename to features/explore/groups.feature
index 825e3da934ea56b215aad47d8fdefeee71701401..b50a3e766c64449e020f46b6efbcb982aa3bc3f0 100644
--- a/features/explore/public_groups.feature
+++ b/features/explore/groups.feature
@@ -1,5 +1,5 @@
@public
-Feature: Explore Groups Feature
+Feature: Explore Groups
Background:
Given group "TestGroup" has private project "Enterprise"
diff --git a/features/explore/projects.feature b/features/explore/projects.feature
index 9827ebe3e573ae051eb6a11c85dabf6dc2e7d582..a1b2972267871f314fb427560d9d4038ab2e7476 100644
--- a/features/explore/projects.feature
+++ b/features/explore/projects.feature
@@ -1,5 +1,5 @@
@public
-Feature: Explore Projects Feature
+Feature: Explore Projects
Background:
Given public project "Community"
And internal project "Internal"
diff --git a/features/group.feature b/features/groups.feature
similarity index 100%
rename from features/group.feature
rename to features/groups.feature
diff --git a/features/profile/active_tab.feature b/features/profile/active_tab.feature
index a99409d9fd72c97adbb471058d543c23adbade87..7801ae5b8ca66d1f9c319399dea8820239b28e6a 100644
--- a/features/profile/active_tab.feature
+++ b/features/profile/active_tab.feature
@@ -1,5 +1,5 @@
@profile
-Feature: Profile active tab
+Feature: Profile Active Tab
Background:
Given I sign in as a user
diff --git a/features/project/active_tab.feature b/features/project/active_tab.feature
index ce90a0866882be48261b03a5621ecda13dad06a8..8d3e0bd967f33cd62a91802d0fd68fcab86a428b 100644
--- a/features/project/active_tab.feature
+++ b/features/project/active_tab.feature
@@ -1,4 +1,4 @@
-Feature: Project active tab
+Feature: Project Active Tab
Background:
Given I sign in as a user
And I own a project
diff --git a/features/project/commits/branches.feature b/features/project/commits/branches.feature
index d124cb7eecd8cd01d60861d9e561c9b9adc295d8..65d8e48b9b3978c7b4d88a38ed0ecb571b859ca5 100644
--- a/features/project/commits/branches.feature
+++ b/features/project/commits/branches.feature
@@ -1,4 +1,4 @@
-Feature: Project Browse branches
+Feature: Project Commits Branches
Background:
Given I sign in as a user
And I own project "Shop"
diff --git a/features/project/commits/comments.feature b/features/project/commits/comments.feature
index a1aa745a6810cb6aede9c84c0d5533862fc5a0c9..e176752cfbfbd33620ac49fe9b4ba08c7dec571c 100644
--- a/features/project/commits/comments.feature
+++ b/features/project/commits/comments.feature
@@ -1,4 +1,4 @@
-Feature: Comments on commits
+Feature: Project Commits Comments
Background:
Given I sign in as a user
And I own project "Shop"
diff --git a/features/project/commits/commits.feature b/features/project/commits/commits.feature
index 8a213067548552fa1b1cc60acf321f9fcbbefa82..46076b6f3e65c6e85c0bacdfca1dba89e1021670 100644
--- a/features/project/commits/commits.feature
+++ b/features/project/commits/commits.feature
@@ -1,4 +1,4 @@
-Feature: Project Browse commits
+Feature: Project Commits
Background:
Given I sign in as a user
And I own a project
diff --git a/features/project/commits/diff_comments.feature b/features/project/commits/diff_comments.feature
index b26019f832f16465d94e47c6c5235d662bbf4efd..a145ec84b78950b2996c20bf2f64fe4b3fd67e3b 100644
--- a/features/project/commits/diff_comments.feature
+++ b/features/project/commits/diff_comments.feature
@@ -1,4 +1,4 @@
-Feature: Comments on commit diffs
+Feature: Project Commits Diff Comments
Background:
Given I sign in as a user
And I own project "Shop"
diff --git a/features/project/commits/tags.feature b/features/project/commits/tags.feature
index bea463cb786254d542dcee97cdbe2ecfdad57bff..02f399f7cad9038ee4ddc900c2d0261a21d4059c 100644
--- a/features/project/commits/tags.feature
+++ b/features/project/commits/tags.feature
@@ -1,4 +1,4 @@
-Feature: Project Browse tags
+Feature: Project Commits Tags
Background:
Given I sign in as a user
And I own project "Shop"
diff --git a/features/project/commits/user_lookup.feature b/features/project/commits/user_lookup.feature
index 7b194ab9206b43298ada27c0adeefccc3133b877..db51d4a6cfa94f7afc72b268be3931349fd4497e 100644
--- a/features/project/commits/user_lookup.feature
+++ b/features/project/commits/user_lookup.feature
@@ -1,4 +1,4 @@
-Feature: Project Browse Commits User Lookup
+Feature: Project Commits User Lookup
Background:
Given I sign in as a user
And I own a project
diff --git a/features/project/create.feature b/features/project/create.feature
index bb8e3a368edee668e35167dbafe702b30b4257a5..e9dc4fe6b3c4d83b06e2dd49f867904c541b2980 100644
--- a/features/project/create.feature
+++ b/features/project/create.feature
@@ -1,4 +1,4 @@
-Feature: Create Project
+Feature: Project Create
In order to get access to project sections
A user with ability to create a project
Should be able to create a new one
diff --git a/features/project/fork.feature b/features/project/fork.feature
index dc477ca3bf334b8e47d354b410be8792cf7c3fe0..d3d1180db04781f59fea521d772b01e470729c1c 100644
--- a/features/project/fork.feature
+++ b/features/project/fork.feature
@@ -1,4 +1,4 @@
-Feature: Fork Project
+Feature: Project Fork
Background:
Given I sign in as a user
And I am a member of project "Shop"
diff --git a/features/project/issues/filter_labels.feature b/features/project/issues/filter_labels.feature
index f4a0a7977cc3a44646ccf3764cbbd5d581a945a8..2c69a78a749e266520290d6dc5fa70dc029bbe8c 100644
--- a/features/project/issues/filter_labels.feature
+++ b/features/project/issues/filter_labels.feature
@@ -1,4 +1,4 @@
-Feature: Project Filter Labels
+Feature: Project Issues Filter Labels
Background:
Given I sign in as a user
And I own project "Shop"
diff --git a/features/project/issues/labels.feature b/features/project/issues/labels.feature
index a9fe1595fc58c04ae9c1dc30c39a01f4c67fd8ef..039a7d83cb1926a36bed98b352f366b165ac0774 100644
--- a/features/project/issues/labels.feature
+++ b/features/project/issues/labels.feature
@@ -1,4 +1,4 @@
-Feature: Project Labels
+Feature: Project Issues Labels
Background:
Given I sign in as a user
And I own project "Shop"
diff --git a/features/project/issues/milestones.feature b/features/project/issues/milestones.feature
index e67b5d2d8601e765adadb6dd95f8d8d9398af051..9ac65b1257cf6e4f960375515a8f9a174582ab27 100644
--- a/features/project/issues/milestones.feature
+++ b/features/project/issues/milestones.feature
@@ -1,4 +1,4 @@
-Feature: Project Milestones
+Feature: Project Issues Milestones
Background:
Given I sign in as a user
And I own project "Shop"
diff --git a/features/project/network.feature b/features/project/network_graph.feature
similarity index 100%
rename from features/project/network.feature
rename to features/project/network_graph.feature
diff --git a/features/project/project.feature b/features/project/project.feature
index 47e9600c0518c585cfab84131cb957dbadbc805b..7bb24e013a9795152f90a2655a68a989d9940fc1 100644
--- a/features/project/project.feature
+++ b/features/project/project.feature
@@ -1,4 +1,4 @@
-Feature: Project Feature
+Feature: Project
Background:
Given I sign in as a user
And I own project "Shop"
diff --git a/features/project/shortcuts.feature b/features/project/shortcuts.feature
index e5f9c103fb16af9cf97e7509dae21e3b62eb4459..cfb68bf1f50c6bef2f98a2cf90815cc49419c8af 100644
--- a/features/project/shortcuts.feature
+++ b/features/project/shortcuts.feature
@@ -1,5 +1,5 @@
@dashboard
-Feature: Project shortcuts
+Feature: Project Shortcuts
Background:
Given I sign in as a user
And I own a project
diff --git a/features/project/source/browse_files.feature b/features/project/source/browse_files.feature
index 1cd3a91667ff54ce3ebdb160fc4e57f7279e3da0..20ef7ac5702577cfbd14212f9ebcbf6703c8b52c 100644
--- a/features/project/source/browse_files.feature
+++ b/features/project/source/browse_files.feature
@@ -1,4 +1,4 @@
-Feature: Project Browse files
+Feature: Project Source Browse files
Background:
Given I sign in as a user
And I own project "Shop"
diff --git a/features/project/source/git_blame.feature b/features/project/source/git_blame.feature
index cb993ffc639c54067b65056d3216a1a650f05c2e..48b1077dc6b8f5d28cb633d72ce4ca7b732e69c3 100644
--- a/features/project/source/git_blame.feature
+++ b/features/project/source/git_blame.feature
@@ -1,4 +1,4 @@
-Feature: Project Browse git repo
+Feature: Project Source Git Blame
Background:
Given I sign in as a user
And I own project "Shop"
diff --git a/features/project/source/markdown_render.feature b/features/project/source/markdown_render.feature
index fce351317c67e41e1d2e2aef7bdc936e4a49a73c..ecbd721c28161646aa4a426361f9f04c20118e05 100644
--- a/features/project/source/markdown_render.feature
+++ b/features/project/source/markdown_render.feature
@@ -1,4 +1,4 @@
-Feature: Project markdown render
+Feature: Project Source Markdown Render
Background:
Given I sign in as a user
And I own project "Delta"
diff --git a/features/project/source/multiselect_blob.feature b/features/project/source/multiselect_blob.feature
index f60b646a8d9ef67a4e202b9aa64af8934be3c3d8..63b7cb77a9345008f8c31c7003bd5dfa2ce86a96 100644
--- a/features/project/source/multiselect_blob.feature
+++ b/features/project/source/multiselect_blob.feature
@@ -1,4 +1,4 @@
-Feature: Project Multiselect Blob
+Feature: Project Source Multiselect Blob
Background:
Given I sign in as a user
And I own project "Shop"
diff --git a/features/project/source/search_code.feature b/features/project/source/search_code.feature
index 93b326696d03c3411adef96bcbc7cf82e632b38f..4f9dcea249fcdce02d53e23a625ed794670f1fe8 100644
--- a/features/project/source/search_code.feature
+++ b/features/project/source/search_code.feature
@@ -1,4 +1,4 @@
-Feature: Project Search code
+Feature: Project Source Search Code
Background:
Given I sign in as a user
diff --git a/features/project/team_management.feature b/features/project/team_management.feature
index e153978e043f38d1e792a13ae47409bc91d717a2..86ea6cd6e9139037f633d8cd781de95d11042069 100644
--- a/features/project/team_management.feature
+++ b/features/project/team_management.feature
@@ -1,4 +1,4 @@
-Feature: Project Team management
+Feature: Project Team Management
Background:
Given I sign in as a user
And I own project "Shop"
diff --git a/features/snippets/discover.feature b/features/snippets/discover.feature
index f0b8d3a408a8daad88a0c68336a7c86c8693f36e..5094062c8c3edb1c779bfefc3cbf4c993e583eb6 100644
--- a/features/snippets/discover.feature
+++ b/features/snippets/discover.feature
@@ -1,5 +1,5 @@
@snippets
-Feature: Discover Snippets
+Feature: Snippets Discover
Background:
Given I sign in as a user
And I have public "Personal snippet one" snippet
diff --git a/features/snippets/snippets.feature b/features/snippets/snippets.feature
index 38216dd5b7bf805dbfc1e622852cd613a6c24d5b..4c4e3ee2cffe2f2312fc8f4b35de467d0b4db8ec 100644
--- a/features/snippets/snippets.feature
+++ b/features/snippets/snippets.feature
@@ -1,5 +1,5 @@
@snippets
-Feature: Snippets Feature
+Feature: Snippets
Background:
Given I sign in as a user
And I have public "Personal snippet one" snippet
diff --git a/features/snippets/user.feature b/features/snippets/user.feature
index d032a33686b94ca701823a6f0efdf5be76433d58..424794f73fdf29b2ce6318147e0bee4a31d159f9 100644
--- a/features/snippets/user.feature
+++ b/features/snippets/user.feature
@@ -1,5 +1,5 @@
@snippets
-Feature: User Snippets
+Feature: Snippets User
Background:
Given I sign in as a user
And I have public "Personal snippet one" snippet
diff --git a/features/steps/dashboard/with_archived_projects.rb b/features/steps/dashboard/archived_projects.rb
similarity index 86%
rename from features/steps/dashboard/with_archived_projects.rb
rename to features/steps/dashboard/archived_projects.rb
index 256629382a7224927476ced436831dfb4c99362e..969baf92287c620cfdd74bfdd1f157e6d9046518 100644
--- a/features/steps/dashboard/with_archived_projects.rb
+++ b/features/steps/dashboard/archived_projects.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::DashboardWithArchivedProjects < Spinach::FeatureSteps
+class Spinach::Features::DashboardArchivedProjects < Spinach::FeatureSteps
include SharedAuthentication
include SharedPaths
include SharedProject
diff --git a/features/steps/help.rb b/features/steps/dashboard/help.rb
similarity index 90%
rename from features/steps/help.rb
rename to features/steps/dashboard/help.rb
index 0d1c9c00376b8d6e7df2edfe01264726a78300e1..ef433c57c6eebfc4dfafd134e8053484eba03e9c 100644
--- a/features/steps/help.rb
+++ b/features/steps/dashboard/help.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::Help < Spinach::FeatureSteps
+class Spinach::Features::DashboardHelp < Spinach::FeatureSteps
include SharedAuthentication
include SharedPaths
include SharedMarkdown
diff --git a/features/steps/explore/groups_feature.rb b/features/steps/explore/groups.rb
similarity index 97%
rename from features/steps/explore/groups_feature.rb
rename to features/steps/explore/groups.rb
index 94c918d932b22937b1f90b8ce13bed8253efd146..ccbf6cda07e174e74bb3fad1bea074f744bbdc07 100644
--- a/features/steps/explore/groups_feature.rb
+++ b/features/steps/explore/groups.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::ExploreGroupsFeature < Spinach::FeatureSteps
+class Spinach::Features::ExploreGroups < Spinach::FeatureSteps
include SharedAuthentication
include SharedPaths
include SharedGroup
diff --git a/features/steps/explore/projects.rb b/features/steps/explore/projects.rb
index 7248b2e8d8cc5cbcdd1afea2ec0b526a4769b286..8172f7922ccebcd75e945b6a7c4df6123c6ec18b 100644
--- a/features/steps/explore/projects.rb
+++ b/features/steps/explore/projects.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::ExploreProjectsFeature < Spinach::FeatureSteps
+class Spinach::Features::ExploreProjects < Spinach::FeatureSteps
include SharedAuthentication
include SharedPaths
include SharedProject
diff --git a/features/steps/group.rb b/features/steps/groups.rb
similarity index 100%
rename from features/steps/group.rb
rename to features/steps/groups.rb
diff --git a/features/steps/project/browse_branches.rb b/features/steps/project/commits/branches.rb
similarity index 96%
rename from features/steps/project/browse_branches.rb
rename to features/steps/project/commits/branches.rb
index 3b1e51f179adca2abe5c3b2709c06ce42bab0cae..07f7e5796a3a04ad42e05b8da816e8b5bea0e594 100644
--- a/features/steps/project/browse_branches.rb
+++ b/features/steps/project/commits/branches.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::ProjectBrowseBranches < Spinach::FeatureSteps
+class Spinach::Features::ProjectCommitsBranches < Spinach::FeatureSteps
include SharedAuthentication
include SharedProject
include SharedPaths
diff --git a/features/steps/project/comments_on_commits.rb b/features/steps/project/commits/comments.rb
similarity index 58%
rename from features/steps/project/comments_on_commits.rb
rename to features/steps/project/commits/comments.rb
index 03e6867c7b184b7173483111bde5ec20b17a68f9..3d4d8ad636884f5b025b3f5f0a2f98a5b200b832 100644
--- a/features/steps/project/comments_on_commits.rb
+++ b/features/steps/project/commits/comments.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::CommentsOnCommits < Spinach::FeatureSteps
+class Spinach::Features::ProjectCommitsComments < Spinach::FeatureSteps
include SharedAuthentication
include SharedNote
include SharedPaths
diff --git a/features/steps/project/browse_commits.rb b/features/steps/project/commits/commits.rb
similarity index 97%
rename from features/steps/project/browse_commits.rb
rename to features/steps/project/commits/commits.rb
index 2048818e88cffe0d2185467d7b26fa986a0086fb..c054e0e82828da29637c49962cf3294aa096e75f 100644
--- a/features/steps/project/browse_commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::ProjectBrowseCommits < Spinach::FeatureSteps
+class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
include SharedAuthentication
include SharedProject
include SharedPaths
diff --git a/features/steps/project/comments_on_commit_diffs.rb b/features/steps/project/commits/diff_comments.rb
similarity index 58%
rename from features/steps/project/comments_on_commit_diffs.rb
rename to features/steps/project/commits/diff_comments.rb
index 50b978a5d23753d6dad623aa53c88467faff067c..b9d8cf2c5a55c8b60179f34875d251a3e3bc6b5b 100644
--- a/features/steps/project/comments_on_commit_diffs.rb
+++ b/features/steps/project/commits/diff_comments.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::CommentsOnCommitDiffs < Spinach::FeatureSteps
+class Spinach::Features::ProjectCommitsDiffComments < Spinach::FeatureSteps
include SharedAuthentication
include SharedDiffNote
include SharedPaths
diff --git a/features/steps/project/browse_tags.rb b/features/steps/project/commits/tags.rb
similarity index 96%
rename from features/steps/project/browse_tags.rb
rename to features/steps/project/commits/tags.rb
index 722c0a91076b0eadc6aab9cb89331a4bc3e1b548..3465fcbfd072dfc8c37afc7b3711a11bcf6eeff9 100644
--- a/features/steps/project/browse_tags.rb
+++ b/features/steps/project/commits/tags.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::ProjectBrowseTags < Spinach::FeatureSteps
+class Spinach::Features::ProjectCommitsTags < Spinach::FeatureSteps
include SharedAuthentication
include SharedProject
include SharedPaths
diff --git a/features/steps/project/browse_commits_user_lookup.rb b/features/steps/project/commits/user_lookup.rb
similarity index 94%
rename from features/steps/project/browse_commits_user_lookup.rb
rename to features/steps/project/commits/user_lookup.rb
index 196c69eda65c4c6918f37e31acaa46f793775492..0622fef43bb3cfaa9dba847b3e1d4c1a9e57fb01 100644
--- a/features/steps/project/browse_commits_user_lookup.rb
+++ b/features/steps/project/commits/user_lookup.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::ProjectBrowseCommitsUserLookup < Spinach::FeatureSteps
+class Spinach::Features::ProjectCommitsUserLookup < Spinach::FeatureSteps
include SharedAuthentication
include SharedProject
include SharedPaths
diff --git a/features/steps/project/create.rb b/features/steps/project/create.rb
index bcd2524c205530329c1610819247571ee22a8f21..e1062a6ce39d99f65fa61858946228ac3ff4ca8a 100644
--- a/features/steps/project/create.rb
+++ b/features/steps/project/create.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::CreateProject < Spinach::FeatureSteps
+class Spinach::Features::ProjectCreate < Spinach::FeatureSteps
include SharedAuthentication
include SharedPaths
diff --git a/features/steps/project/fork.rb b/features/steps/project/fork.rb
index 791c6b1ffb94c96f39e6b5012c18bc912993c425..da50ba9ced062908ea3946ec440e142c605b8775 100644
--- a/features/steps/project/fork.rb
+++ b/features/steps/project/fork.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::ForkProject < Spinach::FeatureSteps
+class Spinach::Features::ProjectFork < Spinach::FeatureSteps
include SharedAuthentication
include SharedPaths
include SharedProject
diff --git a/features/steps/project/filter_labels.rb b/features/steps/project/issues/filter_labels.rb
similarity index 96%
rename from features/steps/project/filter_labels.rb
rename to features/steps/project/issues/filter_labels.rb
index aaa0cfe3379a99ee9d6421fe33b6abf8904147bb..e62fa9c84c8490a847a147408b19839baf87a697 100644
--- a/features/steps/project/filter_labels.rb
+++ b/features/steps/project/issues/filter_labels.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::ProjectFilterLabels < Spinach::FeatureSteps
+class Spinach::Features::ProjectIssuesFilterLabels < Spinach::FeatureSteps
include SharedAuthentication
include SharedProject
include SharedPaths
diff --git a/features/steps/project/issues.rb b/features/steps/project/issues/issues.rb
similarity index 100%
rename from features/steps/project/issues.rb
rename to features/steps/project/issues/issues.rb
diff --git a/features/steps/project/labels.rb b/features/steps/project/issues/labels.rb
similarity index 97%
rename from features/steps/project/labels.rb
rename to features/steps/project/issues/labels.rb
index b287e183b9194ae045203c1a42edf8702e0f50e9..3e3e90824b476e450440f4ecc2637a784b68d1d7 100644
--- a/features/steps/project/labels.rb
+++ b/features/steps/project/issues/labels.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::ProjectLabels < Spinach::FeatureSteps
+class Spinach::Features::ProjectIssuesLabels < Spinach::FeatureSteps
include SharedAuthentication
include SharedProject
include SharedPaths
diff --git a/features/steps/project/milestones.rb b/features/steps/project/issues/milestones.rb
similarity index 95%
rename from features/steps/project/milestones.rb
rename to features/steps/project/issues/milestones.rb
index 13f917a6279528f69d4c7b86e9c86f386dce09e7..89d7af3c9ee415b3dee7780a80d887331695c00a 100644
--- a/features/steps/project/milestones.rb
+++ b/features/steps/project/issues/milestones.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::ProjectMilestones < Spinach::FeatureSteps
+class Spinach::Features::ProjectIssuesMilestones < Spinach::FeatureSteps
include SharedAuthentication
include SharedProject
include SharedPaths
diff --git a/features/steps/project/project.rb b/features/steps/project/project.rb
index f543e47b4c2a6e681e1529c6a36393ece008d345..f7fff8e64f9d427842514386a8455b30c521e59a 100644
--- a/features/steps/project/project.rb
+++ b/features/steps/project/project.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::ProjectFeature < Spinach::FeatureSteps
+class Spinach::Features::Project < Spinach::FeatureSteps
include SharedAuthentication
include SharedProject
include SharedPaths
diff --git a/features/steps/project/browse_files.rb b/features/steps/project/source/browse_files.rb
similarity index 98%
rename from features/steps/project/browse_files.rb
rename to features/steps/project/source/browse_files.rb
index 4310f51903246f2b2790cd3283b1d515d26e23de..0642302e7978610399b7d380704e64813fb3423b 100644
--- a/features/steps/project/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::ProjectBrowseFiles < Spinach::FeatureSteps
+class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
include SharedAuthentication
include SharedProject
include SharedPaths
diff --git a/features/steps/project/browse_git_repo.rb b/features/steps/project/source/git_blame.rb
similarity index 85%
rename from features/steps/project/browse_git_repo.rb
rename to features/steps/project/source/git_blame.rb
index d8703aadb81de9b801bc0ad39fea4d037af00a9c..e29a816c51b79075ac30f1f40b75c3cf9784395c 100644
--- a/features/steps/project/browse_git_repo.rb
+++ b/features/steps/project/source/git_blame.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::ProjectBrowseGitRepo < Spinach::FeatureSteps
+class Spinach::Features::ProjectSourceGitBlame < Spinach::FeatureSteps
include SharedAuthentication
include SharedProject
include SharedPaths
diff --git a/features/steps/project/markdown_render.rb b/features/steps/project/source/markdown_render.rb
similarity index 99%
rename from features/steps/project/markdown_render.rb
rename to features/steps/project/source/markdown_render.rb
index a8631af2e05dd130c1701f58c4cb3ecb910b8d92..53578ee5970ecb91ef712dd07f9603d10761c03c 100644
--- a/features/steps/project/markdown_render.rb
+++ b/features/steps/project/source/markdown_render.rb
@@ -1,7 +1,7 @@
# If you need to modify the existing seed repository for your tests,
# it is recommended that you make the changes on the `markdown` branch of the seed project repository,
# which should only be used by tests in this file. See `/spec/factories.rb#project` for more info.
-class Spinach::Features::ProjectMarkdownRender < Spinach::FeatureSteps
+class Spinach::Features::ProjectSourceMarkdownRender < Spinach::FeatureSteps
include SharedAuthentication
include SharedPaths
include SharedMarkdown
diff --git a/features/steps/project/multiselect_blob.rb b/features/steps/project/source/multiselect_blob.rb
similarity index 95%
rename from features/steps/project/multiselect_blob.rb
rename to features/steps/project/source/multiselect_blob.rb
index 611289a61622a516cdb0329800fc8ccca4252c0f..b749ba493719cbb7610e4ef0122ccb9b1caaa428 100644
--- a/features/steps/project/multiselect_blob.rb
+++ b/features/steps/project/source/multiselect_blob.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::ProjectMultiselectBlob < Spinach::FeatureSteps
+class Spinach::Features::ProjectSourceMultiselectBlob < Spinach::FeatureSteps
include SharedAuthentication
include SharedProject
include SharedPaths
diff --git a/features/steps/project/search_code.rb b/features/steps/project/source/search_code.rb
similarity index 86%
rename from features/steps/project/search_code.rb
rename to features/steps/project/source/search_code.rb
index 5753296251f661856453d4c90b4faabd071ce9a3..9c2864cc93637303d0bc7a5f186c85f64a5efd60 100644
--- a/features/steps/project/search_code.rb
+++ b/features/steps/project/source/search_code.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::ProjectSearchCode < Spinach::FeatureSteps
+class Spinach::Features::ProjectSourceSearchCode < Spinach::FeatureSteps
include SharedAuthentication
include SharedProject
include SharedPaths
diff --git a/features/steps/snippets/discover.rb b/features/steps/snippets/discover.rb
index da73dfc68be67634b014ad728a71d4cf1de8e3d0..42bccafcc848e151bd527812d313d19fa520155d 100644
--- a/features/steps/snippets/discover.rb
+++ b/features/steps/snippets/discover.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::DiscoverSnippets < Spinach::FeatureSteps
+class Spinach::Features::SnippetsDiscover < Spinach::FeatureSteps
include SharedAuthentication
include SharedPaths
include SharedSnippet
diff --git a/features/steps/snippets/snippets.rb b/features/steps/snippets/snippets.rb
index e8154c8ce5770eaa45fa2eb127585a418933ebfa..dedbdd2c4f078ad9ac005c515581f4abe95b04f2 100644
--- a/features/steps/snippets/snippets.rb
+++ b/features/steps/snippets/snippets.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::SnippetsFeature < Spinach::FeatureSteps
+class Spinach::Features::Snippets < Spinach::FeatureSteps
include SharedAuthentication
include SharedPaths
include SharedProject
diff --git a/features/steps/snippets/user.rb b/features/steps/snippets/user.rb
index 71a1952926f84a42af9560589dc6266dc083645a..ca9aa64bee6b576cbec9801a639a5e3daaf4e56c 100644
--- a/features/steps/snippets/user.rb
+++ b/features/steps/snippets/user.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::UserSnippets < Spinach::FeatureSteps
+class Spinach::Features::SnippetsUser < Spinach::FeatureSteps
include SharedAuthentication
include SharedPaths
include SharedSnippet