diff --git a/tests/source/configs-blank_lines_lower_bound-1.rs b/tests/source/configs/blank_lines_lower_bound/1.rs
similarity index 100%
rename from tests/source/configs-blank_lines_lower_bound-1.rs
rename to tests/source/configs/blank_lines_lower_bound/1.rs
diff --git a/tests/source/configs-fn_brace_style-always_next_line.rs b/tests/source/configs/brace_style/fn_always_next_line.rs
similarity index 100%
rename from tests/source/configs-fn_brace_style-always_next_line.rs
rename to tests/source/configs/brace_style/fn_always_next_line.rs
diff --git a/tests/source/configs-fn_brace_style-prefer_same_line.rs b/tests/source/configs/brace_style/fn_prefer_same_line.rs
similarity index 100%
rename from tests/source/configs-fn_brace_style-prefer_same_line.rs
rename to tests/source/configs/brace_style/fn_prefer_same_line.rs
diff --git a/tests/source/configs-fn_brace_style-same_line_where.rs b/tests/source/configs/brace_style/fn_same_line_where.rs
similarity index 100%
rename from tests/source/configs-fn_brace_style-same_line_where.rs
rename to tests/source/configs/brace_style/fn_same_line_where.rs
diff --git a/tests/source/configs-item_brace_style-always_next_line.rs b/tests/source/configs/brace_style/item_always_next_line.rs
similarity index 100%
rename from tests/source/configs-item_brace_style-always_next_line.rs
rename to tests/source/configs/brace_style/item_always_next_line.rs
diff --git a/tests/source/configs-item_brace_style-prefer_same_line.rs b/tests/source/configs/brace_style/item_prefer_same_line.rs
similarity index 100%
rename from tests/source/configs-item_brace_style-prefer_same_line.rs
rename to tests/source/configs/brace_style/item_prefer_same_line.rs
diff --git a/tests/source/configs-item_brace_style-same_line_where.rs b/tests/source/configs/brace_style/item_same_line_where.rs
similarity index 100%
rename from tests/source/configs-item_brace_style-same_line_where.rs
rename to tests/source/configs/brace_style/item_same_line_where.rs
diff --git a/tests/source/configs-comment_width-above.rs b/tests/source/configs/comment_width/above.rs
similarity index 100%
rename from tests/source/configs-comment_width-above.rs
rename to tests/source/configs/comment_width/above.rs
diff --git a/tests/source/configs-comment_width-below.rs b/tests/source/configs/comment_width/below.rs
similarity index 100%
rename from tests/source/configs-comment_width-below.rs
rename to tests/source/configs/comment_width/below.rs
diff --git a/tests/source/configs-comment_width-ignore.rs b/tests/source/configs/comment_width/ignore.rs
similarity index 100%
rename from tests/source/configs-comment_width-ignore.rs
rename to tests/source/configs/comment_width/ignore.rs
diff --git a/tests/source/configs-condense_wildcard_suffices-false.rs b/tests/source/configs/condense_wildcard_suffixes/false.rs
similarity index 100%
rename from tests/source/configs-condense_wildcard_suffices-false.rs
rename to tests/source/configs/condense_wildcard_suffixes/false.rs
diff --git a/tests/source/configs-condense_wildcard_suffices-true.rs b/tests/source/configs/condense_wildcard_suffixes/true.rs
similarity index 100%
rename from tests/source/configs-condense_wildcard_suffices-true.rs
rename to tests/source/configs/condense_wildcard_suffixes/true.rs
diff --git a/tests/source/configs-control_brace_style-always_next_line.rs b/tests/source/configs/control_brace_style/always_next_line.rs
similarity index 100%
rename from tests/source/configs-control_brace_style-always_next_line.rs
rename to tests/source/configs/control_brace_style/always_next_line.rs
diff --git a/tests/source/configs-control_brace_style-always_same_line.rs b/tests/source/configs/control_brace_style/always_same_line.rs
similarity index 100%
rename from tests/source/configs-control_brace_style-always_same_line.rs
rename to tests/source/configs/control_brace_style/always_same_line.rs
diff --git a/tests/source/configs-control_brace_style-closing_next_line.rs b/tests/source/configs/control_brace_style/closing_next_line.rs
similarity index 100%
rename from tests/source/configs-control_brace_style-closing_next_line.rs
rename to tests/source/configs/control_brace_style/closing_next_line.rs
diff --git a/tests/source/configs-disable_all_formatting-false.rs b/tests/source/configs/disable_all_formatting/false.rs
similarity index 100%
rename from tests/source/configs-disable_all_formatting-false.rs
rename to tests/source/configs/disable_all_formatting/false.rs
diff --git a/tests/source/configs-disable_all_formatting-true.rs b/tests/source/configs/disable_all_formatting/true.rs
similarity index 100%
rename from tests/source/configs-disable_all_formatting-true.rs
rename to tests/source/configs/disable_all_formatting/true.rs
diff --git a/tests/source/configs-empty_item_single_line-false.rs b/tests/source/configs/empty_item_single_line/false.rs
similarity index 100%
rename from tests/source/configs-empty_item_single_line-false.rs
rename to tests/source/configs/empty_item_single_line/false.rs
diff --git a/tests/source/configs-empty_item_single_line-true.rs b/tests/source/configs/empty_item_single_line/true.rs
similarity index 100%
rename from tests/source/configs-empty_item_single_line-true.rs
rename to tests/source/configs/empty_item_single_line/true.rs
diff --git a/tests/source/configs-error_on_line_overflow-false.rs b/tests/source/configs/error_on_line_overflow/false.rs
similarity index 100%
rename from tests/source/configs-error_on_line_overflow-false.rs
rename to tests/source/configs/error_on_line_overflow/false.rs
diff --git a/tests/source/configs-fn_args_density-compressed.rs b/tests/source/configs/fn_args_density/compressed.rs
similarity index 100%
rename from tests/source/configs-fn_args_density-compressed.rs
rename to tests/source/configs/fn_args_density/compressed.rs
diff --git a/tests/source/configs-fn_args_density-tall.rs b/tests/source/configs/fn_args_density/tall.rs
similarity index 100%
rename from tests/source/configs-fn_args_density-tall.rs
rename to tests/source/configs/fn_args_density/tall.rs
diff --git a/tests/source/configs-fn_args_density-vertical.rs b/tests/source/configs/fn_args_density/vertical.rs
similarity index 100%
rename from tests/source/configs-fn_args_density-vertical.rs
rename to tests/source/configs/fn_args_density/vertical.rs
diff --git a/tests/source/configs-fn_single_line-false.rs b/tests/source/configs/fn_single_line/false.rs
similarity index 100%
rename from tests/source/configs-fn_single_line-false.rs
rename to tests/source/configs/fn_single_line/false.rs
diff --git a/tests/source/configs-fn_single_line-true.rs b/tests/source/configs/fn_single_line/true.rs
similarity index 100%
rename from tests/source/configs-fn_single_line-true.rs
rename to tests/source/configs/fn_single_line/true.rs
diff --git a/tests/source/configs-force_explicit_abi-false.rs b/tests/source/configs/force_explicit_abi/false.rs
similarity index 100%
rename from tests/source/configs-force_explicit_abi-false.rs
rename to tests/source/configs/force_explicit_abi/false.rs
diff --git a/tests/source/configs-force_explicit_abi-true.rs b/tests/source/configs/force_explicit_abi/true.rs
similarity index 100%
rename from tests/source/configs-force_explicit_abi-true.rs
rename to tests/source/configs/force_explicit_abi/true.rs
diff --git a/tests/source/configs-force_multiline_block-false.rs b/tests/source/configs/force_multiline_block/false.rs
similarity index 100%
rename from tests/source/configs-force_multiline_block-false.rs
rename to tests/source/configs/force_multiline_block/false.rs
diff --git a/tests/source/configs-force_multiline_block-true.rs b/tests/source/configs/force_multiline_block/true.rs
similarity index 100%
rename from tests/source/configs-force_multiline_block-true.rs
rename to tests/source/configs/force_multiline_block/true.rs
diff --git a/tests/source/configs-format_strings-false.rs b/tests/source/configs/format_strings/false.rs
similarity index 100%
rename from tests/source/configs-format_strings-false.rs
rename to tests/source/configs/format_strings/false.rs
diff --git a/tests/source/configs-format_strings-true.rs b/tests/source/configs/format_strings/true.rs
similarity index 100%
rename from tests/source/configs-format_strings-true.rs
rename to tests/source/configs/format_strings/true.rs
diff --git a/tests/source/configs-hard_tabs-false.rs b/tests/source/configs/hard_tabs/false.rs
similarity index 100%
rename from tests/source/configs-hard_tabs-false.rs
rename to tests/source/configs/hard_tabs/false.rs
diff --git a/tests/source/configs-hard_tabs-true.rs b/tests/source/configs/hard_tabs/true.rs
similarity index 100%
rename from tests/source/configs-hard_tabs-true.rs
rename to tests/source/configs/hard_tabs/true.rs
diff --git a/tests/source/configs-fn_args_indent-block.rs b/tests/source/configs/indent_style/block_args.rs
similarity index 100%
rename from tests/source/configs-fn_args_indent-block.rs
rename to tests/source/configs/indent_style/block_args.rs
diff --git a/tests/source/configs-array_indent-block.rs b/tests/source/configs/indent_style/block_array.rs
similarity index 100%
rename from tests/source/configs-array_indent-block.rs
rename to tests/source/configs/indent_style/block_array.rs
diff --git a/tests/source/configs-fn_call_indent-block.rs b/tests/source/configs/indent_style/block_call.rs
similarity index 100%
rename from tests/source/configs-fn_call_indent-block.rs
rename to tests/source/configs/indent_style/block_call.rs
diff --git a/tests/source/configs-chain_indent-block.rs b/tests/source/configs/indent_style/block_chain.rs
similarity index 100%
rename from tests/source/configs-chain_indent-block.rs
rename to tests/source/configs/indent_style/block_chain.rs
diff --git a/tests/source/configs-generics_indent-block.rs b/tests/source/configs/indent_style/block_generic.rs
similarity index 100%
rename from tests/source/configs-generics_indent-block.rs
rename to tests/source/configs/indent_style/block_generic.rs
diff --git a/tests/source/configs-struct_lit_indent-block.rs b/tests/source/configs/indent_style/block_struct_lit.rs
similarity index 100%
rename from tests/source/configs-struct_lit_indent-block.rs
rename to tests/source/configs/indent_style/block_struct_lit.rs
diff --git a/tests/source/configs-fn_call_indent-block-trailing-comma.rs b/tests/source/configs/indent_style/block_trailing_comma_call.rs
similarity index 100%
rename from tests/source/configs-fn_call_indent-block-trailing-comma.rs
rename to tests/source/configs/indent_style/block_trailing_comma_call.rs
diff --git a/tests/source/configs-where_pred_indent-block.rs b/tests/source/configs/indent_style/block_where_pred.rs
similarity index 100%
rename from tests/source/configs-where_pred_indent-block.rs
rename to tests/source/configs/indent_style/block_where_pred.rs
diff --git a/tests/source/configs-where_style-default.rs b/tests/source/configs/indent_style/default.rs
similarity index 100%
rename from tests/source/configs-where_style-default.rs
rename to tests/source/configs/indent_style/default.rs
diff --git a/tests/source/configs-where_style-rfc.rs b/tests/source/configs/indent_style/rfc_where.rs
similarity index 100%
rename from tests/source/configs-where_style-rfc.rs
rename to tests/source/configs/indent_style/rfc_where.rs
diff --git a/tests/source/configs-fn_args_indent-visual.rs b/tests/source/configs/indent_style/visual_args.rs
similarity index 100%
rename from tests/source/configs-fn_args_indent-visual.rs
rename to tests/source/configs/indent_style/visual_args.rs
diff --git a/tests/source/configs-array_indent-visual.rs b/tests/source/configs/indent_style/visual_array.rs
similarity index 100%
rename from tests/source/configs-array_indent-visual.rs
rename to tests/source/configs/indent_style/visual_array.rs
diff --git a/tests/source/configs-fn_call_indent-visual.rs b/tests/source/configs/indent_style/visual_call.rs
similarity index 100%
rename from tests/source/configs-fn_call_indent-visual.rs
rename to tests/source/configs/indent_style/visual_call.rs
diff --git a/tests/source/configs-chain_indent-visual.rs b/tests/source/configs/indent_style/visual_chain.rs
similarity index 100%
rename from tests/source/configs-chain_indent-visual.rs
rename to tests/source/configs/indent_style/visual_chain.rs
diff --git a/tests/source/configs-generics_indent-visual.rs b/tests/source/configs/indent_style/visual_generics.rs
similarity index 100%
rename from tests/source/configs-generics_indent-visual.rs
rename to tests/source/configs/indent_style/visual_generics.rs
diff --git a/tests/source/configs-struct_lit_indent-visual.rs b/tests/source/configs/indent_style/visual_struct_lit.rs
similarity index 100%
rename from tests/source/configs-struct_lit_indent-visual.rs
rename to tests/source/configs/indent_style/visual_struct_lit.rs
diff --git a/tests/source/configs-fn_call_indent-visual-trailing-comma.rs b/tests/source/configs/indent_style/visual_trailing_comma.rs
similarity index 100%
rename from tests/source/configs-fn_call_indent-visual-trailing-comma.rs
rename to tests/source/configs/indent_style/visual_trailing_comma.rs
diff --git a/tests/source/configs-where_pred_indent-visual.rs b/tests/source/configs/indent_style/visual_where_pred.rs
similarity index 100%
rename from tests/source/configs-where_pred_indent-visual.rs
rename to tests/source/configs/indent_style/visual_where_pred.rs
diff --git a/tests/source/configs-match_arm_blocks-false.rs b/tests/source/configs/match_arm_blocks/false.rs
similarity index 100%
rename from tests/source/configs-match_arm_blocks-false.rs
rename to tests/source/configs/match_arm_blocks/false.rs
diff --git a/tests/source/configs-match_arm_blocks-true.rs b/tests/source/configs/match_arm_blocks/true.rs
similarity index 100%
rename from tests/source/configs-match_arm_blocks-true.rs
rename to tests/source/configs/match_arm_blocks/true.rs
diff --git a/tests/source/configs-match_block_trailing_comma-false.rs b/tests/source/configs/match_block_trailing_comma/false.rs
similarity index 100%
rename from tests/source/configs-match_block_trailing_comma-false.rs
rename to tests/source/configs/match_block_trailing_comma/false.rs
diff --git a/tests/source/configs-match_block_trailing_comma-true.rs b/tests/source/configs/match_block_trailing_comma/true.rs
similarity index 100%
rename from tests/source/configs-match_block_trailing_comma-true.rs
rename to tests/source/configs/match_block_trailing_comma/true.rs
diff --git a/tests/source/configs-merge_derives-true.rs b/tests/source/configs/merge_derives/true.rs
similarity index 100%
rename from tests/source/configs-merge_derives-true.rs
rename to tests/source/configs/merge_derives/true.rs
diff --git a/tests/source/configs-normalize_comments-false.rs b/tests/source/configs/normalize_comments/false.rs
similarity index 100%
rename from tests/source/configs-normalize_comments-false.rs
rename to tests/source/configs/normalize_comments/false.rs
diff --git a/tests/source/configs-normalize_comments-true.rs b/tests/source/configs/normalize_comments/true.rs
similarity index 100%
rename from tests/source/configs-normalize_comments-true.rs
rename to tests/source/configs/normalize_comments/true.rs
diff --git a/tests/source/configs-reorder_imported_names-false.rs b/tests/source/configs/reorder_imported_names/false.rs
similarity index 100%
rename from tests/source/configs-reorder_imported_names-false.rs
rename to tests/source/configs/reorder_imported_names/false.rs
diff --git a/tests/source/configs-reorder_imported_names-true.rs b/tests/source/configs/reorder_imported_names/true.rs
similarity index 100%
rename from tests/source/configs-reorder_imported_names-true.rs
rename to tests/source/configs/reorder_imported_names/true.rs
diff --git a/tests/source/configs-reorder_imports-false.rs b/tests/source/configs/reorder_imports/false.rs
similarity index 100%
rename from tests/source/configs-reorder_imports-false.rs
rename to tests/source/configs/reorder_imports/false.rs
diff --git a/tests/source/configs-reorder_imports-true.rs b/tests/source/configs/reorder_imports/true.rs
similarity index 100%
rename from tests/source/configs-reorder_imports-true.rs
rename to tests/source/configs/reorder_imports/true.rs
diff --git a/tests/source/configs-reorder_imports_in_group-false.rs b/tests/source/configs/reorder_imports_in_group/false.rs
similarity index 100%
rename from tests/source/configs-reorder_imports_in_group-false.rs
rename to tests/source/configs/reorder_imports_in_group/false.rs
diff --git a/tests/source/configs-reorder_imports_in_group-true.rs b/tests/source/configs/reorder_imports_in_group/true.rs
similarity index 100%
rename from tests/source/configs-reorder_imports_in_group-true.rs
rename to tests/source/configs/reorder_imports_in_group/true.rs
diff --git a/tests/source/configs-same_line_attributes-false.rs b/tests/source/configs/same_line_attributes/false.rs
similarity index 100%
rename from tests/source/configs-same_line_attributes-false.rs
rename to tests/source/configs/same_line_attributes/false.rs
diff --git a/tests/source/configs-same_line_attributes-true.rs b/tests/source/configs/same_line_attributes/true.rs
similarity index 100%
rename from tests/source/configs-same_line_attributes-true.rs
rename to tests/source/configs/same_line_attributes/true.rs
diff --git a/tests/source/configs-space_before_colon-true.rs b/tests/source/configs/space_before_colon/true.rs
similarity index 100%
rename from tests/source/configs-space_before_colon-true.rs
rename to tests/source/configs/space_before_colon/true.rs
diff --git a/tests/source/configs-spaces_around_ranges-false.rs b/tests/source/configs/spaces_around_ranges/false.rs
similarity index 100%
rename from tests/source/configs-spaces_around_ranges-false.rs
rename to tests/source/configs/spaces_around_ranges/false.rs
diff --git a/tests/source/configs-spaces_around_ranges-true.rs b/tests/source/configs/spaces_around_ranges/true.rs
similarity index 100%
rename from tests/source/configs-spaces_around_ranges-true.rs
rename to tests/source/configs/spaces_around_ranges/true.rs
diff --git a/tests/source/configs-spaces_within_parens_and_brackets-false.rs b/tests/source/configs/spaces_within_parens_and_brackets/false.rs
similarity index 100%
rename from tests/source/configs-spaces_within_parens_and_brackets-false.rs
rename to tests/source/configs/spaces_within_parens_and_brackets/false.rs
diff --git a/tests/source/configs-spaces_within_parens_and_brackets-true.rs b/tests/source/configs/spaces_within_parens_and_brackets/true.rs
similarity index 100%
rename from tests/source/configs-spaces_within_parens_and_brackets-true.rs
rename to tests/source/configs/spaces_within_parens_and_brackets/true.rs
diff --git a/tests/source/configs-struct_field_align_threshold-20.rs b/tests/source/configs/struct_field_align_threshold/20.rs
similarity index 100%
rename from tests/source/configs-struct_field_align_threshold-20.rs
rename to tests/source/configs/struct_field_align_threshold/20.rs
diff --git a/tests/source/configs-struct_lit_single_line-false.rs b/tests/source/configs/struct_lit_single_line/false.rs
similarity index 100%
rename from tests/source/configs-struct_lit_single_line-false.rs
rename to tests/source/configs/struct_lit_single_line/false.rs
diff --git a/tests/source/configs-tab_spaces-2.rs b/tests/source/configs/tab_spaces/2.rs
similarity index 100%
rename from tests/source/configs-tab_spaces-2.rs
rename to tests/source/configs/tab_spaces/2.rs
diff --git a/tests/source/configs-tab_spaces-4.rs b/tests/source/configs/tab_spaces/4.rs
similarity index 100%
rename from tests/source/configs-tab_spaces-4.rs
rename to tests/source/configs/tab_spaces/4.rs
diff --git a/tests/source/configs-trailing_comma-always.rs b/tests/source/configs/trailing_comma/always.rs
similarity index 100%
rename from tests/source/configs-trailing_comma-always.rs
rename to tests/source/configs/trailing_comma/always.rs
diff --git a/tests/source/configs-trailing_comma-never.rs b/tests/source/configs/trailing_comma/never.rs
similarity index 100%
rename from tests/source/configs-trailing_comma-never.rs
rename to tests/source/configs/trailing_comma/never.rs
diff --git a/tests/source/configs-trailing_comma-vertical.rs b/tests/source/configs/trailing_comma/vertical.rs
similarity index 100%
rename from tests/source/configs-trailing_comma-vertical.rs
rename to tests/source/configs/trailing_comma/vertical.rs
diff --git a/tests/source/configs-type_punctuation_density-compressed.rs b/tests/source/configs/type_punctuation_density/compressed.rs
similarity index 100%
rename from tests/source/configs-type_punctuation_density-compressed.rs
rename to tests/source/configs/type_punctuation_density/compressed.rs
diff --git a/tests/source/configs-type_punctuation_density-wide.rs b/tests/source/configs/type_punctuation_density/wide.rs
similarity index 100%
rename from tests/source/configs-type_punctuation_density-wide.rs
rename to tests/source/configs/type_punctuation_density/wide.rs
diff --git a/tests/source/configs-use_try_shorthand-false.rs b/tests/source/configs/use_try_shorthand/false.rs
similarity index 100%
rename from tests/source/configs-use_try_shorthand-false.rs
rename to tests/source/configs/use_try_shorthand/false.rs
diff --git a/tests/source/configs-use_try_shorthand-true.rs b/tests/source/configs/use_try_shorthand/true.rs
similarity index 100%
rename from tests/source/configs-use_try_shorthand-true.rs
rename to tests/source/configs/use_try_shorthand/true.rs
diff --git a/tests/source/configs-where_single_line.rs b/tests/source/configs/where_single_line/true.rs
similarity index 100%
rename from tests/source/configs-where_single_line.rs
rename to tests/source/configs/where_single_line/true.rs
diff --git a/tests/source/configs-wrap_comments-false.rs b/tests/source/configs/wrap_comments/false.rs
similarity index 100%
rename from tests/source/configs-wrap_comments-false.rs
rename to tests/source/configs/wrap_comments/false.rs
diff --git a/tests/source/configs-wrap_comments-true.rs b/tests/source/configs/wrap_comments/true.rs
similarity index 100%
rename from tests/source/configs-wrap_comments-true.rs
rename to tests/source/configs/wrap_comments/true.rs
diff --git a/tests/system.rs b/tests/system.rs
index 69da2b2e4322..ebb46f002a26 100644
--- a/tests/system.rs
+++ b/tests/system.rs
@@ -52,6 +52,52 @@ fn get_test_files(path: &Path, recursive: bool) -> Vec<PathBuf> {
     files
 }
 
