diff --git a/features/autowiring_contexts.feature b/features/dependency_injection/autowiring_contexts.feature
similarity index 100%
rename from features/autowiring_contexts.feature
rename to features/dependency_injection/autowiring_contexts.feature
diff --git a/features/injecting_parameters_into_context.feature b/features/dependency_injection/injecting_parameters_into_context.feature
similarity index 100%
rename from features/injecting_parameters_into_context.feature
rename to features/dependency_injection/injecting_parameters_into_context.feature
diff --git a/features/injecting_services_into_context.feature b/features/dependency_injection/injecting_services_into_context.feature
similarity index 100%
rename from features/injecting_services_into_context.feature
rename to features/dependency_injection/injecting_services_into_context.feature
diff --git a/features/mink_integration.feature b/features/mink_integration/mink_integration.feature
similarity index 100%
rename from features/mink_integration.feature
rename to features/mink_integration/mink_integration.feature
diff --git a/features/isolating_contexts.feature b/features/sanity_checks/isolating_contexts.feature
similarity index 100%
rename from features/isolating_contexts.feature
rename to features/sanity_checks/isolating_contexts.feature
diff --git a/features/running_bare_behat_scenarios.feature b/features/sanity_checks/running_bare_behat_scenarios.feature
similarity index 100%
rename from features/running_bare_behat_scenarios.feature
rename to features/sanity_checks/running_bare_behat_scenarios.feature