diff --git a/features/actions/echo.feature b/features/action_echo.feature
similarity index 100%
rename from features/actions/echo.feature
rename to features/action_echo.feature
diff --git a/features/actions/file_append.feature b/features/action_file_append.feature
similarity index 100%
rename from features/actions/file_append.feature
rename to features/action_file_append.feature
diff --git a/features/actions/file_replace_content.feature b/features/action_file_replace_content.feature
similarity index 100%
rename from features/actions/file_replace_content.feature
rename to features/action_file_replace_content.feature
diff --git a/features/actions/file_write.feature b/features/action_file_write.feature
similarity index 100%
rename from features/actions/file_write.feature
rename to features/action_file_write.feature
diff --git a/features/actions/mkdir.feature b/features/action_mkdir.feature
similarity index 100%
rename from features/actions/mkdir.feature
rename to features/action_mkdir.feature
diff --git a/features/actions/sh.feature b/features/action_sh.feature
similarity index 100%
rename from features/actions/sh.feature
rename to features/action_sh.feature
diff --git a/features/cli/dry_run.feature b/features/cli_dry_run.feature
similarity index 100%
rename from features/cli/dry_run.feature
rename to features/cli_dry_run.feature
diff --git a/features/cli/usage.feature b/features/cli_usage.feature
similarity index 100%
rename from features/cli/usage.feature
rename to features/cli_usage.feature
diff --git a/features/cli/verbose.feature b/features/cli_verbose.feature
similarity index 100%
rename from features/cli/verbose.feature
rename to features/cli_verbose.feature
diff --git a/features/recipes/ask.feature b/features/recipe_ask.feature
similarity index 100%
rename from features/recipes/ask.feature
rename to features/recipe_ask.feature
diff --git a/features/recipes/evaluation.feature b/features/recipe_evaluation.feature
similarity index 100%
rename from features/recipes/evaluation.feature
rename to features/recipe_evaluation.feature
diff --git a/features/recipes/macro.feature b/features/recipe_macro.feature
similarity index 100%
rename from features/recipes/macro.feature
rename to features/recipe_macro.feature
diff --git a/features/recipes/registry.feature b/features/recipe_registry.feature
similarity index 100%
rename from features/recipes/registry.feature
rename to features/recipe_registry.feature
diff --git a/features/recipes/source.feature b/features/recipe_source.feature
similarity index 100%
rename from features/recipes/source.feature
rename to features/recipe_source.feature
diff --git a/features/recipes/target.feature b/features/recipe_target.feature
similarity index 100%
rename from features/recipes/target.feature
rename to features/recipe_target.feature
diff --git a/features/ssh/config.feature b/features/ssh_config.feature
similarity index 100%
rename from features/ssh/config.feature
rename to features/ssh_config.feature
diff --git a/features/tasks/condition.feature b/features/task_condition.feature
similarity index 100%
rename from features/tasks/condition.feature
rename to features/task_condition.feature
diff --git a/features/tasks/evaluation.feature b/features/task_evaluation.feature
similarity index 100%
rename from features/tasks/evaluation.feature
rename to features/task_evaluation.feature
diff --git a/features/tasks/registry.feature b/features/task_registry.feature
similarity index 100%
rename from features/tasks/registry.feature
rename to features/task_registry.feature
diff --git a/features/tests/dir.feature b/features/test_dir.feature
similarity index 100%
rename from features/tests/dir.feature
rename to features/test_dir.feature
diff --git a/features/tests/env.feature b/features/test_env.feature
similarity index 100%
rename from features/tests/env.feature
rename to features/test_env.feature
diff --git a/features/tests/executable.feature b/features/test_executable.feature
similarity index 100%
rename from features/tests/executable.feature
rename to features/test_executable.feature
diff --git a/features/tests/file.feature b/features/test_file.feature
similarity index 100%
rename from features/tests/file.feature
rename to features/test_file.feature
diff --git a/features/tests/file_contains.feature b/features/test_file_contains.feature
similarity index 100%
rename from features/tests/file_contains.feature
rename to features/test_file_contains.feature
diff --git a/features/tests/negated_test.feature b/features/test_negated_test.feature
similarity index 100%
rename from features/tests/negated_test.feature
rename to features/test_negated_test.feature
diff --git a/features/tests/shell_command_status.feature b/features/test_shell_command_status.feature
similarity index 100%
rename from features/tests/shell_command_status.feature
rename to features/test_shell_command_status.feature