+fn verify_config_used(path: &Path, config_name: &str) {
+    for entry in fs::read_dir(path).expect(&format!(
+        "Couldn't read {} directory",
+        path.to_str().unwrap()
+    )) {
+        let entry = entry.expect("Couldn't get directory entry");
+        let path = entry.path();
+        if path.extension().map_or(false, |f| f == "rs") {
+            // check if "// rustfmt-<config_name>:" appears in the file.
+            let filebuf = BufReader::new(
+                fs::File::open(&path).expect(&format!("Couldn't read file {}", path.display())),
+            );
+            assert!(
+                filebuf
+                    .lines()
+                    .map(|l| l.unwrap())
+                    .take_while(|l| l.starts_with("//"))
+                    .any(|l| l.starts_with(&format!("// rustfmt-{}", config_name))),
+                format!(
+                    "config option file {} does not contain expected config name",
+                    path.display()
+                )
+            );
+        }
+    }
+}
+
+#[test]
+fn verify_config_test_names() {
+    for path in &[
+        Path::new("tests/source/configs"),
+        Path::new("tests/target/configs"),
+    ] {
+        for entry in fs::read_dir(path).expect("Couldn't read configs directory") {
+            let entry = entry.expect("Couldn't get directory entry");
+            let path = entry.path();
+            if path.is_dir() {
+                let config_name = path.file_name().unwrap().to_str().unwrap();
+
+                // Make sure that config name is used in the files in the directory.
+                verify_config_used(&path, &config_name);
+            }
+        }
+    }
+}
+
 // Integration tests. The files in the tests/source are formatted and compared
 // to their equivalent in tests/target. The target file and config can be
 // overridden by annotations in the source file. The input and output must match
