diff --git a/config/cucumber.yaml b/config/cucumber.yaml
new file mode 100644
index 0000000..c16e154
--- /dev/null
+++ b/config/cucumber.yaml
@@ -0,0 +1 @@
+default: --require features/support --require features/steps
diff --git a/features/action_echo.feature b/features/actions/echo.feature
similarity index 100%
rename from features/action_echo.feature
rename to features/actions/echo.feature
diff --git a/features/action_file_append.feature b/features/actions/file_append.feature
similarity index 100%
rename from features/action_file_append.feature
rename to features/actions/file_append.feature
diff --git a/features/action_file_replace_content.feature b/features/actions/file_replace_content.feature
similarity index 100%
rename from features/action_file_replace_content.feature
rename to features/actions/file_replace_content.feature
diff --git a/features/action_file_write.feature b/features/actions/file_write.feature
similarity index 100%
rename from features/action_file_write.feature
rename to features/actions/file_write.feature
diff --git a/features/action_mkdir.feature b/features/actions/mkdir.feature
similarity index 100%
rename from features/action_mkdir.feature
rename to features/actions/mkdir.feature
diff --git a/features/action_sh.feature b/features/actions/sh.feature
similarity index 100%
rename from features/action_sh.feature
rename to features/actions/sh.feature
diff --git a/features/action_yaml_write.feature b/features/actions/yaml_write.feature
similarity index 100%
rename from features/action_yaml_write.feature
rename to features/actions/yaml_write.feature
diff --git a/features/cli_debug.feature b/features/cli/debug.feature
similarity index 100%
rename from features/cli_debug.feature
rename to features/cli/debug.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_error_reporting.feature b/features/cli/error_reporting.feature
similarity index 100%
rename from features/cli_error_reporting.feature
rename to features/cli/error_reporting.feature
diff --git a/features/cli_target.feature b/features/cli/target.feature
similarity index 100%
rename from features/cli_target.feature
rename to features/cli/target.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/condition_negated_test.feature b/features/condition/negated_test.feature
similarity index 100%
rename from features/condition_negated_test.feature
rename to features/condition/negated_test.feature
diff --git a/features/condition_target.feature b/features/condition/target.feature
similarity index 100%
rename from features/condition_target.feature
rename to features/condition/target.feature
diff --git a/features/recipe_compose_macro.feature b/features/recipe/compose_macro.feature
similarity index 100%
rename from features/recipe_compose_macro.feature
rename to features/recipe/compose_macro.feature
diff --git a/features/recipe_macro.feature b/features/recipe/macro.feature
similarity index 100%
rename from features/recipe_macro.feature
rename to features/recipe/macro.feature
diff --git a/features/recipe_source.feature b/features/recipe/source.feature
similarity index 100%
rename from features/recipe_source.feature
rename to features/recipe/source.feature
diff --git a/features/recipe_target.feature b/features/recipe/target.feature
similarity index 100%
rename from features/recipe_target.feature
rename to features/recipe/target.feature
diff --git a/features/recipe_test_macro.feature b/features/recipe/test_macro.feature
similarity index 100%
rename from features/recipe_test_macro.feature
rename to features/recipe/test_macro.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/task_ask.feature b/features/task/ask.feature
similarity index 100%
rename from features/task_ask.feature
rename to features/task/ask.feature
diff --git a/features/task_condition.feature b/features/task/condition.feature
similarity index 100%
rename from features/task_condition.feature
rename to features/task/condition.feature
diff --git a/features/task_nested_tasks.feature b/features/task/nested_tasks.feature
similarity index 100%
rename from features/task_nested_tasks.feature
rename to features/task/nested_tasks.feature
diff --git a/features/task_target.feature b/features/task/target.feature
similarity index 100%
rename from features/task_target.feature
rename to features/task/target.feature
diff --git a/features/task_template.feature b/features/task/template.feature
similarity index 100%
rename from features/task_template.feature
rename to features/task/template.feature
diff --git a/features/test_dir.feature b/features/tests/dir.feature
similarity index 100%
rename from features/test_dir.feature
rename to features/tests/dir.feature
diff --git a/features/test_env.feature b/features/tests/env.feature
similarity index 100%
rename from features/test_env.feature
rename to features/tests/env.feature
diff --git a/features/test_executable.feature b/features/tests/executable.feature
similarity index 100%
rename from features/test_executable.feature
rename to features/tests/executable.feature
diff --git a/features/test_file.feature b/features/tests/file.feature
similarity index 100%
rename from features/test_file.feature
rename to features/tests/file.feature
diff --git a/features/test_file_contains.feature b/features/tests/file_contains.feature
similarity index 100%
rename from features/test_file_contains.feature
rename to features/tests/file_contains.feature
diff --git a/features/test_file_eq.feature b/features/tests/file_eq.feature
similarity index 100%
rename from features/test_file_eq.feature
rename to features/tests/file_eq.feature
diff --git a/features/test_file_match.feature b/features/tests/file_match.feature
similarity index 100%
rename from features/test_file_match.feature
rename to features/tests/file_match.feature
diff --git a/features/test_shell_command_status.feature b/features/tests/shell_command_status.feature
similarity index 100%
rename from features/test_shell_command_status.feature
rename to features/tests/shell_command_status.feature
diff --git a/features/test_yaml_eq.feature b/features/tests/yaml_eq.feature
similarity index 100%
rename from features/test_yaml_eq.feature
rename to features/tests/yaml_eq.feature