diff --git a/features/hidden_links.feature b/features/misc/hidden_links.feature
similarity index 100%
rename from features/hidden_links.feature
rename to features/misc/hidden_links.feature
diff --git a/features/seed.feature b/features/misc/seed.feature
similarity index 100%
rename from features/seed.feature
rename to features/misc/seed.feature
diff --git a/features/creating_projects.feature b/features/projects/creating.feature
similarity index 100%
rename from features/creating_projects.feature
rename to features/projects/creating.feature
diff --git a/features/deleting_projects.feature b/features/projects/deleting.feature
similarity index 100%
rename from features/deleting_projects.feature
rename to features/projects/deleting.feature
diff --git a/features/editing_projects.feature b/features/projects/editing.feature
similarity index 100%
rename from features/editing_projects.feature
rename to features/projects/editing.feature
diff --git a/features/viewing_projects.feature b/features/projects/viewing.feature
similarity index 100%
rename from features/viewing_projects.feature
rename to features/projects/viewing.feature
diff --git a/features/creating_tickets.feature b/features/tickets/creating.feature
similarity index 100%
rename from features/creating_tickets.feature
rename to features/tickets/creating.feature
diff --git a/features/creating_comments.feature b/features/tickets/creating_comments.feature
similarity index 100%
rename from features/creating_comments.feature
rename to features/tickets/creating_comments.feature
diff --git a/features/creating_states.feature b/features/tickets/creating_states.feature
similarity index 100%
rename from features/creating_states.feature
rename to features/tickets/creating_states.feature
diff --git a/features/deleting_tickets.feature b/features/tickets/deleting.feature
similarity index 100%
rename from features/deleting_tickets.feature
rename to features/tickets/deleting.feature
diff --git a/features/deleting_tags.feature b/features/tickets/deleting_tags.feature
similarity index 100%
rename from features/deleting_tags.feature
rename to features/tickets/deleting_tags.feature
diff --git a/features/editing_tickets.feature b/features/tickets/editing.feature
similarity index 100%
rename from features/editing_tickets.feature
rename to features/tickets/editing.feature
diff --git a/features/managing_states.feature b/features/tickets/managing_states.feature
similarity index 100%
rename from features/managing_states.feature
rename to features/tickets/managing_states.feature
diff --git a/features/ticket_notifications.feature b/features/tickets/notifications.feature
similarity index 100%
rename from features/ticket_notifications.feature
rename to features/tickets/notifications.feature
diff --git a/features/searching.feature b/features/tickets/searching.feature
similarity index 100%
rename from features/searching.feature
rename to features/tickets/searching.feature
diff --git a/features/viewing_tickets.feature b/features/tickets/viewing.feature
similarity index 100%
rename from features/viewing_tickets.feature
rename to features/tickets/viewing.feature
diff --git a/features/watching.feature b/features/tickets/watching.feature
similarity index 100%
rename from features/watching.feature
rename to features/tickets/watching.feature
diff --git a/features/assigning_permissions.feature b/features/users/assigning_permissions.feature
similarity index 100%
rename from features/assigning_permissions.feature
rename to features/users/assigning_permissions.feature
diff --git a/features/creating_users.feature b/features/users/creating.feature
similarity index 100%
rename from features/creating_users.feature
rename to features/users/creating.feature
diff --git a/features/deleting_users.feature b/features/users/deleting.feature
similarity index 100%
rename from features/deleting_users.feature
rename to features/users/deleting.feature
diff --git a/features/editing_users.feature b/features/users/editing.feature
similarity index 100%
rename from features/editing_users.feature
rename to features/users/editing.feature
diff --git a/features/signing_in.feature b/features/users/signing_in.feature
similarity index 100%
rename from features/signing_in.feature
rename to features/users/signing_in.feature
diff --git a/features/signing_up.feature b/features/users/signing_up.feature
similarity index 100%
rename from features/signing_up.feature
rename to features/users/signing_up.feature