diff --git a/tests/target/configs-blank_lines_lower_bound-1.rs b/tests/target/configs/blank_lines_lower_bound/1.rs
similarity index 100%
rename from tests/target/configs-blank_lines_lower_bound-1.rs
rename to tests/target/configs/blank_lines_lower_bound/1.rs
diff --git a/tests/target/configs-fn_brace_style-always_next_line.rs b/tests/target/configs/brace_style/fn_always_next_line.rs
similarity index 100%
rename from tests/target/configs-fn_brace_style-always_next_line.rs
rename to tests/target/configs/brace_style/fn_always_next_line.rs
diff --git a/tests/target/configs-fn_brace_style-prefer_same_line.rs b/tests/target/configs/brace_style/fn_prefer_same_line.rs
similarity index 100%
rename from tests/target/configs-fn_brace_style-prefer_same_line.rs
rename to tests/target/configs/brace_style/fn_prefer_same_line.rs
diff --git a/tests/target/configs-fn_brace_style-same_line_where.rs b/tests/target/configs/brace_style/fn_same_line_where.rs
similarity index 100%
rename from tests/target/configs-fn_brace_style-same_line_where.rs
rename to tests/target/configs/brace_style/fn_same_line_where.rs
diff --git a/tests/target/configs-item_brace_style-always_next_line.rs b/tests/target/configs/brace_style/item_always_next_line.rs
similarity index 100%
rename from tests/target/configs-item_brace_style-always_next_line.rs
rename to tests/target/configs/brace_style/item_always_next_line.rs
diff --git a/tests/target/configs-item_brace_style-prefer_same_line.rs b/tests/target/configs/brace_style/item_prefer_same_line.rs
similarity index 100%
rename from tests/target/configs-item_brace_style-prefer_same_line.rs
rename to tests/target/configs/brace_style/item_prefer_same_line.rs
diff --git a/tests/target/configs-item_brace_style-same_line_where.rs b/tests/target/configs/brace_style/item_same_line_where.rs
similarity index 100%
rename from tests/target/configs-item_brace_style-same_line_where.rs
rename to tests/target/configs/brace_style/item_same_line_where.rs
diff --git a/tests/target/configs-combine_control_expr-false.rs b/tests/target/configs/combine_control_expr/false.rs
similarity index 100%
rename from tests/target/configs-combine_control_expr-false.rs
rename to tests/target/configs/combine_control_expr/false.rs
diff --git a/tests/target/configs-combine_control_expr-true.rs b/tests/target/configs/combine_control_expr/true.rs
similarity index 100%
rename from tests/target/configs-combine_control_expr-true.rs
rename to tests/target/configs/combine_control_expr/true.rs
diff --git a/tests/target/configs-comment_width-above.rs b/tests/target/configs/comment_width/above.rs
similarity index 100%
rename from tests/target/configs-comment_width-above.rs
rename to tests/target/configs/comment_width/above.rs
diff --git a/tests/target/configs-comment_width-below.rs b/tests/target/configs/comment_width/below.rs
similarity index 100%
rename from tests/target/configs-comment_width-below.rs
rename to tests/target/configs/comment_width/below.rs
diff --git a/tests/target/configs-comment_width-ignore.rs b/tests/target/configs/comment_width/ignore.rs
similarity index 100%
rename from tests/target/configs-comment_width-ignore.rs
rename to tests/target/configs/comment_width/ignore.rs
diff --git a/tests/target/configs-condense_wildcard_suffices-false.rs b/tests/target/configs/condense_wildcard_suffixes/false.rs
similarity index 100%
rename from tests/target/configs-condense_wildcard_suffices-false.rs
rename to tests/target/configs/condense_wildcard_suffixes/false.rs
diff --git a/tests/target/configs-condense_wildcard_suffices-true.rs b/tests/target/configs/condense_wildcard_suffixes/true.rs
similarity index 100%
rename from tests/target/configs-condense_wildcard_suffices-true.rs
rename to tests/target/configs/condense_wildcard_suffixes/true.rs
diff --git a/tests/target/configs-control_brace_style-always_next_line.rs b/tests/target/configs/control_brace_style/always_next_line.rs
similarity index 100%
rename from tests/target/configs-control_brace_style-always_next_line.rs
rename to tests/target/configs/control_brace_style/always_next_line.rs
diff --git a/tests/target/configs-control_brace_style-always_same_line.rs b/tests/target/configs/control_brace_style/always_same_line.rs
similarity index 100%
rename from tests/target/configs-control_brace_style-always_same_line.rs
rename to tests/target/configs/control_brace_style/always_same_line.rs
diff --git a/tests/target/configs-control_brace_style-closing_next_line.rs b/tests/target/configs/control_brace_style/closing_next_line.rs
similarity index 100%
rename from tests/target/configs-control_brace_style-closing_next_line.rs
rename to tests/target/configs/control_brace_style/closing_next_line.rs
diff --git a/tests/target/configs-disable_all_formatting-false.rs b/tests/target/configs/disable_all_formatting/false.rs
similarity index 100%
rename from tests/target/configs-disable_all_formatting-false.rs
rename to tests/target/configs/disable_all_formatting/false.rs
diff --git a/tests/target/configs-disable_all_formatting-true.rs b/tests/target/configs/disable_all_formatting/true.rs
similarity index 100%
rename from tests/target/configs-disable_all_formatting-true.rs
rename to tests/target/configs/disable_all_formatting/true.rs
diff --git a/tests/target/configs-empty_item_single_line-false.rs b/tests/target/configs/empty_item_single_line/false.rs
similarity index 100%
rename from tests/target/configs-empty_item_single_line-false.rs
rename to tests/target/configs/empty_item_single_line/false.rs
diff --git a/tests/target/configs-empty_item_single_line-true.rs b/tests/target/configs/empty_item_single_line/true.rs
similarity index 100%
rename from tests/target/configs-empty_item_single_line-true.rs
rename to tests/target/configs/empty_item_single_line/true.rs
diff --git a/tests/target/configs-error_on_line_overflow-false.rs b/tests/target/configs/error_on_line_overflow/false.rs
similarity index 100%
rename from tests/target/configs-error_on_line_overflow-false.rs
rename to tests/target/configs/error_on_line_overflow/false.rs
diff --git a/tests/target/configs-error_on_unformatted-false.rs b/tests/target/configs/error_on_unformatted/false.rs
similarity index 100%
rename from tests/target/configs-error_on_unformatted-false.rs
rename to tests/target/configs/error_on_unformatted/false.rs
diff --git a/tests/target/configs-fn_args_density-compressed.rs b/tests/target/configs/fn_args_density/compressed.rs
similarity index 100%
rename from tests/target/configs-fn_args_density-compressed.rs
rename to tests/target/configs/fn_args_density/compressed.rs
diff --git a/tests/target/configs-fn_args_density-tall.rs b/tests/target/configs/fn_args_density/tall.rs
similarity index 100%
rename from tests/target/configs-fn_args_density-tall.rs
rename to tests/target/configs/fn_args_density/tall.rs
diff --git a/tests/target/configs-fn_args_density-vertical.rs b/tests/target/configs/fn_args_density/vertical.rs
similarity index 100%
rename from tests/target/configs-fn_args_density-vertical.rs
rename to tests/target/configs/fn_args_density/vertical.rs
diff --git a/tests/target/configs-fn_single_line-false.rs b/tests/target/configs/fn_single_line/false.rs
similarity index 100%
rename from tests/target/configs-fn_single_line-false.rs
rename to tests/target/configs/fn_single_line/false.rs
diff --git a/tests/target/configs-fn_single_line-true.rs b/tests/target/configs/fn_single_line/true.rs
similarity index 100%
rename from tests/target/configs-fn_single_line-true.rs
rename to tests/target/configs/fn_single_line/true.rs
diff --git a/tests/target/configs-force_explicit_abi-false.rs b/tests/target/configs/force_explicit_abi/false.rs
similarity index 100%
rename from tests/target/configs-force_explicit_abi-false.rs
rename to tests/target/configs/force_explicit_abi/false.rs
diff --git a/tests/target/configs-force_explicit_abi-true.rs b/tests/target/configs/force_explicit_abi/true.rs
similarity index 100%
rename from tests/target/configs-force_explicit_abi-true.rs
rename to tests/target/configs/force_explicit_abi/true.rs
diff --git a/tests/target/configs-force_multiline_block-false.rs b/tests/target/configs/force_multiline_block/false.rs
similarity index 100%
rename from tests/target/configs-force_multiline_block-false.rs
rename to tests/target/configs/force_multiline_block/false.rs
diff --git a/tests/target/configs-force_multiline_block-true.rs b/tests/target/configs/force_multiline_block/true.rs
similarity index 100%
rename from tests/target/configs-force_multiline_block-true.rs
rename to tests/target/configs/force_multiline_block/true.rs
diff --git a/tests/target/configs-format_strings-false.rs b/tests/target/configs/format_strings/false.rs
similarity index 100%
rename from tests/target/configs-format_strings-false.rs
rename to tests/target/configs/format_strings/false.rs
diff --git a/tests/target/configs-format_strings-true.rs b/tests/target/configs/format_strings/true.rs
similarity index 100%
rename from tests/target/configs-format_strings-true.rs
rename to tests/target/configs/format_strings/true.rs
diff --git a/tests/target/configs-hard_tabs-false.rs b/tests/target/configs/hard_tabs/false.rs
similarity index 100%
rename from tests/target/configs-hard_tabs-false.rs
rename to tests/target/configs/hard_tabs/false.rs
diff --git a/tests/target/configs-hard_tabs-true.rs b/tests/target/configs/hard_tabs/true.rs
similarity index 100%
rename from tests/target/configs-hard_tabs-true.rs
rename to tests/target/configs/hard_tabs/true.rs
diff --git a/tests/target/configs-imports_indent-block.rs b/tests/target/configs/imports_indent/block.rs
similarity index 100%
rename from tests/target/configs-imports_indent-block.rs
rename to tests/target/configs/imports_indent/block.rs
diff --git a/tests/target/configs-imports_layout-horizontal_vertical.rs b/tests/target/configs/imports_layout/horizontal_vertical.rs
similarity index 100%
rename from tests/target/configs-imports_layout-horizontal_vertical.rs
rename to tests/target/configs/imports_layout/horizontal_vertical.rs
diff --git a/tests/target/configs-imports_layout-mixed.rs b/tests/target/configs/imports_layout/mixed.rs
similarity index 100%
rename from tests/target/configs-imports_layout-mixed.rs
rename to tests/target/configs/imports_layout/mixed.rs
diff --git a/tests/target/configs-fn_args_indent-block.rs b/tests/target/configs/indent_style/block_args.rs
similarity index 100%
rename from tests/target/configs-fn_args_indent-block.rs
rename to tests/target/configs/indent_style/block_args.rs
diff --git a/tests/target/configs-array_indent-block.rs b/tests/target/configs/indent_style/block_array.rs
similarity index 100%
rename from tests/target/configs-array_indent-block.rs
rename to tests/target/configs/indent_style/block_array.rs
diff --git a/tests/target/configs-fn_call_indent-block.rs b/tests/target/configs/indent_style/block_call.rs
similarity index 100%
rename from tests/target/configs-fn_call_indent-block.rs
rename to tests/target/configs/indent_style/block_call.rs
diff --git a/tests/target/configs-chain_indent-block.rs b/tests/target/configs/indent_style/block_chain.rs
similarity index 100%
rename from tests/target/configs-chain_indent-block.rs
rename to tests/target/configs/indent_style/block_chain.rs
diff --git a/tests/target/configs-generics_indent-block.rs b/tests/target/configs/indent_style/block_generic.rs
similarity index 100%
rename from tests/target/configs-generics_indent-block.rs
rename to tests/target/configs/indent_style/block_generic.rs
diff --git a/tests/target/configs-struct_lit_indent-block.rs b/tests/target/configs/indent_style/block_struct_lit.rs
similarity index 100%
rename from tests/target/configs-struct_lit_indent-block.rs
rename to tests/target/configs/indent_style/block_struct_lit.rs
diff --git a/tests/target/configs-fn_call_indent-block-tab_spaces-2.rs b/tests/target/configs/indent_style/block_tab_spaces_call.rs
similarity index 100%
rename from tests/target/configs-fn_call_indent-block-tab_spaces-2.rs
rename to tests/target/configs/indent_style/block_tab_spaces_call.rs
diff --git a/tests/target/configs-fn_call_indent-block-trailing-comma.rs b/tests/target/configs/indent_style/block_trailing_comma_call.rs
similarity index 100%
rename from tests/target/configs-fn_call_indent-block-trailing-comma.rs
rename to tests/target/configs/indent_style/block_trailing_comma_call.rs
diff --git a/tests/target/configs-where_pred_indent-block.rs b/tests/target/configs/indent_style/block_where_pred.rs
similarity index 100%
rename from tests/target/configs-where_pred_indent-block.rs
rename to tests/target/configs/indent_style/block_where_pred.rs
diff --git a/tests/target/configs-where_style-default.rs b/tests/target/configs/indent_style/default.rs
similarity index 100%
rename from tests/target/configs-where_style-default.rs
rename to tests/target/configs/indent_style/default.rs
diff --git a/tests/target/configs-control_style-rfc.rs b/tests/target/configs/indent_style/rfc_control.rs
similarity index 100%
rename from tests/target/configs-control_style-rfc.rs
rename to tests/target/configs/indent_style/rfc_control.rs
diff --git a/tests/target/configs-where_style-rfc.rs b/tests/target/configs/indent_style/rfc_where.rs
similarity index 100%
rename from tests/target/configs-where_style-rfc.rs
rename to tests/target/configs/indent_style/rfc_where.rs
diff --git a/tests/target/configs-fn_args_indent-visual.rs b/tests/target/configs/indent_style/visual_args.rs
similarity index 100%
rename from tests/target/configs-fn_args_indent-visual.rs
rename to tests/target/configs/indent_style/visual_args.rs
diff --git a/tests/target/configs-array_indent-visual.rs b/tests/target/configs/indent_style/visual_array.rs
similarity index 100%
rename from tests/target/configs-array_indent-visual.rs
rename to tests/target/configs/indent_style/visual_array.rs
diff --git a/tests/target/configs-fn_call_indent-visual.rs b/tests/target/configs/indent_style/visual_call.rs
similarity index 100%
rename from tests/target/configs-fn_call_indent-visual.rs
rename to tests/target/configs/indent_style/visual_call.rs
diff --git a/tests/target/configs-chain_indent-visual.rs b/tests/target/configs/indent_style/visual_chain.rs
similarity index 100%
rename from tests/target/configs-chain_indent-visual.rs
rename to tests/target/configs/indent_style/visual_chain.rs
diff --git a/tests/target/configs-generics_indent-visual.rs b/tests/target/configs/indent_style/visual_generics.rs
similarity index 100%
rename from tests/target/configs-generics_indent-visual.rs
rename to tests/target/configs/indent_style/visual_generics.rs
diff --git a/tests/target/configs-struct_lit_indent-visual.rs b/tests/target/configs/indent_style/visual_struct_lit.rs
similarity index 100%
rename from tests/target/configs-struct_lit_indent-visual.rs
rename to tests/target/configs/indent_style/visual_struct_lit.rs
diff --git a/tests/target/configs-fn_call_indent-visual-trailing-comma.rs b/tests/target/configs/indent_style/visual_trailing_comma.rs
similarity index 100%
rename from tests/target/configs-fn_call_indent-visual-trailing-comma.rs
rename to tests/target/configs/indent_style/visual_trailing_comma.rs
diff --git a/tests/target/configs-where_pred_indent-visual.rs b/tests/target/configs/indent_style/visual_where_pred.rs
similarity index 100%
rename from tests/target/configs-where_pred_indent-visual.rs
rename to tests/target/configs/indent_style/visual_where_pred.rs
diff --git a/tests/target/configs-match_arm_blocks-false.rs b/tests/target/configs/match_arm_blocks/false.rs
similarity index 100%
rename from tests/target/configs-match_arm_blocks-false.rs
rename to tests/target/configs/match_arm_blocks/false.rs
diff --git a/tests/target/configs-match_arm_blocks-true.rs b/tests/target/configs/match_arm_blocks/true.rs
similarity index 100%
rename from tests/target/configs-match_arm_blocks-true.rs
rename to tests/target/configs/match_arm_blocks/true.rs
diff --git a/tests/target/configs-match_block_trailing_comma-false.rs b/tests/target/configs/match_block_trailing_comma/false.rs
similarity index 100%
rename from tests/target/configs-match_block_trailing_comma-false.rs
rename to tests/target/configs/match_block_trailing_comma/false.rs
diff --git a/tests/target/configs-match_block_trailing_comma-true.rs b/tests/target/configs/match_block_trailing_comma/true.rs
similarity index 100%
rename from tests/target/configs-match_block_trailing_comma-true.rs
rename to tests/target/configs/match_block_trailing_comma/true.rs
diff --git a/tests/target/configs-merge_derives-true.rs b/tests/target/configs/merge_derives/true.rs
similarity index 100%
rename from tests/target/configs-merge_derives-true.rs
rename to tests/target/configs/merge_derives/true.rs
diff --git a/tests/target/configs-normalize_comments-false.rs b/tests/target/configs/normalize_comments/false.rs
similarity index 100%
rename from tests/target/configs-normalize_comments-false.rs
rename to tests/target/configs/normalize_comments/false.rs
diff --git a/tests/target/configs-normalize_comments-true.rs b/tests/target/configs/normalize_comments/true.rs
similarity index 100%
rename from tests/target/configs-normalize_comments-true.rs
rename to tests/target/configs/normalize_comments/true.rs
diff --git a/tests/target/configs-reorder_imported_names-false.rs b/tests/target/configs/reorder_imported_names/false.rs
similarity index 100%
rename from tests/target/configs-reorder_imported_names-false.rs
rename to tests/target/configs/reorder_imported_names/false.rs
diff --git a/tests/target/configs-reorder_imported_names-true.rs b/tests/target/configs/reorder_imported_names/true.rs
similarity index 100%
rename from tests/target/configs-reorder_imported_names-true.rs
rename to tests/target/configs/reorder_imported_names/true.rs
diff --git a/tests/target/configs-reorder_imports-false.rs b/tests/target/configs/reorder_imports/false.rs
similarity index 100%
rename from tests/target/configs-reorder_imports-false.rs
rename to tests/target/configs/reorder_imports/false.rs
diff --git a/tests/target/configs-reorder_imports-true.rs b/tests/target/configs/reorder_imports/true.rs
similarity index 100%
rename from tests/target/configs-reorder_imports-true.rs
rename to tests/target/configs/reorder_imports/true.rs
diff --git a/tests/target/configs-reorder_imports_in_group-false.rs b/tests/target/configs/reorder_imports_in_group/false.rs
similarity index 100%
rename from tests/target/configs-reorder_imports_in_group-false.rs
rename to tests/target/configs/reorder_imports_in_group/false.rs
diff --git a/tests/target/configs-reorder_imports_in_group-true.rs b/tests/target/configs/reorder_imports_in_group/true.rs
similarity index 100%
rename from tests/target/configs-reorder_imports_in_group-true.rs
rename to tests/target/configs/reorder_imports_in_group/true.rs
diff --git a/tests/target/configs-same_line_attributes-false.rs b/tests/target/configs/same_line_attributes/false.rs
similarity index 100%
rename from tests/target/configs-same_line_attributes-false.rs
rename to tests/target/configs/same_line_attributes/false.rs
diff --git a/tests/target/configs-same_line_attributes-true.rs b/tests/target/configs/same_line_attributes/true.rs
similarity index 100%
rename from tests/target/configs-same_line_attributes-true.rs
rename to tests/target/configs/same_line_attributes/true.rs
diff --git a/tests/target/configs-space_before_colon-true.rs b/tests/target/configs/space_before_colon/true.rs
similarity index 100%
rename from tests/target/configs-space_before_colon-true.rs
rename to tests/target/configs/space_before_colon/true.rs
diff --git a/tests/target/configs-spaces_around_ranges-false.rs b/tests/target/configs/spaces_around_ranges/false.rs
similarity index 100%
rename from tests/target/configs-spaces_around_ranges-false.rs
rename to tests/target/configs/spaces_around_ranges/false.rs
diff --git a/tests/target/configs-spaces_around_ranges-true.rs b/tests/target/configs/spaces_around_ranges/true.rs
similarity index 100%
rename from tests/target/configs-spaces_around_ranges-true.rs
rename to tests/target/configs/spaces_around_ranges/true.rs
diff --git a/tests/target/configs-spaces_within_parens_and_brackets-false.rs b/tests/target/configs/spaces_within_parens_and_brackets/false.rs
similarity index 100%
rename from tests/target/configs-spaces_within_parens_and_brackets-false.rs
rename to tests/target/configs/spaces_within_parens_and_brackets/false.rs
diff --git a/tests/target/configs-spaces_within_parens_and_brackets-true.rs b/tests/target/configs/spaces_within_parens_and_brackets/true.rs
similarity index 100%
rename from tests/target/configs-spaces_within_parens_and_brackets-true.rs
rename to tests/target/configs/spaces_within_parens_and_brackets/true.rs
diff --git a/tests/target/configs-struct_field_align_threshold-20.rs b/tests/target/configs/struct_field_align_threshold/20.rs
similarity index 100%
rename from tests/target/configs-struct_field_align_threshold-20.rs
rename to tests/target/configs/struct_field_align_threshold/20.rs
diff --git a/tests/target/configs-struct_lit_single_line-false.rs b/tests/target/configs/struct_lit_single_line/false.rs
similarity index 100%
rename from tests/target/configs-struct_lit_single_line-false.rs
rename to tests/target/configs/struct_lit_single_line/false.rs
diff --git a/tests/target/configs-tab_spaces-2.rs b/tests/target/configs/tab_spaces/2.rs
similarity index 100%
rename from tests/target/configs-tab_spaces-2.rs
rename to tests/target/configs/tab_spaces/2.rs
diff --git a/tests/target/configs-tab_spaces-4.rs b/tests/target/configs/tab_spaces/4.rs
similarity index 100%
rename from tests/target/configs-tab_spaces-4.rs
rename to tests/target/configs/tab_spaces/4.rs
diff --git a/tests/target/configs-trailing_comma-always.rs b/tests/target/configs/trailing_comma/always.rs
similarity index 100%
rename from tests/target/configs-trailing_comma-always.rs
rename to tests/target/configs/trailing_comma/always.rs
diff --git a/tests/target/configs-trailing_comma-never.rs b/tests/target/configs/trailing_comma/never.rs
similarity index 100%
rename from tests/target/configs-trailing_comma-never.rs
rename to tests/target/configs/trailing_comma/never.rs
diff --git a/tests/target/configs-trailing_comma-vertical.rs b/tests/target/configs/trailing_comma/vertical.rs
similarity index 100%
rename from tests/target/configs-trailing_comma-vertical.rs
rename to tests/target/configs/trailing_comma/vertical.rs
diff --git a/tests/target/configs-trailing_semicolon-false.rs b/tests/target/configs/trailing_semicolon/false.rs
similarity index 100%
rename from tests/target/configs-trailing_semicolon-false.rs
rename to tests/target/configs/trailing_semicolon/false.rs
diff --git a/tests/target/configs-trailing_semicolon-true.rs b/tests/target/configs/trailing_semicolon/true.rs
similarity index 100%
rename from tests/target/configs-trailing_semicolon-true.rs
rename to tests/target/configs/trailing_semicolon/true.rs
diff --git a/tests/target/configs-type_punctuation_density-compressed.rs b/tests/target/configs/type_punctuation_density/compressed.rs
similarity index 100%
rename from tests/target/configs-type_punctuation_density-compressed.rs
rename to tests/target/configs/type_punctuation_density/compressed.rs
diff --git a/tests/target/configs-type_punctuation_density-wide.rs b/tests/target/configs/type_punctuation_density/wide.rs
similarity index 100%
rename from tests/target/configs-type_punctuation_density-wide.rs
rename to tests/target/configs/type_punctuation_density/wide.rs
diff --git a/tests/target/configs-use_try_shorthand-false.rs b/tests/target/configs/use_try_shorthand/false.rs
similarity index 100%
rename from tests/target/configs-use_try_shorthand-false.rs
rename to tests/target/configs/use_try_shorthand/false.rs
diff --git a/tests/target/configs-use_try_shorthand-true.rs b/tests/target/configs/use_try_shorthand/true.rs
similarity index 100%
rename from tests/target/configs-use_try_shorthand-true.rs
rename to tests/target/configs/use_try_shorthand/true.rs
diff --git a/tests/target/configs-where_single_line.rs b/tests/target/configs/where_single_line/true.rs
similarity index 100%
rename from tests/target/configs-where_single_line.rs
rename to tests/target/configs/where_single_line/true.rs
diff --git a/tests/target/configs-wrap_comments-false.rs b/tests/target/configs/wrap_comments/false.rs
similarity index 100%
rename from tests/target/configs-wrap_comments-false.rs
rename to tests/target/configs/wrap_comments/false.rs
diff --git a/tests/target/configs-wrap_comments-true.rs b/tests/target/configs/wrap_comments/true.rs
similarity index 100%
rename from tests/target/configs-wrap_comments-true.rs
rename to tests/target/configs/wrap_comments/true.rs