diff --git a/tests/snapshots/add/add_basic.in b/tests/snapshots/add/add_basic.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/add_basic.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/add_basic/in b/tests/snapshots/add/add_basic/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/add_basic/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/add_basic.out/Cargo.toml b/tests/snapshots/add/add_basic/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/add_basic.out/Cargo.toml
rename to tests/snapshots/add/add_basic/out/Cargo.toml
diff --git a/tests/snapshots/add/add_basic.stderr b/tests/snapshots/add/add_basic/stderr.log
similarity index 100%
rename from tests/snapshots/add/add_basic.stderr
rename to tests/snapshots/add/add_basic/stderr.log
diff --git a/tests/snapshots/add/add_basic.stdout b/tests/snapshots/add/add_basic/stdout.log
similarity index 100%
rename from tests/snapshots/add/add_basic.stdout
rename to tests/snapshots/add/add_basic/stdout.log
diff --git a/tests/snapshots/add/add_multiple.in b/tests/snapshots/add/add_multiple.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/add_multiple.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/add_multiple/in b/tests/snapshots/add/add_multiple/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/add_multiple/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/add_multiple.out/Cargo.toml b/tests/snapshots/add/add_multiple/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/add_multiple.out/Cargo.toml
rename to tests/snapshots/add/add_multiple/out/Cargo.toml
diff --git a/tests/snapshots/add/add_multiple.stderr b/tests/snapshots/add/add_multiple/stderr.log
similarity index 100%
rename from tests/snapshots/add/add_multiple.stderr
rename to tests/snapshots/add/add_multiple/stderr.log
diff --git a/tests/snapshots/add/add_multiple.stdout b/tests/snapshots/add/add_multiple/stdout.log
similarity index 100%
rename from tests/snapshots/add/add_multiple.stdout
rename to tests/snapshots/add/add_multiple/stdout.log
diff --git a/tests/snapshots/add/add_normalized_name_external.in b/tests/snapshots/add/add_normalized_name_external.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/add_normalized_name_external.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/add_normalized_name_external/in b/tests/snapshots/add/add_normalized_name_external/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/add_normalized_name_external/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/add_normalized_name_external.out/Cargo.toml b/tests/snapshots/add/add_normalized_name_external/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/add_normalized_name_external.out/Cargo.toml
rename to tests/snapshots/add/add_normalized_name_external/out/Cargo.toml
diff --git a/tests/snapshots/add/add_normalized_name_external.stderr b/tests/snapshots/add/add_normalized_name_external/stderr.log
similarity index 100%
rename from tests/snapshots/add/add_normalized_name_external.stderr
rename to tests/snapshots/add/add_normalized_name_external/stderr.log
diff --git a/tests/snapshots/add/add_normalized_name_external.stdout b/tests/snapshots/add/add_normalized_name_external/stdout.log
similarity index 100%
rename from tests/snapshots/add/add_normalized_name_external.stdout
rename to tests/snapshots/add/add_normalized_name_external/stdout.log
diff --git a/tests/snapshots/add/build.in b/tests/snapshots/add/build.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/build.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/build/in b/tests/snapshots/add/build/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/build/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/build.out/Cargo.toml b/tests/snapshots/add/build/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/build.out/Cargo.toml
rename to tests/snapshots/add/build/out/Cargo.toml
diff --git a/tests/snapshots/add/build.stderr b/tests/snapshots/add/build/stderr.log
similarity index 100%
rename from tests/snapshots/add/build.stderr
rename to tests/snapshots/add/build/stderr.log
diff --git a/tests/snapshots/add/build.stdout b/tests/snapshots/add/build/stdout.log
similarity index 100%
rename from tests/snapshots/add/build.stdout
rename to tests/snapshots/add/build/stdout.log
diff --git a/tests/snapshots/add/build_prefer_existing_version.in/Cargo.toml b/tests/snapshots/add/build_prefer_existing_version/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/build_prefer_existing_version.in/Cargo.toml
rename to tests/snapshots/add/build_prefer_existing_version/in/Cargo.toml
diff --git a/tests/snapshots/add/build_prefer_existing_version.in/dependency/Cargo.toml b/tests/snapshots/add/build_prefer_existing_version/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/build_prefer_existing_version.in/dependency/Cargo.toml
rename to tests/snapshots/add/build_prefer_existing_version/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/build_prefer_existing_version.in/dependency/src/lib.rs b/tests/snapshots/add/build_prefer_existing_version/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/build_prefer_existing_version.in/dependency/src/lib.rs
rename to tests/snapshots/add/build_prefer_existing_version/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/build_prefer_existing_version.in/src/lib.rs b/tests/snapshots/add/build_prefer_existing_version/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/build_prefer_existing_version.in/src/lib.rs
rename to tests/snapshots/add/build_prefer_existing_version/in/src/lib.rs
diff --git a/tests/snapshots/add/build_prefer_existing_version.out/Cargo.toml b/tests/snapshots/add/build_prefer_existing_version/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/build_prefer_existing_version.out/Cargo.toml
rename to tests/snapshots/add/build_prefer_existing_version/out/Cargo.toml
diff --git a/tests/snapshots/add/build_prefer_existing_version.out/dependency/Cargo.toml b/tests/snapshots/add/build_prefer_existing_version/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/build_prefer_existing_version.out/dependency/Cargo.toml
rename to tests/snapshots/add/build_prefer_existing_version/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/build_prefer_existing_version.stderr b/tests/snapshots/add/build_prefer_existing_version/stderr.log
similarity index 100%
rename from tests/snapshots/add/build_prefer_existing_version.stderr
rename to tests/snapshots/add/build_prefer_existing_version/stderr.log
diff --git a/tests/snapshots/add/build_prefer_existing_version.stdout b/tests/snapshots/add/build_prefer_existing_version/stdout.log
similarity index 100%
rename from tests/snapshots/add/build_prefer_existing_version.stdout
rename to tests/snapshots/add/build_prefer_existing_version/stdout.log
diff --git a/tests/snapshots/add/change_rename_target.in/Cargo.toml b/tests/snapshots/add/change_rename_target/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/change_rename_target.in/Cargo.toml
rename to tests/snapshots/add/change_rename_target/in/Cargo.toml
diff --git a/tests/snapshots/add/change_rename_target.in/src/lib.rs b/tests/snapshots/add/change_rename_target/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/change_rename_target.in/src/lib.rs
rename to tests/snapshots/add/change_rename_target/in/src/lib.rs
diff --git a/tests/snapshots/add/change_rename_target.out/Cargo.toml b/tests/snapshots/add/change_rename_target/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/change_rename_target.out/Cargo.toml
rename to tests/snapshots/add/change_rename_target/out/Cargo.toml
diff --git a/tests/snapshots/add/change_rename_target.stderr b/tests/snapshots/add/change_rename_target/stderr.log
similarity index 100%
rename from tests/snapshots/add/change_rename_target.stderr
rename to tests/snapshots/add/change_rename_target/stderr.log
diff --git a/tests/snapshots/add/change_rename_target.stdout b/tests/snapshots/add/change_rename_target/stdout.log
similarity index 100%
rename from tests/snapshots/add/change_rename_target.stdout
rename to tests/snapshots/add/change_rename_target/stdout.log
diff --git a/tests/snapshots/add/default_features.in b/tests/snapshots/add/default_features.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/default_features.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/default_features/in b/tests/snapshots/add/default_features/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/default_features/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/default_features.out/Cargo.toml b/tests/snapshots/add/default_features/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/default_features.out/Cargo.toml
rename to tests/snapshots/add/default_features/out/Cargo.toml
diff --git a/tests/snapshots/add/default_features.stderr b/tests/snapshots/add/default_features/stderr.log
similarity index 100%
rename from tests/snapshots/add/default_features.stderr
rename to tests/snapshots/add/default_features/stderr.log
diff --git a/tests/snapshots/add/default_features.stdout b/tests/snapshots/add/default_features/stdout.log
similarity index 100%
rename from tests/snapshots/add/default_features.stdout
rename to tests/snapshots/add/default_features/stdout.log
diff --git a/tests/snapshots/add/deprecated_default_features.in/Cargo.toml b/tests/snapshots/add/deprecated_default_features/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/deprecated_default_features.in/Cargo.toml
rename to tests/snapshots/add/deprecated_default_features/in/Cargo.toml
diff --git a/tests/snapshots/add/deprecated_default_features.in/src/lib.rs b/tests/snapshots/add/deprecated_default_features/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/deprecated_default_features.in/src/lib.rs
rename to tests/snapshots/add/deprecated_default_features/in/src/lib.rs
diff --git a/tests/snapshots/add/deprecated_default_features.out/Cargo.toml b/tests/snapshots/add/deprecated_default_features/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/deprecated_default_features.out/Cargo.toml
rename to tests/snapshots/add/deprecated_default_features/out/Cargo.toml
diff --git a/tests/snapshots/add/deprecated_default_features.stderr b/tests/snapshots/add/deprecated_default_features/stderr.log
similarity index 100%
rename from tests/snapshots/add/deprecated_default_features.stderr
rename to tests/snapshots/add/deprecated_default_features/stderr.log
diff --git a/tests/snapshots/add/deprecated_default_features.stdout b/tests/snapshots/add/deprecated_default_features/stdout.log
similarity index 100%
rename from tests/snapshots/add/deprecated_default_features.stdout
rename to tests/snapshots/add/deprecated_default_features/stdout.log
diff --git a/tests/snapshots/add/deprecated_section.in/Cargo.toml b/tests/snapshots/add/deprecated_section/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/deprecated_section.in/Cargo.toml
rename to tests/snapshots/add/deprecated_section/in/Cargo.toml
diff --git a/tests/snapshots/add/deprecated_section.in/src/lib.rs b/tests/snapshots/add/deprecated_section/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/deprecated_section.in/src/lib.rs
rename to tests/snapshots/add/deprecated_section/in/src/lib.rs
diff --git a/tests/snapshots/add/deprecated_section.out/Cargo.toml b/tests/snapshots/add/deprecated_section/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/deprecated_section.out/Cargo.toml
rename to tests/snapshots/add/deprecated_section/out/Cargo.toml
diff --git a/tests/snapshots/add/deprecated_section.stderr b/tests/snapshots/add/deprecated_section/stderr.log
similarity index 100%
rename from tests/snapshots/add/deprecated_section.stderr
rename to tests/snapshots/add/deprecated_section/stderr.log
diff --git a/tests/snapshots/add/deprecated_section.stdout b/tests/snapshots/add/deprecated_section/stdout.log
similarity index 100%
rename from tests/snapshots/add/deprecated_section.stdout
rename to tests/snapshots/add/deprecated_section/stdout.log
diff --git a/tests/snapshots/add/detect_workspace_inherit.in/Cargo.toml b/tests/snapshots/add/detect_workspace_inherit/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit.in/Cargo.toml
rename to tests/snapshots/add/detect_workspace_inherit/in/Cargo.toml
diff --git a/tests/snapshots/add/detect_workspace_inherit.in/dependency/Cargo.toml b/tests/snapshots/add/detect_workspace_inherit/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit.in/dependency/Cargo.toml
rename to tests/snapshots/add/detect_workspace_inherit/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/detect_workspace_inherit.in/dependency/src/lib.rs b/tests/snapshots/add/detect_workspace_inherit/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit.in/dependency/src/lib.rs
rename to tests/snapshots/add/detect_workspace_inherit/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/detect_workspace_inherit.in/primary/Cargo.toml b/tests/snapshots/add/detect_workspace_inherit/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit.in/primary/Cargo.toml
rename to tests/snapshots/add/detect_workspace_inherit/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/detect_workspace_inherit.in/primary/src/lib.rs b/tests/snapshots/add/detect_workspace_inherit/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit.in/primary/src/lib.rs
rename to tests/snapshots/add/detect_workspace_inherit/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/detect_workspace_inherit.out/Cargo.toml b/tests/snapshots/add/detect_workspace_inherit/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit.out/Cargo.toml
rename to tests/snapshots/add/detect_workspace_inherit/out/Cargo.toml
diff --git a/tests/snapshots/add/detect_workspace_inherit.out/dependency/Cargo.toml b/tests/snapshots/add/detect_workspace_inherit/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit.out/dependency/Cargo.toml
rename to tests/snapshots/add/detect_workspace_inherit/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/detect_workspace_inherit.out/primary/Cargo.toml b/tests/snapshots/add/detect_workspace_inherit/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit.out/primary/Cargo.toml
rename to tests/snapshots/add/detect_workspace_inherit/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/detect_workspace_inherit.stderr b/tests/snapshots/add/detect_workspace_inherit/stderr.log
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit.stderr
rename to tests/snapshots/add/detect_workspace_inherit/stderr.log
diff --git a/tests/snapshots/add/detect_workspace_inherit.stdout b/tests/snapshots/add/detect_workspace_inherit/stdout.log
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit.stdout
rename to tests/snapshots/add/detect_workspace_inherit/stdout.log
diff --git a/tests/snapshots/add/detect_workspace_inherit_features.in/Cargo.toml b/tests/snapshots/add/detect_workspace_inherit_features/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit_features.in/Cargo.toml
rename to tests/snapshots/add/detect_workspace_inherit_features/in/Cargo.toml
diff --git a/tests/snapshots/add/detect_workspace_inherit_features.in/dependency/Cargo.toml b/tests/snapshots/add/detect_workspace_inherit_features/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit_features.in/dependency/Cargo.toml
rename to tests/snapshots/add/detect_workspace_inherit_features/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/detect_workspace_inherit_features.in/dependency/src/lib.rs b/tests/snapshots/add/detect_workspace_inherit_features/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit_features.in/dependency/src/lib.rs
rename to tests/snapshots/add/detect_workspace_inherit_features/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/detect_workspace_inherit_features.in/primary/Cargo.toml b/tests/snapshots/add/detect_workspace_inherit_features/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit_features.in/primary/Cargo.toml
rename to tests/snapshots/add/detect_workspace_inherit_features/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/detect_workspace_inherit_features.in/primary/src/lib.rs b/tests/snapshots/add/detect_workspace_inherit_features/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit_features.in/primary/src/lib.rs
rename to tests/snapshots/add/detect_workspace_inherit_features/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/detect_workspace_inherit_features.out/Cargo.toml b/tests/snapshots/add/detect_workspace_inherit_features/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit_features.out/Cargo.toml
rename to tests/snapshots/add/detect_workspace_inherit_features/out/Cargo.toml
diff --git a/tests/snapshots/add/detect_workspace_inherit_features.out/dependency/Cargo.toml b/tests/snapshots/add/detect_workspace_inherit_features/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit_features.out/dependency/Cargo.toml
rename to tests/snapshots/add/detect_workspace_inherit_features/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/detect_workspace_inherit_features.out/primary/Cargo.toml b/tests/snapshots/add/detect_workspace_inherit_features/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit_features.out/primary/Cargo.toml
rename to tests/snapshots/add/detect_workspace_inherit_features/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/detect_workspace_inherit_features.stderr b/tests/snapshots/add/detect_workspace_inherit_features/stderr.log
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit_features.stderr
rename to tests/snapshots/add/detect_workspace_inherit_features/stderr.log
diff --git a/tests/snapshots/add/detect_workspace_inherit_features.stdout b/tests/snapshots/add/detect_workspace_inherit_features/stdout.log
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit_features.stdout
rename to tests/snapshots/add/detect_workspace_inherit_features/stdout.log
diff --git a/tests/snapshots/add/detect_workspace_inherit_optional.in/Cargo.toml b/tests/snapshots/add/detect_workspace_inherit_optional/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit_optional.in/Cargo.toml
rename to tests/snapshots/add/detect_workspace_inherit_optional/in/Cargo.toml
diff --git a/tests/snapshots/add/detect_workspace_inherit_optional.in/dependency/Cargo.toml b/tests/snapshots/add/detect_workspace_inherit_optional/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit_optional.in/dependency/Cargo.toml
rename to tests/snapshots/add/detect_workspace_inherit_optional/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/detect_workspace_inherit_optional.in/dependency/src/lib.rs b/tests/snapshots/add/detect_workspace_inherit_optional/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit_optional.in/dependency/src/lib.rs
rename to tests/snapshots/add/detect_workspace_inherit_optional/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/detect_workspace_inherit_optional.in/primary/Cargo.toml b/tests/snapshots/add/detect_workspace_inherit_optional/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit_optional.in/primary/Cargo.toml
rename to tests/snapshots/add/detect_workspace_inherit_optional/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/detect_workspace_inherit_optional.in/primary/src/lib.rs b/tests/snapshots/add/detect_workspace_inherit_optional/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit_optional.in/primary/src/lib.rs
rename to tests/snapshots/add/detect_workspace_inherit_optional/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/detect_workspace_inherit_optional.out/Cargo.toml b/tests/snapshots/add/detect_workspace_inherit_optional/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit_optional.out/Cargo.toml
rename to tests/snapshots/add/detect_workspace_inherit_optional/out/Cargo.toml
diff --git a/tests/snapshots/add/detect_workspace_inherit_optional.out/dependency/Cargo.toml b/tests/snapshots/add/detect_workspace_inherit_optional/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit_optional.out/dependency/Cargo.toml
rename to tests/snapshots/add/detect_workspace_inherit_optional/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/detect_workspace_inherit_optional.out/primary/Cargo.toml b/tests/snapshots/add/detect_workspace_inherit_optional/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit_optional.out/primary/Cargo.toml
rename to tests/snapshots/add/detect_workspace_inherit_optional/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/detect_workspace_inherit_optional.stderr b/tests/snapshots/add/detect_workspace_inherit_optional/stderr.log
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit_optional.stderr
rename to tests/snapshots/add/detect_workspace_inherit_optional/stderr.log
diff --git a/tests/snapshots/add/detect_workspace_inherit_optional.stdout b/tests/snapshots/add/detect_workspace_inherit_optional/stdout.log
similarity index 100%
rename from tests/snapshots/add/detect_workspace_inherit_optional.stdout
rename to tests/snapshots/add/detect_workspace_inherit_optional/stdout.log
diff --git a/tests/snapshots/add/dev.in b/tests/snapshots/add/dev.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/dev.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/dev/in b/tests/snapshots/add/dev/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/dev/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/dev.out/Cargo.toml b/tests/snapshots/add/dev/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/dev.out/Cargo.toml
rename to tests/snapshots/add/dev/out/Cargo.toml
diff --git a/tests/snapshots/add/dev.stderr b/tests/snapshots/add/dev/stderr.log
similarity index 100%
rename from tests/snapshots/add/dev.stderr
rename to tests/snapshots/add/dev/stderr.log
diff --git a/tests/snapshots/add/dev.stdout b/tests/snapshots/add/dev/stdout.log
similarity index 100%
rename from tests/snapshots/add/dev.stdout
rename to tests/snapshots/add/dev/stdout.log
diff --git a/tests/snapshots/add/dev_build_conflict.in b/tests/snapshots/add/dev_build_conflict.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/dev_build_conflict.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/dev_build_conflict/in b/tests/snapshots/add/dev_build_conflict/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/dev_build_conflict/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/dev_build_conflict.out/Cargo.toml b/tests/snapshots/add/dev_build_conflict/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/dev_build_conflict.out/Cargo.toml
rename to tests/snapshots/add/dev_build_conflict/out/Cargo.toml
diff --git a/tests/snapshots/add/dev_build_conflict.stderr b/tests/snapshots/add/dev_build_conflict/stderr.log
similarity index 100%
rename from tests/snapshots/add/dev_build_conflict.stderr
rename to tests/snapshots/add/dev_build_conflict/stderr.log
diff --git a/tests/snapshots/add/dev_build_conflict.stdout b/tests/snapshots/add/dev_build_conflict/stdout.log
similarity index 100%
rename from tests/snapshots/add/dev_build_conflict.stdout
rename to tests/snapshots/add/dev_build_conflict/stdout.log
diff --git a/tests/snapshots/add/dev_prefer_existing_version.in/Cargo.toml b/tests/snapshots/add/dev_prefer_existing_version/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/dev_prefer_existing_version.in/Cargo.toml
rename to tests/snapshots/add/dev_prefer_existing_version/in/Cargo.toml
diff --git a/tests/snapshots/add/dev_prefer_existing_version.in/dependency/Cargo.toml b/tests/snapshots/add/dev_prefer_existing_version/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/dev_prefer_existing_version.in/dependency/Cargo.toml
rename to tests/snapshots/add/dev_prefer_existing_version/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/dev_prefer_existing_version.in/dependency/src/lib.rs b/tests/snapshots/add/dev_prefer_existing_version/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/dev_prefer_existing_version.in/dependency/src/lib.rs
rename to tests/snapshots/add/dev_prefer_existing_version/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/dev_prefer_existing_version.in/src/lib.rs b/tests/snapshots/add/dev_prefer_existing_version/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/dev_prefer_existing_version.in/src/lib.rs
rename to tests/snapshots/add/dev_prefer_existing_version/in/src/lib.rs
diff --git a/tests/snapshots/add/dev_prefer_existing_version.out/Cargo.toml b/tests/snapshots/add/dev_prefer_existing_version/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/dev_prefer_existing_version.out/Cargo.toml
rename to tests/snapshots/add/dev_prefer_existing_version/out/Cargo.toml
diff --git a/tests/snapshots/add/dev_prefer_existing_version.out/dependency/Cargo.toml b/tests/snapshots/add/dev_prefer_existing_version/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/dev_prefer_existing_version.out/dependency/Cargo.toml
rename to tests/snapshots/add/dev_prefer_existing_version/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/dev_prefer_existing_version.stderr b/tests/snapshots/add/dev_prefer_existing_version/stderr.log
similarity index 100%
rename from tests/snapshots/add/dev_prefer_existing_version.stderr
rename to tests/snapshots/add/dev_prefer_existing_version/stderr.log
diff --git a/tests/snapshots/add/dev_prefer_existing_version.stdout b/tests/snapshots/add/dev_prefer_existing_version/stdout.log
similarity index 100%
rename from tests/snapshots/add/dev_prefer_existing_version.stdout
rename to tests/snapshots/add/dev_prefer_existing_version/stdout.log
diff --git a/tests/snapshots/add/dry_run.in b/tests/snapshots/add/dry_run.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/dry_run.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/dry_run/in b/tests/snapshots/add/dry_run/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/dry_run/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/dry_run.out/Cargo.toml b/tests/snapshots/add/dry_run/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/dry_run.out/Cargo.toml
rename to tests/snapshots/add/dry_run/out/Cargo.toml
diff --git a/tests/snapshots/add/dry_run.stderr b/tests/snapshots/add/dry_run/stderr.log
similarity index 100%
rename from tests/snapshots/add/dry_run.stderr
rename to tests/snapshots/add/dry_run/stderr.log
diff --git a/tests/snapshots/add/dry_run.stdout b/tests/snapshots/add/dry_run/stdout.log
similarity index 100%
rename from tests/snapshots/add/dry_run.stdout
rename to tests/snapshots/add/dry_run/stdout.log
diff --git a/tests/snapshots/add/features.in b/tests/snapshots/add/features.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/features.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/features/in b/tests/snapshots/add/features/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/features/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/features.out/Cargo.toml b/tests/snapshots/add/features/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/features.out/Cargo.toml
rename to tests/snapshots/add/features/out/Cargo.toml
diff --git a/tests/snapshots/add/features.stderr b/tests/snapshots/add/features/stderr.log
similarity index 100%
rename from tests/snapshots/add/features.stderr
rename to tests/snapshots/add/features/stderr.log
diff --git a/tests/snapshots/add/features.stdout b/tests/snapshots/add/features/stdout.log
similarity index 100%
rename from tests/snapshots/add/features.stdout
rename to tests/snapshots/add/features/stdout.log
diff --git a/tests/snapshots/add/features_empty.in b/tests/snapshots/add/features_empty.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/features_empty.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/features_empty/in b/tests/snapshots/add/features_empty/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/features_empty/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/features_empty.out/Cargo.toml b/tests/snapshots/add/features_empty/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/features_empty.out/Cargo.toml
rename to tests/snapshots/add/features_empty/out/Cargo.toml
diff --git a/tests/snapshots/add/features_empty.stderr b/tests/snapshots/add/features_empty/stderr.log
similarity index 100%
rename from tests/snapshots/add/features_empty.stderr
rename to tests/snapshots/add/features_empty/stderr.log
diff --git a/tests/snapshots/add/features_empty.stdout b/tests/snapshots/add/features_empty/stdout.log
similarity index 100%
rename from tests/snapshots/add/features_empty.stdout
rename to tests/snapshots/add/features_empty/stdout.log
diff --git a/tests/snapshots/add/features_multiple_occurrences.in b/tests/snapshots/add/features_multiple_occurrences.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/features_multiple_occurrences.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/features_multiple_occurrences/in b/tests/snapshots/add/features_multiple_occurrences/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/features_multiple_occurrences/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/features_multiple_occurrences.out/Cargo.toml b/tests/snapshots/add/features_multiple_occurrences/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/features_multiple_occurrences.out/Cargo.toml
rename to tests/snapshots/add/features_multiple_occurrences/out/Cargo.toml
diff --git a/tests/snapshots/add/features_multiple_occurrences.stderr b/tests/snapshots/add/features_multiple_occurrences/stderr.log
similarity index 100%
rename from tests/snapshots/add/features_multiple_occurrences.stderr
rename to tests/snapshots/add/features_multiple_occurrences/stderr.log
diff --git a/tests/snapshots/add/features_multiple_occurrences.stdout b/tests/snapshots/add/features_multiple_occurrences/stdout.log
similarity index 100%
rename from tests/snapshots/add/features_multiple_occurrences.stdout
rename to tests/snapshots/add/features_multiple_occurrences/stdout.log
diff --git a/tests/snapshots/add/features_preserve.in/Cargo.toml b/tests/snapshots/add/features_preserve/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/features_preserve.in/Cargo.toml
rename to tests/snapshots/add/features_preserve/in/Cargo.toml
diff --git a/tests/snapshots/add/features_preserve.in/src/lib.rs b/tests/snapshots/add/features_preserve/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/features_preserve.in/src/lib.rs
rename to tests/snapshots/add/features_preserve/in/src/lib.rs
diff --git a/tests/snapshots/add/features_preserve.out/Cargo.toml b/tests/snapshots/add/features_preserve/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/features_preserve.out/Cargo.toml
rename to tests/snapshots/add/features_preserve/out/Cargo.toml
diff --git a/tests/snapshots/add/features_preserve.stderr b/tests/snapshots/add/features_preserve/stderr.log
similarity index 100%
rename from tests/snapshots/add/features_preserve.stderr
rename to tests/snapshots/add/features_preserve/stderr.log
diff --git a/tests/snapshots/add/features_preserve.stdout b/tests/snapshots/add/features_preserve/stdout.log
similarity index 100%
rename from tests/snapshots/add/features_preserve.stdout
rename to tests/snapshots/add/features_preserve/stdout.log
diff --git a/tests/snapshots/add/features_spaced_values.in b/tests/snapshots/add/features_spaced_values.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/features_spaced_values.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/features_spaced_values/in b/tests/snapshots/add/features_spaced_values/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/features_spaced_values/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/features_spaced_values.out/Cargo.toml b/tests/snapshots/add/features_spaced_values/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/features_spaced_values.out/Cargo.toml
rename to tests/snapshots/add/features_spaced_values/out/Cargo.toml
diff --git a/tests/snapshots/add/features_spaced_values.stderr b/tests/snapshots/add/features_spaced_values/stderr.log
similarity index 100%
rename from tests/snapshots/add/features_spaced_values.stderr
rename to tests/snapshots/add/features_spaced_values/stderr.log
diff --git a/tests/snapshots/add/features_spaced_values.stdout b/tests/snapshots/add/features_spaced_values/stdout.log
similarity index 100%
rename from tests/snapshots/add/features_spaced_values.stdout
rename to tests/snapshots/add/features_spaced_values/stdout.log
diff --git a/tests/snapshots/add/features_unknown.in b/tests/snapshots/add/features_unknown.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/features_unknown.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/features_unknown/in b/tests/snapshots/add/features_unknown/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/features_unknown/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/features_unknown.out/Cargo.toml b/tests/snapshots/add/features_unknown/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/features_unknown.out/Cargo.toml
rename to tests/snapshots/add/features_unknown/out/Cargo.toml
diff --git a/tests/snapshots/add/features_unknown.stderr b/tests/snapshots/add/features_unknown/stderr.log
similarity index 100%
rename from tests/snapshots/add/features_unknown.stderr
rename to tests/snapshots/add/features_unknown/stderr.log
diff --git a/tests/snapshots/add/features_unknown.stdout b/tests/snapshots/add/features_unknown/stdout.log
similarity index 100%
rename from tests/snapshots/add/features_unknown.stdout
rename to tests/snapshots/add/features_unknown/stdout.log
diff --git a/tests/snapshots/add/git.in b/tests/snapshots/add/git.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/git.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/git/in b/tests/snapshots/add/git/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/git/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/git.out/Cargo.toml b/tests/snapshots/add/git/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/git.out/Cargo.toml
rename to tests/snapshots/add/git/out/Cargo.toml
diff --git a/tests/snapshots/add/git.stderr b/tests/snapshots/add/git/stderr.log
similarity index 100%
rename from tests/snapshots/add/git.stderr
rename to tests/snapshots/add/git/stderr.log
diff --git a/tests/snapshots/add/git.stdout b/tests/snapshots/add/git/stdout.log
similarity index 100%
rename from tests/snapshots/add/git.stdout
rename to tests/snapshots/add/git/stdout.log
diff --git a/tests/snapshots/add/git_branch.in b/tests/snapshots/add/git_branch.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/git_branch.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/git_branch/in b/tests/snapshots/add/git_branch/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/git_branch/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/git_branch.out/Cargo.toml b/tests/snapshots/add/git_branch/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/git_branch.out/Cargo.toml
rename to tests/snapshots/add/git_branch/out/Cargo.toml
diff --git a/tests/snapshots/add/git_branch.stderr b/tests/snapshots/add/git_branch/stderr.log
similarity index 100%
rename from tests/snapshots/add/git_branch.stderr
rename to tests/snapshots/add/git_branch/stderr.log
diff --git a/tests/snapshots/add/git_branch.stdout b/tests/snapshots/add/git_branch/stdout.log
similarity index 100%
rename from tests/snapshots/add/git_branch.stdout
rename to tests/snapshots/add/git_branch/stdout.log
diff --git a/tests/snapshots/add/git_conflicts_namever.in b/tests/snapshots/add/git_conflicts_namever.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/git_conflicts_namever.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/git_conflicts_namever/in b/tests/snapshots/add/git_conflicts_namever/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/git_conflicts_namever/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/git_conflicts_namever.out/Cargo.toml b/tests/snapshots/add/git_conflicts_namever/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/git_conflicts_namever.out/Cargo.toml
rename to tests/snapshots/add/git_conflicts_namever/out/Cargo.toml
diff --git a/tests/snapshots/add/git_conflicts_namever.stderr b/tests/snapshots/add/git_conflicts_namever/stderr.log
similarity index 100%
rename from tests/snapshots/add/git_conflicts_namever.stderr
rename to tests/snapshots/add/git_conflicts_namever/stderr.log
diff --git a/tests/snapshots/add/git_conflicts_namever.stdout b/tests/snapshots/add/git_conflicts_namever/stdout.log
similarity index 100%
rename from tests/snapshots/add/git_conflicts_namever.stdout
rename to tests/snapshots/add/git_conflicts_namever/stdout.log
diff --git a/tests/snapshots/add/git_dev.in b/tests/snapshots/add/git_dev.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/git_dev.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/git_dev/in b/tests/snapshots/add/git_dev/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/git_dev/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/git_dev.out/Cargo.toml b/tests/snapshots/add/git_dev/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/git_dev.out/Cargo.toml
rename to tests/snapshots/add/git_dev/out/Cargo.toml
diff --git a/tests/snapshots/add/git_dev.stderr b/tests/snapshots/add/git_dev/stderr.log
similarity index 100%
rename from tests/snapshots/add/git_dev.stderr
rename to tests/snapshots/add/git_dev/stderr.log
diff --git a/tests/snapshots/add/git_dev.stdout b/tests/snapshots/add/git_dev/stdout.log
similarity index 100%
rename from tests/snapshots/add/git_dev.stdout
rename to tests/snapshots/add/git_dev/stdout.log
diff --git a/tests/snapshots/add/git_inferred_name.in b/tests/snapshots/add/git_inferred_name.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/git_inferred_name.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/git_inferred_name/in b/tests/snapshots/add/git_inferred_name/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/git_inferred_name/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/git_inferred_name.out/Cargo.toml b/tests/snapshots/add/git_inferred_name/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/git_inferred_name.out/Cargo.toml
rename to tests/snapshots/add/git_inferred_name/out/Cargo.toml
diff --git a/tests/snapshots/add/git_inferred_name.stderr b/tests/snapshots/add/git_inferred_name/stderr.log
similarity index 100%
rename from tests/snapshots/add/git_inferred_name.stderr
rename to tests/snapshots/add/git_inferred_name/stderr.log
diff --git a/tests/snapshots/add/git_inferred_name.stdout b/tests/snapshots/add/git_inferred_name/stdout.log
similarity index 100%
rename from tests/snapshots/add/git_inferred_name.stdout
rename to tests/snapshots/add/git_inferred_name/stdout.log
diff --git a/tests/snapshots/add/git_inferred_name_multiple.in b/tests/snapshots/add/git_inferred_name_multiple.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/git_inferred_name_multiple.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/git_inferred_name_multiple/in b/tests/snapshots/add/git_inferred_name_multiple/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/git_inferred_name_multiple/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/git_inferred_name_multiple.out/Cargo.toml b/tests/snapshots/add/git_inferred_name_multiple/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/git_inferred_name_multiple.out/Cargo.toml
rename to tests/snapshots/add/git_inferred_name_multiple/out/Cargo.toml
diff --git a/tests/snapshots/add/git_inferred_name_multiple.stderr b/tests/snapshots/add/git_inferred_name_multiple/stderr.log
similarity index 100%
rename from tests/snapshots/add/git_inferred_name_multiple.stderr
rename to tests/snapshots/add/git_inferred_name_multiple/stderr.log
diff --git a/tests/snapshots/add/git_inferred_name_multiple.stdout b/tests/snapshots/add/git_inferred_name_multiple/stdout.log
similarity index 100%
rename from tests/snapshots/add/git_inferred_name_multiple.stdout
rename to tests/snapshots/add/git_inferred_name_multiple/stdout.log
diff --git a/tests/snapshots/add/git_multiple_names.in b/tests/snapshots/add/git_multiple_names.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/git_multiple_names.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/git_multiple_names/in b/tests/snapshots/add/git_multiple_names/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/git_multiple_names/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/git_multiple_names.out/Cargo.toml b/tests/snapshots/add/git_multiple_names/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/git_multiple_names.out/Cargo.toml
rename to tests/snapshots/add/git_multiple_names/out/Cargo.toml
diff --git a/tests/snapshots/add/git_multiple_names.stderr b/tests/snapshots/add/git_multiple_names/stderr.log
similarity index 100%
rename from tests/snapshots/add/git_multiple_names.stderr
rename to tests/snapshots/add/git_multiple_names/stderr.log
diff --git a/tests/snapshots/add/git_multiple_names.stdout b/tests/snapshots/add/git_multiple_names/stdout.log
similarity index 100%
rename from tests/snapshots/add/git_multiple_names.stdout
rename to tests/snapshots/add/git_multiple_names/stdout.log
diff --git a/tests/snapshots/add/git_normalized_name.in b/tests/snapshots/add/git_normalized_name.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/git_normalized_name.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/git_normalized_name/in b/tests/snapshots/add/git_normalized_name/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/git_normalized_name/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/git_normalized_name.out/Cargo.toml b/tests/snapshots/add/git_normalized_name/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/git_normalized_name.out/Cargo.toml
rename to tests/snapshots/add/git_normalized_name/out/Cargo.toml
diff --git a/tests/snapshots/add/git_normalized_name.stderr b/tests/snapshots/add/git_normalized_name/stderr.log
similarity index 100%
rename from tests/snapshots/add/git_normalized_name.stderr
rename to tests/snapshots/add/git_normalized_name/stderr.log
diff --git a/tests/snapshots/add/git_normalized_name.stdout b/tests/snapshots/add/git_normalized_name/stdout.log
similarity index 100%
rename from tests/snapshots/add/git_normalized_name.stdout
rename to tests/snapshots/add/git_normalized_name/stdout.log
diff --git a/tests/snapshots/add/git_registry.in/Cargo.toml b/tests/snapshots/add/git_registry/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/git_registry.in/Cargo.toml
rename to tests/snapshots/add/git_registry/in/Cargo.toml
diff --git a/tests/snapshots/add/git_registry.in/src/lib.rs b/tests/snapshots/add/git_registry/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/git_registry.in/src/lib.rs
rename to tests/snapshots/add/git_registry/in/src/lib.rs
diff --git a/tests/snapshots/add/git_registry.out/Cargo.toml b/tests/snapshots/add/git_registry/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/git_registry.out/Cargo.toml
rename to tests/snapshots/add/git_registry/out/Cargo.toml
diff --git a/tests/snapshots/add/git_registry.stderr b/tests/snapshots/add/git_registry/stderr.log
similarity index 100%
rename from tests/snapshots/add/git_registry.stderr
rename to tests/snapshots/add/git_registry/stderr.log
diff --git a/tests/snapshots/add/git_registry.stdout b/tests/snapshots/add/git_registry/stdout.log
similarity index 100%
rename from tests/snapshots/add/git_registry.stdout
rename to tests/snapshots/add/git_registry/stdout.log
diff --git a/tests/snapshots/add/git_rev.in b/tests/snapshots/add/git_rev.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/git_rev.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/git_rev/in b/tests/snapshots/add/git_rev/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/git_rev/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/git_rev.out/Cargo.toml b/tests/snapshots/add/git_rev/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/git_rev.out/Cargo.toml
rename to tests/snapshots/add/git_rev/out/Cargo.toml
diff --git a/tests/snapshots/add/git_rev.stderr b/tests/snapshots/add/git_rev/stderr.log
similarity index 100%
rename from tests/snapshots/add/git_rev.stderr
rename to tests/snapshots/add/git_rev/stderr.log
diff --git a/tests/snapshots/add/git_rev.stdout b/tests/snapshots/add/git_rev/stdout.log
similarity index 100%
rename from tests/snapshots/add/git_rev.stdout
rename to tests/snapshots/add/git_rev/stdout.log
diff --git a/tests/snapshots/add/git_tag.in b/tests/snapshots/add/git_tag.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/git_tag.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/git_tag/in b/tests/snapshots/add/git_tag/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/git_tag/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/git_tag.out/Cargo.toml b/tests/snapshots/add/git_tag/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/git_tag.out/Cargo.toml
rename to tests/snapshots/add/git_tag/out/Cargo.toml
diff --git a/tests/snapshots/add/git_tag.stderr b/tests/snapshots/add/git_tag/stderr.log
similarity index 100%
rename from tests/snapshots/add/git_tag.stderr
rename to tests/snapshots/add/git_tag/stderr.log
diff --git a/tests/snapshots/add/git_tag.stdout b/tests/snapshots/add/git_tag/stdout.log
similarity index 100%
rename from tests/snapshots/add/git_tag.stdout
rename to tests/snapshots/add/git_tag/stdout.log
diff --git a/tests/snapshots/add/infer_prerelease.in b/tests/snapshots/add/infer_prerelease.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/infer_prerelease.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/infer_prerelease/in b/tests/snapshots/add/infer_prerelease/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/infer_prerelease/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/infer_prerelease.out/Cargo.toml b/tests/snapshots/add/infer_prerelease/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/infer_prerelease.out/Cargo.toml
rename to tests/snapshots/add/infer_prerelease/out/Cargo.toml
diff --git a/tests/snapshots/add/infer_prerelease.stderr b/tests/snapshots/add/infer_prerelease/stderr.log
similarity index 100%
rename from tests/snapshots/add/infer_prerelease.stderr
rename to tests/snapshots/add/infer_prerelease/stderr.log
diff --git a/tests/snapshots/add/infer_prerelease.stdout b/tests/snapshots/add/infer_prerelease/stdout.log
similarity index 100%
rename from tests/snapshots/add/infer_prerelease.stdout
rename to tests/snapshots/add/infer_prerelease/stdout.log
diff --git a/tests/snapshots/add/invalid_arg.in b/tests/snapshots/add/invalid_arg.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/invalid_arg.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/invalid_arg/in b/tests/snapshots/add/invalid_arg/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/invalid_arg/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/invalid_arg.out/Cargo.toml b/tests/snapshots/add/invalid_arg/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_arg.out/Cargo.toml
rename to tests/snapshots/add/invalid_arg/out/Cargo.toml
diff --git a/tests/snapshots/add/invalid_arg.stderr b/tests/snapshots/add/invalid_arg/stderr.log
similarity index 100%
rename from tests/snapshots/add/invalid_arg.stderr
rename to tests/snapshots/add/invalid_arg/stderr.log
diff --git a/tests/snapshots/add/invalid_arg.stdout b/tests/snapshots/add/invalid_arg/stdout.log
similarity index 100%
rename from tests/snapshots/add/invalid_arg.stdout
rename to tests/snapshots/add/invalid_arg/stdout.log
diff --git a/tests/snapshots/add/invalid_git_external.in b/tests/snapshots/add/invalid_git_external.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/invalid_git_external.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/invalid_git_external/in b/tests/snapshots/add/invalid_git_external/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/invalid_git_external/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/invalid_git_external.out/Cargo.toml b/tests/snapshots/add/invalid_git_external/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_git_external.out/Cargo.toml
rename to tests/snapshots/add/invalid_git_external/out/Cargo.toml
diff --git a/tests/snapshots/add/invalid_git_external.stderr b/tests/snapshots/add/invalid_git_external/stderr.log
similarity index 100%
rename from tests/snapshots/add/invalid_git_external.stderr
rename to tests/snapshots/add/invalid_git_external/stderr.log
diff --git a/tests/snapshots/add/invalid_git_external.stdout b/tests/snapshots/add/invalid_git_external/stdout.log
similarity index 100%
rename from tests/snapshots/add/invalid_git_external.stdout
rename to tests/snapshots/add/invalid_git_external/stdout.log
diff --git a/tests/snapshots/add/invalid_git_name.in b/tests/snapshots/add/invalid_git_name.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/invalid_git_name.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/invalid_git_name/in b/tests/snapshots/add/invalid_git_name/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/invalid_git_name/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/invalid_git_name.out/Cargo.toml b/tests/snapshots/add/invalid_git_name/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_git_name.out/Cargo.toml
rename to tests/snapshots/add/invalid_git_name/out/Cargo.toml
diff --git a/tests/snapshots/add/invalid_git_name.stderr b/tests/snapshots/add/invalid_git_name/stderr.log
similarity index 100%
rename from tests/snapshots/add/invalid_git_name.stderr
rename to tests/snapshots/add/invalid_git_name/stderr.log
diff --git a/tests/snapshots/add/invalid_git_name.stdout b/tests/snapshots/add/invalid_git_name/stdout.log
similarity index 100%
rename from tests/snapshots/add/invalid_git_name.stdout
rename to tests/snapshots/add/invalid_git_name/stdout.log
diff --git a/tests/snapshots/add/invalid_key_inherit_dependency.in/Cargo.toml b/tests/snapshots/add/invalid_key_inherit_dependency/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_key_inherit_dependency.in/Cargo.toml
rename to tests/snapshots/add/invalid_key_inherit_dependency/in/Cargo.toml
diff --git a/tests/snapshots/add/invalid_key_inherit_dependency.in/dependency/Cargo.toml b/tests/snapshots/add/invalid_key_inherit_dependency/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_key_inherit_dependency.in/dependency/Cargo.toml
rename to tests/snapshots/add/invalid_key_inherit_dependency/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/invalid_key_inherit_dependency.in/dependency/src/lib.rs b/tests/snapshots/add/invalid_key_inherit_dependency/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/invalid_key_inherit_dependency.in/dependency/src/lib.rs
rename to tests/snapshots/add/invalid_key_inherit_dependency/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/invalid_key_inherit_dependency.in/primary/Cargo.toml b/tests/snapshots/add/invalid_key_inherit_dependency/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_key_inherit_dependency.in/primary/Cargo.toml
rename to tests/snapshots/add/invalid_key_inherit_dependency/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/invalid_key_inherit_dependency.in/primary/src/lib.rs b/tests/snapshots/add/invalid_key_inherit_dependency/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/invalid_key_inherit_dependency.in/primary/src/lib.rs
rename to tests/snapshots/add/invalid_key_inherit_dependency/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/invalid_key_inherit_dependency.out/Cargo.toml b/tests/snapshots/add/invalid_key_inherit_dependency/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_key_inherit_dependency.out/Cargo.toml
rename to tests/snapshots/add/invalid_key_inherit_dependency/out/Cargo.toml
diff --git a/tests/snapshots/add/invalid_key_inherit_dependency.out/dependency/Cargo.toml b/tests/snapshots/add/invalid_key_inherit_dependency/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_key_inherit_dependency.out/dependency/Cargo.toml
rename to tests/snapshots/add/invalid_key_inherit_dependency/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/invalid_key_inherit_dependency.out/primary/Cargo.toml b/tests/snapshots/add/invalid_key_inherit_dependency/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_key_inherit_dependency.out/primary/Cargo.toml
rename to tests/snapshots/add/invalid_key_inherit_dependency/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/invalid_key_inherit_dependency.stderr b/tests/snapshots/add/invalid_key_inherit_dependency/stderr.log
similarity index 100%
rename from tests/snapshots/add/invalid_key_inherit_dependency.stderr
rename to tests/snapshots/add/invalid_key_inherit_dependency/stderr.log
diff --git a/tests/snapshots/add/invalid_key_inherit_dependency.stdout b/tests/snapshots/add/invalid_key_inherit_dependency/stdout.log
similarity index 100%
rename from tests/snapshots/add/invalid_key_inherit_dependency.stdout
rename to tests/snapshots/add/invalid_key_inherit_dependency/stdout.log
diff --git a/tests/snapshots/add/invalid_key_overwrite_inherit_dependency.in/Cargo.toml b/tests/snapshots/add/invalid_key_overwrite_inherit_dependency/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_key_overwrite_inherit_dependency.in/Cargo.toml
rename to tests/snapshots/add/invalid_key_overwrite_inherit_dependency/in/Cargo.toml
diff --git a/tests/snapshots/add/invalid_key_overwrite_inherit_dependency.in/dependency/Cargo.toml b/tests/snapshots/add/invalid_key_overwrite_inherit_dependency/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_key_overwrite_inherit_dependency.in/dependency/Cargo.toml
rename to tests/snapshots/add/invalid_key_overwrite_inherit_dependency/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/invalid_key_overwrite_inherit_dependency.in/dependency/src/lib.rs b/tests/snapshots/add/invalid_key_overwrite_inherit_dependency/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/invalid_key_overwrite_inherit_dependency.in/dependency/src/lib.rs
rename to tests/snapshots/add/invalid_key_overwrite_inherit_dependency/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/invalid_key_overwrite_inherit_dependency.in/primary/Cargo.toml b/tests/snapshots/add/invalid_key_overwrite_inherit_dependency/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_key_overwrite_inherit_dependency.in/primary/Cargo.toml
rename to tests/snapshots/add/invalid_key_overwrite_inherit_dependency/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/invalid_key_overwrite_inherit_dependency.in/primary/src/lib.rs b/tests/snapshots/add/invalid_key_overwrite_inherit_dependency/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/invalid_key_overwrite_inherit_dependency.in/primary/src/lib.rs
rename to tests/snapshots/add/invalid_key_overwrite_inherit_dependency/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/invalid_key_overwrite_inherit_dependency.out/Cargo.toml b/tests/snapshots/add/invalid_key_overwrite_inherit_dependency/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_key_overwrite_inherit_dependency.out/Cargo.toml
rename to tests/snapshots/add/invalid_key_overwrite_inherit_dependency/out/Cargo.toml
diff --git a/tests/snapshots/add/invalid_key_overwrite_inherit_dependency.out/dependency/Cargo.toml b/tests/snapshots/add/invalid_key_overwrite_inherit_dependency/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_key_overwrite_inherit_dependency.out/dependency/Cargo.toml
rename to tests/snapshots/add/invalid_key_overwrite_inherit_dependency/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/invalid_key_overwrite_inherit_dependency.out/primary/Cargo.toml b/tests/snapshots/add/invalid_key_overwrite_inherit_dependency/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_key_overwrite_inherit_dependency.out/primary/Cargo.toml
rename to tests/snapshots/add/invalid_key_overwrite_inherit_dependency/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/invalid_key_overwrite_inherit_dependency.stderr b/tests/snapshots/add/invalid_key_overwrite_inherit_dependency/stderr.log
similarity index 100%
rename from tests/snapshots/add/invalid_key_overwrite_inherit_dependency.stderr
rename to tests/snapshots/add/invalid_key_overwrite_inherit_dependency/stderr.log
diff --git a/tests/snapshots/add/invalid_key_overwrite_inherit_dependency.stdout b/tests/snapshots/add/invalid_key_overwrite_inherit_dependency/stdout.log
similarity index 100%
rename from tests/snapshots/add/invalid_key_overwrite_inherit_dependency.stdout
rename to tests/snapshots/add/invalid_key_overwrite_inherit_dependency/stdout.log
diff --git a/tests/snapshots/add/invalid_key_rename_inherit_dependency.in/Cargo.toml b/tests/snapshots/add/invalid_key_rename_inherit_dependency/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_key_rename_inherit_dependency.in/Cargo.toml
rename to tests/snapshots/add/invalid_key_rename_inherit_dependency/in/Cargo.toml
diff --git a/tests/snapshots/add/invalid_key_rename_inherit_dependency.in/dependency-alt/Cargo.toml b/tests/snapshots/add/invalid_key_rename_inherit_dependency/in/dependency-alt/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_key_rename_inherit_dependency.in/dependency-alt/Cargo.toml
rename to tests/snapshots/add/invalid_key_rename_inherit_dependency/in/dependency-alt/Cargo.toml
diff --git a/tests/snapshots/add/invalid_key_rename_inherit_dependency.in/dependency-alt/src/lib.rs b/tests/snapshots/add/invalid_key_rename_inherit_dependency/in/dependency-alt/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/invalid_key_rename_inherit_dependency.in/dependency-alt/src/lib.rs
rename to tests/snapshots/add/invalid_key_rename_inherit_dependency/in/dependency-alt/src/lib.rs
diff --git a/tests/snapshots/add/invalid_key_rename_inherit_dependency.in/dependency/Cargo.toml b/tests/snapshots/add/invalid_key_rename_inherit_dependency/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_key_rename_inherit_dependency.in/dependency/Cargo.toml
rename to tests/snapshots/add/invalid_key_rename_inherit_dependency/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/invalid_key_rename_inherit_dependency.in/dependency/src/lib.rs b/tests/snapshots/add/invalid_key_rename_inherit_dependency/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/invalid_key_rename_inherit_dependency.in/dependency/src/lib.rs
rename to tests/snapshots/add/invalid_key_rename_inherit_dependency/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/invalid_key_rename_inherit_dependency.in/primary/Cargo.toml b/tests/snapshots/add/invalid_key_rename_inherit_dependency/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_key_rename_inherit_dependency.in/primary/Cargo.toml
rename to tests/snapshots/add/invalid_key_rename_inherit_dependency/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/invalid_key_rename_inherit_dependency.in/primary/src/lib.rs b/tests/snapshots/add/invalid_key_rename_inherit_dependency/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/invalid_key_rename_inherit_dependency.in/primary/src/lib.rs
rename to tests/snapshots/add/invalid_key_rename_inherit_dependency/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/invalid_key_rename_inherit_dependency.out/Cargo.toml b/tests/snapshots/add/invalid_key_rename_inherit_dependency/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_key_rename_inherit_dependency.out/Cargo.toml
rename to tests/snapshots/add/invalid_key_rename_inherit_dependency/out/Cargo.toml
diff --git a/tests/snapshots/add/invalid_key_rename_inherit_dependency.out/dependency-alt/Cargo.toml b/tests/snapshots/add/invalid_key_rename_inherit_dependency/out/dependency-alt/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_key_rename_inherit_dependency.out/dependency-alt/Cargo.toml
rename to tests/snapshots/add/invalid_key_rename_inherit_dependency/out/dependency-alt/Cargo.toml
diff --git a/tests/snapshots/add/invalid_key_rename_inherit_dependency.out/dependency/Cargo.toml b/tests/snapshots/add/invalid_key_rename_inherit_dependency/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_key_rename_inherit_dependency.out/dependency/Cargo.toml
rename to tests/snapshots/add/invalid_key_rename_inherit_dependency/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/invalid_key_rename_inherit_dependency.out/primary/Cargo.toml b/tests/snapshots/add/invalid_key_rename_inherit_dependency/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_key_rename_inherit_dependency.out/primary/Cargo.toml
rename to tests/snapshots/add/invalid_key_rename_inherit_dependency/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/invalid_key_rename_inherit_dependency.stderr b/tests/snapshots/add/invalid_key_rename_inherit_dependency/stderr.log
similarity index 100%
rename from tests/snapshots/add/invalid_key_rename_inherit_dependency.stderr
rename to tests/snapshots/add/invalid_key_rename_inherit_dependency/stderr.log
diff --git a/tests/snapshots/add/invalid_key_rename_inherit_dependency.stdout b/tests/snapshots/add/invalid_key_rename_inherit_dependency/stdout.log
similarity index 100%
rename from tests/snapshots/add/invalid_key_rename_inherit_dependency.stdout
rename to tests/snapshots/add/invalid_key_rename_inherit_dependency/stdout.log
diff --git a/tests/snapshots/add/invalid_manifest.in/Cargo.toml b/tests/snapshots/add/invalid_manifest/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_manifest.in/Cargo.toml
rename to tests/snapshots/add/invalid_manifest/in/Cargo.toml
diff --git a/tests/snapshots/add/invalid_manifest.in/src/lib.rs b/tests/snapshots/add/invalid_manifest/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/invalid_manifest.in/src/lib.rs
rename to tests/snapshots/add/invalid_manifest/in/src/lib.rs
diff --git a/tests/snapshots/add/invalid_manifest.out/Cargo.toml b/tests/snapshots/add/invalid_manifest/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_manifest.out/Cargo.toml
rename to tests/snapshots/add/invalid_manifest/out/Cargo.toml
diff --git a/tests/snapshots/add/invalid_manifest.stderr b/tests/snapshots/add/invalid_manifest/stderr.log
similarity index 100%
rename from tests/snapshots/add/invalid_manifest.stderr
rename to tests/snapshots/add/invalid_manifest/stderr.log
diff --git a/tests/snapshots/add/invalid_manifest.stdout b/tests/snapshots/add/invalid_manifest/stdout.log
similarity index 100%
rename from tests/snapshots/add/invalid_manifest.stdout
rename to tests/snapshots/add/invalid_manifest/stdout.log
diff --git a/tests/snapshots/add/invalid_name_external.in b/tests/snapshots/add/invalid_name_external.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/invalid_name_external.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/invalid_name_external/in b/tests/snapshots/add/invalid_name_external/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/invalid_name_external/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/invalid_name_external.out/Cargo.toml b/tests/snapshots/add/invalid_name_external/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_name_external.out/Cargo.toml
rename to tests/snapshots/add/invalid_name_external/out/Cargo.toml
diff --git a/tests/snapshots/add/invalid_name_external.stderr b/tests/snapshots/add/invalid_name_external/stderr.log
similarity index 100%
rename from tests/snapshots/add/invalid_name_external.stderr
rename to tests/snapshots/add/invalid_name_external/stderr.log
diff --git a/tests/snapshots/add/invalid_name_external.stdout b/tests/snapshots/add/invalid_name_external/stdout.log
similarity index 100%
rename from tests/snapshots/add/invalid_name_external.stdout
rename to tests/snapshots/add/invalid_name_external/stdout.log
diff --git a/tests/snapshots/add/invalid_path.in b/tests/snapshots/add/invalid_path.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/invalid_path.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/invalid_path/in b/tests/snapshots/add/invalid_path/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/invalid_path/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/invalid_path.out/Cargo.toml b/tests/snapshots/add/invalid_path/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_path.out/Cargo.toml
rename to tests/snapshots/add/invalid_path/out/Cargo.toml
diff --git a/tests/snapshots/add/invalid_path.stderr b/tests/snapshots/add/invalid_path/stderr.log
similarity index 100%
rename from tests/snapshots/add/invalid_path.stderr
rename to tests/snapshots/add/invalid_path/stderr.log
diff --git a/tests/snapshots/add/invalid_path.stdout b/tests/snapshots/add/invalid_path/stdout.log
similarity index 100%
rename from tests/snapshots/add/invalid_path.stdout
rename to tests/snapshots/add/invalid_path/stdout.log
diff --git a/tests/snapshots/add/invalid_path_name.in/dependency/Cargo.toml b/tests/snapshots/add/invalid_path_name/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_path_name.in/dependency/Cargo.toml
rename to tests/snapshots/add/invalid_path_name/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/invalid_path_name.in/dependency/src/lib.rs b/tests/snapshots/add/invalid_path_name/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/invalid_path_name.in/dependency/src/lib.rs
rename to tests/snapshots/add/invalid_path_name/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/invalid_path_name.in/primary/Cargo.toml b/tests/snapshots/add/invalid_path_name/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_path_name.in/primary/Cargo.toml
rename to tests/snapshots/add/invalid_path_name/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/invalid_path_name.in/primary/src/lib.rs b/tests/snapshots/add/invalid_path_name/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/invalid_path_name.in/primary/src/lib.rs
rename to tests/snapshots/add/invalid_path_name/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/invalid_path_name.out/dependency/Cargo.toml b/tests/snapshots/add/invalid_path_name/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_path_name.out/dependency/Cargo.toml
rename to tests/snapshots/add/invalid_path_name/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/invalid_path_name.out/primary/Cargo.toml b/tests/snapshots/add/invalid_path_name/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_path_name.out/primary/Cargo.toml
rename to tests/snapshots/add/invalid_path_name/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/invalid_path_name.stderr b/tests/snapshots/add/invalid_path_name/stderr.log
similarity index 100%
rename from tests/snapshots/add/invalid_path_name.stderr
rename to tests/snapshots/add/invalid_path_name/stderr.log
diff --git a/tests/snapshots/add/invalid_path_name.stdout b/tests/snapshots/add/invalid_path_name/stdout.log
similarity index 100%
rename from tests/snapshots/add/invalid_path_name.stdout
rename to tests/snapshots/add/invalid_path_name/stdout.log
diff --git a/tests/snapshots/add/invalid_path_self.in b/tests/snapshots/add/invalid_path_self.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/invalid_path_self.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/invalid_path_self/in b/tests/snapshots/add/invalid_path_self/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/invalid_path_self/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/invalid_path_self.out/Cargo.toml b/tests/snapshots/add/invalid_path_self/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_path_self.out/Cargo.toml
rename to tests/snapshots/add/invalid_path_self/out/Cargo.toml
diff --git a/tests/snapshots/add/invalid_path_self.stderr b/tests/snapshots/add/invalid_path_self/stderr.log
similarity index 100%
rename from tests/snapshots/add/invalid_path_self.stderr
rename to tests/snapshots/add/invalid_path_self/stderr.log
diff --git a/tests/snapshots/add/invalid_path_self.stdout b/tests/snapshots/add/invalid_path_self/stdout.log
similarity index 100%
rename from tests/snapshots/add/invalid_path_self.stdout
rename to tests/snapshots/add/invalid_path_self/stdout.log
diff --git a/tests/snapshots/add/invalid_target_empty.in b/tests/snapshots/add/invalid_target_empty.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/invalid_target_empty.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/invalid_target_empty/in b/tests/snapshots/add/invalid_target_empty/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/invalid_target_empty/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/invalid_target_empty.out/Cargo.toml b/tests/snapshots/add/invalid_target_empty/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_target_empty.out/Cargo.toml
rename to tests/snapshots/add/invalid_target_empty/out/Cargo.toml
diff --git a/tests/snapshots/add/invalid_target_empty.stderr b/tests/snapshots/add/invalid_target_empty/stderr.log
similarity index 100%
rename from tests/snapshots/add/invalid_target_empty.stderr
rename to tests/snapshots/add/invalid_target_empty/stderr.log
diff --git a/tests/snapshots/add/invalid_target_empty.stdout b/tests/snapshots/add/invalid_target_empty/stdout.log
similarity index 100%
rename from tests/snapshots/add/invalid_target_empty.stdout
rename to tests/snapshots/add/invalid_target_empty/stdout.log
diff --git a/tests/snapshots/add/invalid_vers.in b/tests/snapshots/add/invalid_vers.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/invalid_vers.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/invalid_vers/in b/tests/snapshots/add/invalid_vers/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/invalid_vers/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/invalid_vers.out/Cargo.toml b/tests/snapshots/add/invalid_vers/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/invalid_vers.out/Cargo.toml
rename to tests/snapshots/add/invalid_vers/out/Cargo.toml
diff --git a/tests/snapshots/add/invalid_vers.stderr b/tests/snapshots/add/invalid_vers/stderr.log
similarity index 100%
rename from tests/snapshots/add/invalid_vers.stderr
rename to tests/snapshots/add/invalid_vers/stderr.log
diff --git a/tests/snapshots/add/invalid_vers.stdout b/tests/snapshots/add/invalid_vers/stdout.log
similarity index 100%
rename from tests/snapshots/add/invalid_vers.stdout
rename to tests/snapshots/add/invalid_vers/stdout.log
diff --git a/tests/snapshots/add/list_features.in b/tests/snapshots/add/list_features.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/list_features.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/list_features/in b/tests/snapshots/add/list_features/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/list_features/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/list_features.out/Cargo.toml b/tests/snapshots/add/list_features/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/list_features.out/Cargo.toml
rename to tests/snapshots/add/list_features/out/Cargo.toml
diff --git a/tests/snapshots/add/list_features.stderr b/tests/snapshots/add/list_features/stderr.log
similarity index 100%
rename from tests/snapshots/add/list_features.stderr
rename to tests/snapshots/add/list_features/stderr.log
diff --git a/tests/snapshots/add/list_features.stdout b/tests/snapshots/add/list_features/stdout.log
similarity index 100%
rename from tests/snapshots/add/list_features.stdout
rename to tests/snapshots/add/list_features/stdout.log
diff --git a/tests/snapshots/add/list_features_path.in/Cargo.toml b/tests/snapshots/add/list_features_path/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/list_features_path.in/Cargo.toml
rename to tests/snapshots/add/list_features_path/in/Cargo.toml
diff --git a/tests/snapshots/add/list_features_path.in/dependency/Cargo.toml b/tests/snapshots/add/list_features_path/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/list_features_path.in/dependency/Cargo.toml
rename to tests/snapshots/add/list_features_path/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/list_features_path.in/dependency/src/lib.rs b/tests/snapshots/add/list_features_path/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/list_features_path.in/dependency/src/lib.rs
rename to tests/snapshots/add/list_features_path/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/list_features_path.in/optional/Cargo.toml b/tests/snapshots/add/list_features_path/in/optional/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/list_features_path.in/optional/Cargo.toml
rename to tests/snapshots/add/list_features_path/in/optional/Cargo.toml
diff --git a/tests/snapshots/add/list_features_path.in/optional/src/lib.rs b/tests/snapshots/add/list_features_path/in/optional/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/list_features_path.in/optional/src/lib.rs
rename to tests/snapshots/add/list_features_path/in/optional/src/lib.rs
diff --git a/tests/snapshots/add/list_features_path.in/primary/Cargo.toml b/tests/snapshots/add/list_features_path/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/list_features_path.in/primary/Cargo.toml
rename to tests/snapshots/add/list_features_path/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/list_features_path.in/primary/src/lib.rs b/tests/snapshots/add/list_features_path/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/list_features_path.in/primary/src/lib.rs
rename to tests/snapshots/add/list_features_path/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/list_features_path.out/Cargo.toml b/tests/snapshots/add/list_features_path/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/list_features_path.out/Cargo.toml
rename to tests/snapshots/add/list_features_path/out/Cargo.toml
diff --git a/tests/snapshots/add/list_features_path.out/dependency/Cargo.toml b/tests/snapshots/add/list_features_path/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/list_features_path.out/dependency/Cargo.toml
rename to tests/snapshots/add/list_features_path/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/list_features_path.out/primary/Cargo.toml b/tests/snapshots/add/list_features_path/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/list_features_path.out/primary/Cargo.toml
rename to tests/snapshots/add/list_features_path/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/list_features_path.stderr b/tests/snapshots/add/list_features_path/stderr.log
similarity index 100%
rename from tests/snapshots/add/list_features_path.stderr
rename to tests/snapshots/add/list_features_path/stderr.log
diff --git a/tests/snapshots/add/list_features_path.stdout b/tests/snapshots/add/list_features_path/stdout.log
similarity index 100%
rename from tests/snapshots/add/list_features_path.stdout
rename to tests/snapshots/add/list_features_path/stdout.log
diff --git a/tests/snapshots/add/list_features_path_no_default.in/Cargo.toml b/tests/snapshots/add/list_features_path_no_default/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/list_features_path_no_default.in/Cargo.toml
rename to tests/snapshots/add/list_features_path_no_default/in/Cargo.toml
diff --git a/tests/snapshots/add/list_features_path_no_default.in/dependency/Cargo.toml b/tests/snapshots/add/list_features_path_no_default/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/list_features_path_no_default.in/dependency/Cargo.toml
rename to tests/snapshots/add/list_features_path_no_default/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/list_features_path_no_default.in/dependency/src/lib.rs b/tests/snapshots/add/list_features_path_no_default/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/list_features_path_no_default.in/dependency/src/lib.rs
rename to tests/snapshots/add/list_features_path_no_default/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/list_features_path_no_default.in/optional/Cargo.toml b/tests/snapshots/add/list_features_path_no_default/in/optional/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/list_features_path_no_default.in/optional/Cargo.toml
rename to tests/snapshots/add/list_features_path_no_default/in/optional/Cargo.toml
diff --git a/tests/snapshots/add/list_features_path_no_default.in/optional/src/lib.rs b/tests/snapshots/add/list_features_path_no_default/in/optional/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/list_features_path_no_default.in/optional/src/lib.rs
rename to tests/snapshots/add/list_features_path_no_default/in/optional/src/lib.rs
diff --git a/tests/snapshots/add/list_features_path_no_default.in/primary/Cargo.toml b/tests/snapshots/add/list_features_path_no_default/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/list_features_path_no_default.in/primary/Cargo.toml
rename to tests/snapshots/add/list_features_path_no_default/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/list_features_path_no_default.in/primary/src/lib.rs b/tests/snapshots/add/list_features_path_no_default/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/list_features_path_no_default.in/primary/src/lib.rs
rename to tests/snapshots/add/list_features_path_no_default/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/list_features_path_no_default.out/Cargo.toml b/tests/snapshots/add/list_features_path_no_default/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/list_features_path_no_default.out/Cargo.toml
rename to tests/snapshots/add/list_features_path_no_default/out/Cargo.toml
diff --git a/tests/snapshots/add/list_features_path_no_default.out/dependency/Cargo.toml b/tests/snapshots/add/list_features_path_no_default/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/list_features_path_no_default.out/dependency/Cargo.toml
rename to tests/snapshots/add/list_features_path_no_default/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/list_features_path_no_default.out/primary/Cargo.toml b/tests/snapshots/add/list_features_path_no_default/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/list_features_path_no_default.out/primary/Cargo.toml
rename to tests/snapshots/add/list_features_path_no_default/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/list_features_path_no_default.stderr b/tests/snapshots/add/list_features_path_no_default/stderr.log
similarity index 100%
rename from tests/snapshots/add/list_features_path_no_default.stderr
rename to tests/snapshots/add/list_features_path_no_default/stderr.log
diff --git a/tests/snapshots/add/list_features_path_no_default.stdout b/tests/snapshots/add/list_features_path_no_default/stdout.log
similarity index 100%
rename from tests/snapshots/add/list_features_path_no_default.stdout
rename to tests/snapshots/add/list_features_path_no_default/stdout.log
diff --git a/tests/snapshots/add/manifest_path_package.in/Cargo.toml b/tests/snapshots/add/manifest_path_package/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/manifest_path_package.in/Cargo.toml
rename to tests/snapshots/add/manifest_path_package/in/Cargo.toml
diff --git a/tests/snapshots/add/manifest_path_package.in/dependency/Cargo.toml b/tests/snapshots/add/manifest_path_package/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/manifest_path_package.in/dependency/Cargo.toml
rename to tests/snapshots/add/manifest_path_package/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/manifest_path_package.in/dependency/src/lib.rs b/tests/snapshots/add/manifest_path_package/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/manifest_path_package.in/dependency/src/lib.rs
rename to tests/snapshots/add/manifest_path_package/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/manifest_path_package.in/primary/Cargo.toml b/tests/snapshots/add/manifest_path_package/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/manifest_path_package.in/primary/Cargo.toml
rename to tests/snapshots/add/manifest_path_package/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/manifest_path_package.in/primary/src/lib.rs b/tests/snapshots/add/manifest_path_package/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/manifest_path_package.in/primary/src/lib.rs
rename to tests/snapshots/add/manifest_path_package/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/manifest_path_package.out/Cargo.toml b/tests/snapshots/add/manifest_path_package/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/manifest_path_package.out/Cargo.toml
rename to tests/snapshots/add/manifest_path_package/out/Cargo.toml
diff --git a/tests/snapshots/add/manifest_path_package.out/dependency/Cargo.toml b/tests/snapshots/add/manifest_path_package/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/manifest_path_package.out/dependency/Cargo.toml
rename to tests/snapshots/add/manifest_path_package/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/manifest_path_package.out/primary/Cargo.toml b/tests/snapshots/add/manifest_path_package/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/manifest_path_package.out/primary/Cargo.toml
rename to tests/snapshots/add/manifest_path_package/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/manifest_path_package.stderr b/tests/snapshots/add/manifest_path_package/stderr.log
similarity index 100%
rename from tests/snapshots/add/manifest_path_package.stderr
rename to tests/snapshots/add/manifest_path_package/stderr.log
diff --git a/tests/snapshots/add/manifest_path_package.stdout b/tests/snapshots/add/manifest_path_package/stdout.log
similarity index 100%
rename from tests/snapshots/add/manifest_path_package.stdout
rename to tests/snapshots/add/manifest_path_package/stdout.log
diff --git a/tests/snapshots/add/merge_activated_features.in/Cargo.toml b/tests/snapshots/add/merge_activated_features/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/merge_activated_features.in/Cargo.toml
rename to tests/snapshots/add/merge_activated_features/in/Cargo.toml
diff --git a/tests/snapshots/add/merge_activated_features.in/dependency/Cargo.toml b/tests/snapshots/add/merge_activated_features/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/merge_activated_features.in/dependency/Cargo.toml
rename to tests/snapshots/add/merge_activated_features/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/merge_activated_features.in/dependency/src/lib.rs b/tests/snapshots/add/merge_activated_features/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/merge_activated_features.in/dependency/src/lib.rs
rename to tests/snapshots/add/merge_activated_features/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/merge_activated_features.in/primary/Cargo.toml b/tests/snapshots/add/merge_activated_features/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/merge_activated_features.in/primary/Cargo.toml
rename to tests/snapshots/add/merge_activated_features/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/merge_activated_features.in/primary/src/lib.rs b/tests/snapshots/add/merge_activated_features/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/merge_activated_features.in/primary/src/lib.rs
rename to tests/snapshots/add/merge_activated_features/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/merge_activated_features.out/Cargo.toml b/tests/snapshots/add/merge_activated_features/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/merge_activated_features.out/Cargo.toml
rename to tests/snapshots/add/merge_activated_features/out/Cargo.toml
diff --git a/tests/snapshots/add/merge_activated_features.out/dependency/Cargo.toml b/tests/snapshots/add/merge_activated_features/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/merge_activated_features.out/dependency/Cargo.toml
rename to tests/snapshots/add/merge_activated_features/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/merge_activated_features.out/primary/Cargo.toml b/tests/snapshots/add/merge_activated_features/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/merge_activated_features.out/primary/Cargo.toml
rename to tests/snapshots/add/merge_activated_features/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/merge_activated_features.stderr b/tests/snapshots/add/merge_activated_features/stderr.log
similarity index 100%
rename from tests/snapshots/add/merge_activated_features.stderr
rename to tests/snapshots/add/merge_activated_features/stderr.log
diff --git a/tests/snapshots/add/merge_activated_features.stdout b/tests/snapshots/add/merge_activated_features/stdout.log
similarity index 100%
rename from tests/snapshots/add/merge_activated_features.stdout
rename to tests/snapshots/add/merge_activated_features/stdout.log
diff --git a/tests/snapshots/add/multiple_conflicts_with_features.in b/tests/snapshots/add/multiple_conflicts_with_features.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/multiple_conflicts_with_features.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/multiple_conflicts_with_features/in b/tests/snapshots/add/multiple_conflicts_with_features/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/multiple_conflicts_with_features/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/multiple_conflicts_with_features.out/Cargo.toml b/tests/snapshots/add/multiple_conflicts_with_features/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/multiple_conflicts_with_features.out/Cargo.toml
rename to tests/snapshots/add/multiple_conflicts_with_features/out/Cargo.toml
diff --git a/tests/snapshots/add/multiple_conflicts_with_features.stderr b/tests/snapshots/add/multiple_conflicts_with_features/stderr.log
similarity index 100%
rename from tests/snapshots/add/multiple_conflicts_with_features.stderr
rename to tests/snapshots/add/multiple_conflicts_with_features/stderr.log
diff --git a/tests/snapshots/add/multiple_conflicts_with_features.stdout b/tests/snapshots/add/multiple_conflicts_with_features/stdout.log
similarity index 100%
rename from tests/snapshots/add/multiple_conflicts_with_features.stdout
rename to tests/snapshots/add/multiple_conflicts_with_features/stdout.log
diff --git a/tests/snapshots/add/multiple_conflicts_with_rename.in b/tests/snapshots/add/multiple_conflicts_with_rename.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/multiple_conflicts_with_rename.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/multiple_conflicts_with_rename/in b/tests/snapshots/add/multiple_conflicts_with_rename/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/multiple_conflicts_with_rename/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/multiple_conflicts_with_rename.out/Cargo.toml b/tests/snapshots/add/multiple_conflicts_with_rename/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/multiple_conflicts_with_rename.out/Cargo.toml
rename to tests/snapshots/add/multiple_conflicts_with_rename/out/Cargo.toml
diff --git a/tests/snapshots/add/multiple_conflicts_with_rename.stderr b/tests/snapshots/add/multiple_conflicts_with_rename/stderr.log
similarity index 100%
rename from tests/snapshots/add/multiple_conflicts_with_rename.stderr
rename to tests/snapshots/add/multiple_conflicts_with_rename/stderr.log
diff --git a/tests/snapshots/add/multiple_conflicts_with_rename.stdout b/tests/snapshots/add/multiple_conflicts_with_rename/stdout.log
similarity index 100%
rename from tests/snapshots/add/multiple_conflicts_with_rename.stdout
rename to tests/snapshots/add/multiple_conflicts_with_rename/stdout.log
diff --git a/tests/snapshots/add/namever.in b/tests/snapshots/add/namever.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/namever.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/namever/in b/tests/snapshots/add/namever/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/namever/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/namever.out/Cargo.toml b/tests/snapshots/add/namever/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/namever.out/Cargo.toml
rename to tests/snapshots/add/namever/out/Cargo.toml
diff --git a/tests/snapshots/add/namever.stderr b/tests/snapshots/add/namever/stderr.log
similarity index 100%
rename from tests/snapshots/add/namever.stderr
rename to tests/snapshots/add/namever/stderr.log
diff --git a/tests/snapshots/add/namever.stdout b/tests/snapshots/add/namever/stdout.log
similarity index 100%
rename from tests/snapshots/add/namever.stdout
rename to tests/snapshots/add/namever/stdout.log
diff --git a/tests/snapshots/add/no_args.in b/tests/snapshots/add/no_args.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/no_args.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/no_args/in b/tests/snapshots/add/no_args/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/no_args/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/no_args.out/Cargo.toml b/tests/snapshots/add/no_args/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/no_args.out/Cargo.toml
rename to tests/snapshots/add/no_args/out/Cargo.toml
diff --git a/tests/snapshots/add/no_args.stderr b/tests/snapshots/add/no_args/stderr.log
similarity index 100%
rename from tests/snapshots/add/no_args.stderr
rename to tests/snapshots/add/no_args/stderr.log
diff --git a/tests/snapshots/add/no_args.stdout b/tests/snapshots/add/no_args/stdout.log
similarity index 100%
rename from tests/snapshots/add/no_args.stdout
rename to tests/snapshots/add/no_args/stdout.log
diff --git a/tests/snapshots/add/no_default_features.in b/tests/snapshots/add/no_default_features.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/no_default_features.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/no_default_features/in b/tests/snapshots/add/no_default_features/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/no_default_features/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/no_default_features.out/Cargo.toml b/tests/snapshots/add/no_default_features/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/no_default_features.out/Cargo.toml
rename to tests/snapshots/add/no_default_features/out/Cargo.toml
diff --git a/tests/snapshots/add/no_default_features.stderr b/tests/snapshots/add/no_default_features/stderr.log
similarity index 100%
rename from tests/snapshots/add/no_default_features.stderr
rename to tests/snapshots/add/no_default_features/stderr.log
diff --git a/tests/snapshots/add/no_default_features.stdout b/tests/snapshots/add/no_default_features/stdout.log
similarity index 100%
rename from tests/snapshots/add/no_default_features.stdout
rename to tests/snapshots/add/no_default_features/stdout.log
diff --git a/tests/snapshots/add/no_optional.in b/tests/snapshots/add/no_optional.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/no_optional.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/no_optional/in b/tests/snapshots/add/no_optional/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/no_optional/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/no_optional.out/Cargo.toml b/tests/snapshots/add/no_optional/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/no_optional.out/Cargo.toml
rename to tests/snapshots/add/no_optional/out/Cargo.toml
diff --git a/tests/snapshots/add/no_optional.stderr b/tests/snapshots/add/no_optional/stderr.log
similarity index 100%
rename from tests/snapshots/add/no_optional.stderr
rename to tests/snapshots/add/no_optional/stderr.log
diff --git a/tests/snapshots/add/no_optional.stdout b/tests/snapshots/add/no_optional/stdout.log
similarity index 100%
rename from tests/snapshots/add/no_optional.stdout
rename to tests/snapshots/add/no_optional/stdout.log
diff --git a/tests/snapshots/add/optional.in b/tests/snapshots/add/optional.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/optional.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/optional/in b/tests/snapshots/add/optional/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/optional/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/optional.out/Cargo.toml b/tests/snapshots/add/optional/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/optional.out/Cargo.toml
rename to tests/snapshots/add/optional/out/Cargo.toml
diff --git a/tests/snapshots/add/optional.stderr b/tests/snapshots/add/optional/stderr.log
similarity index 100%
rename from tests/snapshots/add/optional.stderr
rename to tests/snapshots/add/optional/stderr.log
diff --git a/tests/snapshots/add/optional.stdout b/tests/snapshots/add/optional/stdout.log
similarity index 100%
rename from tests/snapshots/add/optional.stdout
rename to tests/snapshots/add/optional/stdout.log
diff --git a/tests/snapshots/add/overwrite_default_features.in/Cargo.toml b/tests/snapshots/add/overwrite_default_features/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_default_features.in/Cargo.toml
rename to tests/snapshots/add/overwrite_default_features/in/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_default_features.in/src/lib.rs b/tests/snapshots/add/overwrite_default_features/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_default_features.in/src/lib.rs
rename to tests/snapshots/add/overwrite_default_features/in/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_default_features.out/Cargo.toml b/tests/snapshots/add/overwrite_default_features/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_default_features.out/Cargo.toml
rename to tests/snapshots/add/overwrite_default_features/out/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_default_features.stderr b/tests/snapshots/add/overwrite_default_features/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_default_features.stderr
rename to tests/snapshots/add/overwrite_default_features/stderr.log
diff --git a/tests/snapshots/add/overwrite_default_features.stdout b/tests/snapshots/add/overwrite_default_features/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_default_features.stdout
rename to tests/snapshots/add/overwrite_default_features/stdout.log
diff --git a/tests/snapshots/add/overwrite_default_features_with_no_default_features.in/Cargo.toml b/tests/snapshots/add/overwrite_default_features_with_no_default_features/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_default_features_with_no_default_features.in/Cargo.toml
rename to tests/snapshots/add/overwrite_default_features_with_no_default_features/in/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_default_features_with_no_default_features.in/src/lib.rs b/tests/snapshots/add/overwrite_default_features_with_no_default_features/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_default_features_with_no_default_features.in/src/lib.rs
rename to tests/snapshots/add/overwrite_default_features_with_no_default_features/in/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_default_features_with_no_default_features.out/Cargo.toml b/tests/snapshots/add/overwrite_default_features_with_no_default_features/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_default_features_with_no_default_features.out/Cargo.toml
rename to tests/snapshots/add/overwrite_default_features_with_no_default_features/out/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_default_features_with_no_default_features.stderr b/tests/snapshots/add/overwrite_default_features_with_no_default_features/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_default_features_with_no_default_features.stderr
rename to tests/snapshots/add/overwrite_default_features_with_no_default_features/stderr.log
diff --git a/tests/snapshots/add/overwrite_default_features_with_no_default_features.stdout b/tests/snapshots/add/overwrite_default_features_with_no_default_features/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_default_features_with_no_default_features.stdout
rename to tests/snapshots/add/overwrite_default_features_with_no_default_features/stdout.log
diff --git a/tests/snapshots/add/overwrite_features.in/Cargo.toml b/tests/snapshots/add/overwrite_features/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_features.in/Cargo.toml
rename to tests/snapshots/add/overwrite_features/in/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_features.in/src/lib.rs b/tests/snapshots/add/overwrite_features/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_features.in/src/lib.rs
rename to tests/snapshots/add/overwrite_features/in/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_features.out/Cargo.toml b/tests/snapshots/add/overwrite_features/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_features.out/Cargo.toml
rename to tests/snapshots/add/overwrite_features/out/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_features.stderr b/tests/snapshots/add/overwrite_features/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_features.stderr
rename to tests/snapshots/add/overwrite_features/stderr.log
diff --git a/tests/snapshots/add/overwrite_features.stdout b/tests/snapshots/add/overwrite_features/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_features.stdout
rename to tests/snapshots/add/overwrite_features/stdout.log
diff --git a/tests/snapshots/add/overwrite_git_with_path.in/dependency/Cargo.toml b/tests/snapshots/add/overwrite_git_with_path/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_git_with_path.in/dependency/Cargo.toml
rename to tests/snapshots/add/overwrite_git_with_path/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_git_with_path.in/dependency/src/lib.rs b/tests/snapshots/add/overwrite_git_with_path/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_git_with_path.in/dependency/src/lib.rs
rename to tests/snapshots/add/overwrite_git_with_path/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_git_with_path.in/primary/Cargo.toml b/tests/snapshots/add/overwrite_git_with_path/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_git_with_path.in/primary/Cargo.toml
rename to tests/snapshots/add/overwrite_git_with_path/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_git_with_path.in/primary/src/lib.rs b/tests/snapshots/add/overwrite_git_with_path/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_git_with_path.in/primary/src/lib.rs
rename to tests/snapshots/add/overwrite_git_with_path/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_git_with_path.out/dependency/Cargo.toml b/tests/snapshots/add/overwrite_git_with_path/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_git_with_path.out/dependency/Cargo.toml
rename to tests/snapshots/add/overwrite_git_with_path/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_git_with_path.out/primary/Cargo.toml b/tests/snapshots/add/overwrite_git_with_path/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_git_with_path.out/primary/Cargo.toml
rename to tests/snapshots/add/overwrite_git_with_path/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_git_with_path.stderr b/tests/snapshots/add/overwrite_git_with_path/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_git_with_path.stderr
rename to tests/snapshots/add/overwrite_git_with_path/stderr.log
diff --git a/tests/snapshots/add/overwrite_git_with_path.stdout b/tests/snapshots/add/overwrite_git_with_path/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_git_with_path.stdout
rename to tests/snapshots/add/overwrite_git_with_path/stdout.log
diff --git a/tests/snapshots/add/overwrite_inherit_features_noop.in/Cargo.toml b/tests/snapshots/add/overwrite_inherit_features_noop/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_features_noop.in/Cargo.toml
rename to tests/snapshots/add/overwrite_inherit_features_noop/in/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_inherit_features_noop.in/dependency/Cargo.toml b/tests/snapshots/add/overwrite_inherit_features_noop/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_features_noop.in/dependency/Cargo.toml
rename to tests/snapshots/add/overwrite_inherit_features_noop/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_inherit_features_noop.in/dependency/src/lib.rs b/tests/snapshots/add/overwrite_inherit_features_noop/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_features_noop.in/dependency/src/lib.rs
rename to tests/snapshots/add/overwrite_inherit_features_noop/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_inherit_features_noop.in/primary/Cargo.toml b/tests/snapshots/add/overwrite_inherit_features_noop/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_features_noop.in/primary/Cargo.toml
rename to tests/snapshots/add/overwrite_inherit_features_noop/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_inherit_features_noop.in/primary/src/lib.rs b/tests/snapshots/add/overwrite_inherit_features_noop/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_features_noop.in/primary/src/lib.rs
rename to tests/snapshots/add/overwrite_inherit_features_noop/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_inherit_features_noop.out/Cargo.toml b/tests/snapshots/add/overwrite_inherit_features_noop/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_features_noop.out/Cargo.toml
rename to tests/snapshots/add/overwrite_inherit_features_noop/out/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_inherit_features_noop.out/dependency/Cargo.toml b/tests/snapshots/add/overwrite_inherit_features_noop/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_features_noop.out/dependency/Cargo.toml
rename to tests/snapshots/add/overwrite_inherit_features_noop/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_inherit_features_noop.out/primary/Cargo.toml b/tests/snapshots/add/overwrite_inherit_features_noop/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_features_noop.out/primary/Cargo.toml
rename to tests/snapshots/add/overwrite_inherit_features_noop/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_inherit_features_noop.stderr b/tests/snapshots/add/overwrite_inherit_features_noop/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_features_noop.stderr
rename to tests/snapshots/add/overwrite_inherit_features_noop/stderr.log
diff --git a/tests/snapshots/add/overwrite_inherit_features_noop.stdout b/tests/snapshots/add/overwrite_inherit_features_noop/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_features_noop.stdout
rename to tests/snapshots/add/overwrite_inherit_features_noop/stdout.log
diff --git a/tests/snapshots/add/overwrite_inherit_noop.in/Cargo.toml b/tests/snapshots/add/overwrite_inherit_noop/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_noop.in/Cargo.toml
rename to tests/snapshots/add/overwrite_inherit_noop/in/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_inherit_noop.in/dependency/Cargo.toml b/tests/snapshots/add/overwrite_inherit_noop/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_noop.in/dependency/Cargo.toml
rename to tests/snapshots/add/overwrite_inherit_noop/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_inherit_noop.in/dependency/src/lib.rs b/tests/snapshots/add/overwrite_inherit_noop/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_noop.in/dependency/src/lib.rs
rename to tests/snapshots/add/overwrite_inherit_noop/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_inherit_noop.in/primary/Cargo.toml b/tests/snapshots/add/overwrite_inherit_noop/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_noop.in/primary/Cargo.toml
rename to tests/snapshots/add/overwrite_inherit_noop/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_inherit_noop.in/primary/src/lib.rs b/tests/snapshots/add/overwrite_inherit_noop/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_noop.in/primary/src/lib.rs
rename to tests/snapshots/add/overwrite_inherit_noop/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_inherit_noop.out/Cargo.toml b/tests/snapshots/add/overwrite_inherit_noop/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_noop.out/Cargo.toml
rename to tests/snapshots/add/overwrite_inherit_noop/out/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_inherit_noop.out/dependency/Cargo.toml b/tests/snapshots/add/overwrite_inherit_noop/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_noop.out/dependency/Cargo.toml
rename to tests/snapshots/add/overwrite_inherit_noop/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_inherit_noop.out/primary/Cargo.toml b/tests/snapshots/add/overwrite_inherit_noop/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_noop.out/primary/Cargo.toml
rename to tests/snapshots/add/overwrite_inherit_noop/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_inherit_noop.stderr b/tests/snapshots/add/overwrite_inherit_noop/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_noop.stderr
rename to tests/snapshots/add/overwrite_inherit_noop/stderr.log
diff --git a/tests/snapshots/add/overwrite_inherit_noop.stdout b/tests/snapshots/add/overwrite_inherit_noop/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_noop.stdout
rename to tests/snapshots/add/overwrite_inherit_noop/stdout.log
diff --git a/tests/snapshots/add/overwrite_inherit_optional_noop.in/Cargo.toml b/tests/snapshots/add/overwrite_inherit_optional_noop/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_optional_noop.in/Cargo.toml
rename to tests/snapshots/add/overwrite_inherit_optional_noop/in/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_inherit_optional_noop.in/dependency/Cargo.toml b/tests/snapshots/add/overwrite_inherit_optional_noop/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_optional_noop.in/dependency/Cargo.toml
rename to tests/snapshots/add/overwrite_inherit_optional_noop/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_inherit_optional_noop.in/dependency/src/lib.rs b/tests/snapshots/add/overwrite_inherit_optional_noop/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_optional_noop.in/dependency/src/lib.rs
rename to tests/snapshots/add/overwrite_inherit_optional_noop/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_inherit_optional_noop.in/primary/Cargo.toml b/tests/snapshots/add/overwrite_inherit_optional_noop/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_optional_noop.in/primary/Cargo.toml
rename to tests/snapshots/add/overwrite_inherit_optional_noop/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_inherit_optional_noop.in/primary/src/lib.rs b/tests/snapshots/add/overwrite_inherit_optional_noop/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_optional_noop.in/primary/src/lib.rs
rename to tests/snapshots/add/overwrite_inherit_optional_noop/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_inherit_optional_noop.out/Cargo.toml b/tests/snapshots/add/overwrite_inherit_optional_noop/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_optional_noop.out/Cargo.toml
rename to tests/snapshots/add/overwrite_inherit_optional_noop/out/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_inherit_optional_noop.out/dependency/Cargo.toml b/tests/snapshots/add/overwrite_inherit_optional_noop/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_optional_noop.out/dependency/Cargo.toml
rename to tests/snapshots/add/overwrite_inherit_optional_noop/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_inherit_optional_noop.out/primary/Cargo.toml b/tests/snapshots/add/overwrite_inherit_optional_noop/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_optional_noop.out/primary/Cargo.toml
rename to tests/snapshots/add/overwrite_inherit_optional_noop/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_inherit_optional_noop.stderr b/tests/snapshots/add/overwrite_inherit_optional_noop/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_optional_noop.stderr
rename to tests/snapshots/add/overwrite_inherit_optional_noop/stderr.log
diff --git a/tests/snapshots/add/overwrite_inherit_optional_noop.stdout b/tests/snapshots/add/overwrite_inherit_optional_noop/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_inherit_optional_noop.stdout
rename to tests/snapshots/add/overwrite_inherit_optional_noop/stdout.log
diff --git a/tests/snapshots/add/overwrite_inline_features.in/Cargo.toml b/tests/snapshots/add/overwrite_inline_features/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_inline_features.in/Cargo.toml
rename to tests/snapshots/add/overwrite_inline_features/in/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_inline_features.in/src/lib.rs b/tests/snapshots/add/overwrite_inline_features/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_inline_features.in/src/lib.rs
rename to tests/snapshots/add/overwrite_inline_features/in/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_inline_features.out/Cargo.toml b/tests/snapshots/add/overwrite_inline_features/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_inline_features.out/Cargo.toml
rename to tests/snapshots/add/overwrite_inline_features/out/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_inline_features.stderr b/tests/snapshots/add/overwrite_inline_features/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_inline_features.stderr
rename to tests/snapshots/add/overwrite_inline_features/stderr.log
diff --git a/tests/snapshots/add/overwrite_inline_features.stdout b/tests/snapshots/add/overwrite_inline_features/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_inline_features.stdout
rename to tests/snapshots/add/overwrite_inline_features/stdout.log
diff --git a/tests/snapshots/add/overwrite_name_dev_noop.in/Cargo.toml b/tests/snapshots/add/overwrite_name_dev_noop/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_name_dev_noop.in/Cargo.toml
rename to tests/snapshots/add/overwrite_name_dev_noop/in/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_name_dev_noop.in/dependency/Cargo.toml b/tests/snapshots/add/overwrite_name_dev_noop/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_name_dev_noop.in/dependency/Cargo.toml
rename to tests/snapshots/add/overwrite_name_dev_noop/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_name_dev_noop.in/dependency/src/lib.rs b/tests/snapshots/add/overwrite_name_dev_noop/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_name_dev_noop.in/dependency/src/lib.rs
rename to tests/snapshots/add/overwrite_name_dev_noop/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_name_dev_noop.in/src/lib.rs b/tests/snapshots/add/overwrite_name_dev_noop/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_name_dev_noop.in/src/lib.rs
rename to tests/snapshots/add/overwrite_name_dev_noop/in/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_name_dev_noop.out/Cargo.toml b/tests/snapshots/add/overwrite_name_dev_noop/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_name_dev_noop.out/Cargo.toml
rename to tests/snapshots/add/overwrite_name_dev_noop/out/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_name_dev_noop.out/dependency/Cargo.toml b/tests/snapshots/add/overwrite_name_dev_noop/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_name_dev_noop.out/dependency/Cargo.toml
rename to tests/snapshots/add/overwrite_name_dev_noop/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_name_dev_noop.stderr b/tests/snapshots/add/overwrite_name_dev_noop/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_name_dev_noop.stderr
rename to tests/snapshots/add/overwrite_name_dev_noop/stderr.log
diff --git a/tests/snapshots/add/overwrite_name_dev_noop.stdout b/tests/snapshots/add/overwrite_name_dev_noop/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_name_dev_noop.stdout
rename to tests/snapshots/add/overwrite_name_dev_noop/stdout.log
diff --git a/tests/snapshots/add/overwrite_name_noop.in/Cargo.toml b/tests/snapshots/add/overwrite_name_noop/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_name_noop.in/Cargo.toml
rename to tests/snapshots/add/overwrite_name_noop/in/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_name_noop.in/dependency/Cargo.toml b/tests/snapshots/add/overwrite_name_noop/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_name_noop.in/dependency/Cargo.toml
rename to tests/snapshots/add/overwrite_name_noop/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_name_noop.in/dependency/src/lib.rs b/tests/snapshots/add/overwrite_name_noop/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_name_noop.in/dependency/src/lib.rs
rename to tests/snapshots/add/overwrite_name_noop/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_name_noop.in/src/lib.rs b/tests/snapshots/add/overwrite_name_noop/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_name_noop.in/src/lib.rs
rename to tests/snapshots/add/overwrite_name_noop/in/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_name_noop.out/Cargo.toml b/tests/snapshots/add/overwrite_name_noop/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_name_noop.out/Cargo.toml
rename to tests/snapshots/add/overwrite_name_noop/out/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_name_noop.out/dependency/Cargo.toml b/tests/snapshots/add/overwrite_name_noop/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_name_noop.out/dependency/Cargo.toml
rename to tests/snapshots/add/overwrite_name_noop/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_name_noop.stderr b/tests/snapshots/add/overwrite_name_noop/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_name_noop.stderr
rename to tests/snapshots/add/overwrite_name_noop/stderr.log
diff --git a/tests/snapshots/add/overwrite_name_noop.stdout b/tests/snapshots/add/overwrite_name_noop/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_name_noop.stdout
rename to tests/snapshots/add/overwrite_name_noop/stdout.log
diff --git a/tests/snapshots/add/overwrite_no_default_features.in/Cargo.toml b/tests/snapshots/add/overwrite_no_default_features/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_no_default_features.in/Cargo.toml
rename to tests/snapshots/add/overwrite_no_default_features/in/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_no_default_features.in/src/lib.rs b/tests/snapshots/add/overwrite_no_default_features/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_no_default_features.in/src/lib.rs
rename to tests/snapshots/add/overwrite_no_default_features/in/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_no_default_features.out/Cargo.toml b/tests/snapshots/add/overwrite_no_default_features/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_no_default_features.out/Cargo.toml
rename to tests/snapshots/add/overwrite_no_default_features/out/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_no_default_features.stderr b/tests/snapshots/add/overwrite_no_default_features/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_no_default_features.stderr
rename to tests/snapshots/add/overwrite_no_default_features/stderr.log
diff --git a/tests/snapshots/add/overwrite_no_default_features.stdout b/tests/snapshots/add/overwrite_no_default_features/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_no_default_features.stdout
rename to tests/snapshots/add/overwrite_no_default_features/stdout.log
diff --git a/tests/snapshots/add/overwrite_no_default_features_with_default_features.in/Cargo.toml b/tests/snapshots/add/overwrite_no_default_features_with_default_features/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_no_default_features_with_default_features.in/Cargo.toml
rename to tests/snapshots/add/overwrite_no_default_features_with_default_features/in/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_no_default_features_with_default_features.in/src/lib.rs b/tests/snapshots/add/overwrite_no_default_features_with_default_features/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_no_default_features_with_default_features.in/src/lib.rs
rename to tests/snapshots/add/overwrite_no_default_features_with_default_features/in/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_no_default_features_with_default_features.out/Cargo.toml b/tests/snapshots/add/overwrite_no_default_features_with_default_features/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_no_default_features_with_default_features.out/Cargo.toml
rename to tests/snapshots/add/overwrite_no_default_features_with_default_features/out/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_no_default_features_with_default_features.stderr b/tests/snapshots/add/overwrite_no_default_features_with_default_features/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_no_default_features_with_default_features.stderr
rename to tests/snapshots/add/overwrite_no_default_features_with_default_features/stderr.log
diff --git a/tests/snapshots/add/overwrite_no_default_features_with_default_features.stdout b/tests/snapshots/add/overwrite_no_default_features_with_default_features/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_no_default_features_with_default_features.stdout
rename to tests/snapshots/add/overwrite_no_default_features_with_default_features/stdout.log
diff --git a/tests/snapshots/add/overwrite_no_optional.in/Cargo.toml b/tests/snapshots/add/overwrite_no_optional/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_no_optional.in/Cargo.toml
rename to tests/snapshots/add/overwrite_no_optional/in/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_no_optional.in/src/lib.rs b/tests/snapshots/add/overwrite_no_optional/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_no_optional.in/src/lib.rs
rename to tests/snapshots/add/overwrite_no_optional/in/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_no_optional.out/Cargo.toml b/tests/snapshots/add/overwrite_no_optional/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_no_optional.out/Cargo.toml
rename to tests/snapshots/add/overwrite_no_optional/out/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_no_optional.stderr b/tests/snapshots/add/overwrite_no_optional/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_no_optional.stderr
rename to tests/snapshots/add/overwrite_no_optional/stderr.log
diff --git a/tests/snapshots/add/overwrite_no_optional.stdout b/tests/snapshots/add/overwrite_no_optional/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_no_optional.stdout
rename to tests/snapshots/add/overwrite_no_optional/stdout.log
diff --git a/tests/snapshots/add/overwrite_no_optional_with_optional.in/Cargo.toml b/tests/snapshots/add/overwrite_no_optional_with_optional/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_no_optional_with_optional.in/Cargo.toml
rename to tests/snapshots/add/overwrite_no_optional_with_optional/in/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_no_optional_with_optional.in/src/lib.rs b/tests/snapshots/add/overwrite_no_optional_with_optional/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_no_optional_with_optional.in/src/lib.rs
rename to tests/snapshots/add/overwrite_no_optional_with_optional/in/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_no_optional_with_optional.out/Cargo.toml b/tests/snapshots/add/overwrite_no_optional_with_optional/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_no_optional_with_optional.out/Cargo.toml
rename to tests/snapshots/add/overwrite_no_optional_with_optional/out/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_no_optional_with_optional.stderr b/tests/snapshots/add/overwrite_no_optional_with_optional/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_no_optional_with_optional.stderr
rename to tests/snapshots/add/overwrite_no_optional_with_optional/stderr.log
diff --git a/tests/snapshots/add/overwrite_no_optional_with_optional.stdout b/tests/snapshots/add/overwrite_no_optional_with_optional/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_no_optional_with_optional.stdout
rename to tests/snapshots/add/overwrite_no_optional_with_optional/stdout.log
diff --git a/tests/snapshots/add/overwrite_optional.in/Cargo.toml b/tests/snapshots/add/overwrite_optional/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_optional.in/Cargo.toml
rename to tests/snapshots/add/overwrite_optional/in/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_optional.in/src/lib.rs b/tests/snapshots/add/overwrite_optional/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_optional.in/src/lib.rs
rename to tests/snapshots/add/overwrite_optional/in/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_optional.out/Cargo.toml b/tests/snapshots/add/overwrite_optional/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_optional.out/Cargo.toml
rename to tests/snapshots/add/overwrite_optional/out/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_optional.stderr b/tests/snapshots/add/overwrite_optional/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_optional.stderr
rename to tests/snapshots/add/overwrite_optional/stderr.log
diff --git a/tests/snapshots/add/overwrite_optional.stdout b/tests/snapshots/add/overwrite_optional/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_optional.stdout
rename to tests/snapshots/add/overwrite_optional/stdout.log
diff --git a/tests/snapshots/add/overwrite_optional_with_no_optional.in/Cargo.toml b/tests/snapshots/add/overwrite_optional_with_no_optional/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_optional_with_no_optional.in/Cargo.toml
rename to tests/snapshots/add/overwrite_optional_with_no_optional/in/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_optional_with_no_optional.in/src/lib.rs b/tests/snapshots/add/overwrite_optional_with_no_optional/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_optional_with_no_optional.in/src/lib.rs
rename to tests/snapshots/add/overwrite_optional_with_no_optional/in/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_optional_with_no_optional.out/Cargo.toml b/tests/snapshots/add/overwrite_optional_with_no_optional/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_optional_with_no_optional.out/Cargo.toml
rename to tests/snapshots/add/overwrite_optional_with_no_optional/out/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_optional_with_no_optional.stderr b/tests/snapshots/add/overwrite_optional_with_no_optional/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_optional_with_no_optional.stderr
rename to tests/snapshots/add/overwrite_optional_with_no_optional/stderr.log
diff --git a/tests/snapshots/add/overwrite_optional_with_no_optional.stdout b/tests/snapshots/add/overwrite_optional_with_no_optional/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_optional_with_no_optional.stdout
rename to tests/snapshots/add/overwrite_optional_with_no_optional/stdout.log
diff --git a/tests/snapshots/add/overwrite_path_noop.in/Cargo.toml b/tests/snapshots/add/overwrite_path_noop/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_path_noop.in/Cargo.toml
rename to tests/snapshots/add/overwrite_path_noop/in/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_path_noop.in/dependency/Cargo.toml b/tests/snapshots/add/overwrite_path_noop/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_path_noop.in/dependency/Cargo.toml
rename to tests/snapshots/add/overwrite_path_noop/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_path_noop.in/dependency/src/lib.rs b/tests/snapshots/add/overwrite_path_noop/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_path_noop.in/dependency/src/lib.rs
rename to tests/snapshots/add/overwrite_path_noop/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_path_noop.in/src/lib.rs b/tests/snapshots/add/overwrite_path_noop/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_path_noop.in/src/lib.rs
rename to tests/snapshots/add/overwrite_path_noop/in/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_path_noop.out/Cargo.toml b/tests/snapshots/add/overwrite_path_noop/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_path_noop.out/Cargo.toml
rename to tests/snapshots/add/overwrite_path_noop/out/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_path_noop.out/dependency/Cargo.toml b/tests/snapshots/add/overwrite_path_noop/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_path_noop.out/dependency/Cargo.toml
rename to tests/snapshots/add/overwrite_path_noop/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_path_noop.stderr b/tests/snapshots/add/overwrite_path_noop/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_path_noop.stderr
rename to tests/snapshots/add/overwrite_path_noop/stderr.log
diff --git a/tests/snapshots/add/overwrite_path_noop.stdout b/tests/snapshots/add/overwrite_path_noop/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_path_noop.stdout
rename to tests/snapshots/add/overwrite_path_noop/stdout.log
diff --git a/tests/snapshots/add/overwrite_path_with_version.in/dependency/Cargo.toml b/tests/snapshots/add/overwrite_path_with_version/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_path_with_version.in/dependency/Cargo.toml
rename to tests/snapshots/add/overwrite_path_with_version/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_path_with_version.in/dependency/src/lib.rs b/tests/snapshots/add/overwrite_path_with_version/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_path_with_version.in/dependency/src/lib.rs
rename to tests/snapshots/add/overwrite_path_with_version/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_path_with_version.in/primary/Cargo.toml b/tests/snapshots/add/overwrite_path_with_version/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_path_with_version.in/primary/Cargo.toml
rename to tests/snapshots/add/overwrite_path_with_version/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_path_with_version.in/primary/src/lib.rs b/tests/snapshots/add/overwrite_path_with_version/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_path_with_version.in/primary/src/lib.rs
rename to tests/snapshots/add/overwrite_path_with_version/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_path_with_version.out/dependency/Cargo.toml b/tests/snapshots/add/overwrite_path_with_version/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_path_with_version.out/dependency/Cargo.toml
rename to tests/snapshots/add/overwrite_path_with_version/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_path_with_version.out/primary/Cargo.toml b/tests/snapshots/add/overwrite_path_with_version/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_path_with_version.out/primary/Cargo.toml
rename to tests/snapshots/add/overwrite_path_with_version/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_path_with_version.stderr b/tests/snapshots/add/overwrite_path_with_version/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_path_with_version.stderr
rename to tests/snapshots/add/overwrite_path_with_version/stderr.log
diff --git a/tests/snapshots/add/overwrite_path_with_version.stdout b/tests/snapshots/add/overwrite_path_with_version/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_path_with_version.stdout
rename to tests/snapshots/add/overwrite_path_with_version/stdout.log
diff --git a/tests/snapshots/add/overwrite_rename_with_no_rename.in/Cargo.toml b/tests/snapshots/add/overwrite_rename_with_no_rename/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_rename_with_no_rename.in/Cargo.toml
rename to tests/snapshots/add/overwrite_rename_with_no_rename/in/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_rename_with_no_rename.in/src/lib.rs b/tests/snapshots/add/overwrite_rename_with_no_rename/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_rename_with_no_rename.in/src/lib.rs
rename to tests/snapshots/add/overwrite_rename_with_no_rename/in/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_rename_with_no_rename.out/Cargo.toml b/tests/snapshots/add/overwrite_rename_with_no_rename/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_rename_with_no_rename.out/Cargo.toml
rename to tests/snapshots/add/overwrite_rename_with_no_rename/out/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_rename_with_no_rename.stderr b/tests/snapshots/add/overwrite_rename_with_no_rename/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_rename_with_no_rename.stderr
rename to tests/snapshots/add/overwrite_rename_with_no_rename/stderr.log
diff --git a/tests/snapshots/add/overwrite_rename_with_no_rename.stdout b/tests/snapshots/add/overwrite_rename_with_no_rename/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_rename_with_no_rename.stdout
rename to tests/snapshots/add/overwrite_rename_with_no_rename/stdout.log
diff --git a/tests/snapshots/add/overwrite_rename_with_rename.in/Cargo.toml b/tests/snapshots/add/overwrite_rename_with_rename/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_rename_with_rename.in/Cargo.toml
rename to tests/snapshots/add/overwrite_rename_with_rename/in/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_rename_with_rename.in/src/lib.rs b/tests/snapshots/add/overwrite_rename_with_rename/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_rename_with_rename.in/src/lib.rs
rename to tests/snapshots/add/overwrite_rename_with_rename/in/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_rename_with_rename.out/Cargo.toml b/tests/snapshots/add/overwrite_rename_with_rename/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_rename_with_rename.out/Cargo.toml
rename to tests/snapshots/add/overwrite_rename_with_rename/out/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_rename_with_rename.stderr b/tests/snapshots/add/overwrite_rename_with_rename/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_rename_with_rename.stderr
rename to tests/snapshots/add/overwrite_rename_with_rename/stderr.log
diff --git a/tests/snapshots/add/overwrite_rename_with_rename.stdout b/tests/snapshots/add/overwrite_rename_with_rename/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_rename_with_rename.stdout
rename to tests/snapshots/add/overwrite_rename_with_rename/stdout.log
diff --git a/tests/snapshots/add/overwrite_rename_with_rename_noop.in/Cargo.toml b/tests/snapshots/add/overwrite_rename_with_rename_noop/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_rename_with_rename_noop.in/Cargo.toml
rename to tests/snapshots/add/overwrite_rename_with_rename_noop/in/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_rename_with_rename_noop.in/src/lib.rs b/tests/snapshots/add/overwrite_rename_with_rename_noop/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_rename_with_rename_noop.in/src/lib.rs
rename to tests/snapshots/add/overwrite_rename_with_rename_noop/in/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_rename_with_rename_noop.out/Cargo.toml b/tests/snapshots/add/overwrite_rename_with_rename_noop/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_rename_with_rename_noop.out/Cargo.toml
rename to tests/snapshots/add/overwrite_rename_with_rename_noop/out/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_rename_with_rename_noop.stderr b/tests/snapshots/add/overwrite_rename_with_rename_noop/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_rename_with_rename_noop.stderr
rename to tests/snapshots/add/overwrite_rename_with_rename_noop/stderr.log
diff --git a/tests/snapshots/add/overwrite_rename_with_rename_noop.stdout b/tests/snapshots/add/overwrite_rename_with_rename_noop/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_rename_with_rename_noop.stdout
rename to tests/snapshots/add/overwrite_rename_with_rename_noop/stdout.log
diff --git a/tests/snapshots/add/overwrite_version_with_git.in/Cargo.toml b/tests/snapshots/add/overwrite_version_with_git/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_version_with_git.in/Cargo.toml
rename to tests/snapshots/add/overwrite_version_with_git/in/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_version_with_git.in/src/lib.rs b/tests/snapshots/add/overwrite_version_with_git/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_version_with_git.in/src/lib.rs
rename to tests/snapshots/add/overwrite_version_with_git/in/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_version_with_git.out/Cargo.toml b/tests/snapshots/add/overwrite_version_with_git/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_version_with_git.out/Cargo.toml
rename to tests/snapshots/add/overwrite_version_with_git/out/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_version_with_git.stderr b/tests/snapshots/add/overwrite_version_with_git/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_version_with_git.stderr
rename to tests/snapshots/add/overwrite_version_with_git/stderr.log
diff --git a/tests/snapshots/add/overwrite_version_with_git.stdout b/tests/snapshots/add/overwrite_version_with_git/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_version_with_git.stdout
rename to tests/snapshots/add/overwrite_version_with_git/stdout.log
diff --git a/tests/snapshots/add/overwrite_version_with_path.in/dependency/Cargo.toml b/tests/snapshots/add/overwrite_version_with_path/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_version_with_path.in/dependency/Cargo.toml
rename to tests/snapshots/add/overwrite_version_with_path/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_version_with_path.in/dependency/src/lib.rs b/tests/snapshots/add/overwrite_version_with_path/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_version_with_path.in/dependency/src/lib.rs
rename to tests/snapshots/add/overwrite_version_with_path/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_version_with_path.in/primary/Cargo.toml b/tests/snapshots/add/overwrite_version_with_path/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_version_with_path.in/primary/Cargo.toml
rename to tests/snapshots/add/overwrite_version_with_path/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_version_with_path.in/primary/src/lib.rs b/tests/snapshots/add/overwrite_version_with_path/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_version_with_path.in/primary/src/lib.rs
rename to tests/snapshots/add/overwrite_version_with_path/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_version_with_path.out/dependency/Cargo.toml b/tests/snapshots/add/overwrite_version_with_path/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_version_with_path.out/dependency/Cargo.toml
rename to tests/snapshots/add/overwrite_version_with_path/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_version_with_path.out/primary/Cargo.toml b/tests/snapshots/add/overwrite_version_with_path/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_version_with_path.out/primary/Cargo.toml
rename to tests/snapshots/add/overwrite_version_with_path/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_version_with_path.stderr b/tests/snapshots/add/overwrite_version_with_path/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_version_with_path.stderr
rename to tests/snapshots/add/overwrite_version_with_path/stderr.log
diff --git a/tests/snapshots/add/overwrite_version_with_path.stdout b/tests/snapshots/add/overwrite_version_with_path/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_version_with_path.stdout
rename to tests/snapshots/add/overwrite_version_with_path/stdout.log
diff --git a/tests/snapshots/add/overwrite_with_rename.in/Cargo.toml b/tests/snapshots/add/overwrite_with_rename/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_with_rename.in/Cargo.toml
rename to tests/snapshots/add/overwrite_with_rename/in/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_with_rename.in/src/lib.rs b/tests/snapshots/add/overwrite_with_rename/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_with_rename.in/src/lib.rs
rename to tests/snapshots/add/overwrite_with_rename/in/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_with_rename.out/Cargo.toml b/tests/snapshots/add/overwrite_with_rename/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_with_rename.out/Cargo.toml
rename to tests/snapshots/add/overwrite_with_rename/out/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_with_rename.stderr b/tests/snapshots/add/overwrite_with_rename/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_with_rename.stderr
rename to tests/snapshots/add/overwrite_with_rename/stderr.log
diff --git a/tests/snapshots/add/overwrite_with_rename.stdout b/tests/snapshots/add/overwrite_with_rename/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_with_rename.stdout
rename to tests/snapshots/add/overwrite_with_rename/stdout.log
diff --git a/tests/snapshots/add/overwrite_workspace_dep.in/Cargo.toml b/tests/snapshots/add/overwrite_workspace_dep/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_workspace_dep.in/Cargo.toml
rename to tests/snapshots/add/overwrite_workspace_dep/in/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_workspace_dep.in/dependency/Cargo.toml b/tests/snapshots/add/overwrite_workspace_dep/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_workspace_dep.in/dependency/Cargo.toml
rename to tests/snapshots/add/overwrite_workspace_dep/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_workspace_dep.in/dependency/src/lib.rs b/tests/snapshots/add/overwrite_workspace_dep/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_workspace_dep.in/dependency/src/lib.rs
rename to tests/snapshots/add/overwrite_workspace_dep/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_workspace_dep.in/primary/Cargo.toml b/tests/snapshots/add/overwrite_workspace_dep/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_workspace_dep.in/primary/Cargo.toml
rename to tests/snapshots/add/overwrite_workspace_dep/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_workspace_dep.in/primary/src/lib.rs b/tests/snapshots/add/overwrite_workspace_dep/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_workspace_dep.in/primary/src/lib.rs
rename to tests/snapshots/add/overwrite_workspace_dep/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_workspace_dep.out/Cargo.toml b/tests/snapshots/add/overwrite_workspace_dep/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_workspace_dep.out/Cargo.toml
rename to tests/snapshots/add/overwrite_workspace_dep/out/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_workspace_dep.out/dependency/Cargo.toml b/tests/snapshots/add/overwrite_workspace_dep/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_workspace_dep.out/dependency/Cargo.toml
rename to tests/snapshots/add/overwrite_workspace_dep/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_workspace_dep.out/primary/Cargo.toml b/tests/snapshots/add/overwrite_workspace_dep/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_workspace_dep.out/primary/Cargo.toml
rename to tests/snapshots/add/overwrite_workspace_dep/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_workspace_dep.stderr b/tests/snapshots/add/overwrite_workspace_dep/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_workspace_dep.stderr
rename to tests/snapshots/add/overwrite_workspace_dep/stderr.log
diff --git a/tests/snapshots/add/overwrite_workspace_dep.stdout b/tests/snapshots/add/overwrite_workspace_dep/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_workspace_dep.stdout
rename to tests/snapshots/add/overwrite_workspace_dep/stdout.log
diff --git a/tests/snapshots/add/overwrite_workspace_dep_features.in/Cargo.toml b/tests/snapshots/add/overwrite_workspace_dep_features/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_workspace_dep_features.in/Cargo.toml
rename to tests/snapshots/add/overwrite_workspace_dep_features/in/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_workspace_dep_features.in/dependency/Cargo.toml b/tests/snapshots/add/overwrite_workspace_dep_features/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_workspace_dep_features.in/dependency/Cargo.toml
rename to tests/snapshots/add/overwrite_workspace_dep_features/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_workspace_dep_features.in/dependency/src/lib.rs b/tests/snapshots/add/overwrite_workspace_dep_features/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_workspace_dep_features.in/dependency/src/lib.rs
rename to tests/snapshots/add/overwrite_workspace_dep_features/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_workspace_dep_features.in/primary/Cargo.toml b/tests/snapshots/add/overwrite_workspace_dep_features/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_workspace_dep_features.in/primary/Cargo.toml
rename to tests/snapshots/add/overwrite_workspace_dep_features/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_workspace_dep_features.in/primary/src/lib.rs b/tests/snapshots/add/overwrite_workspace_dep_features/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/overwrite_workspace_dep_features.in/primary/src/lib.rs
rename to tests/snapshots/add/overwrite_workspace_dep_features/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/overwrite_workspace_dep_features.out/Cargo.toml b/tests/snapshots/add/overwrite_workspace_dep_features/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_workspace_dep_features.out/Cargo.toml
rename to tests/snapshots/add/overwrite_workspace_dep_features/out/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_workspace_dep_features.out/dependency/Cargo.toml b/tests/snapshots/add/overwrite_workspace_dep_features/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_workspace_dep_features.out/dependency/Cargo.toml
rename to tests/snapshots/add/overwrite_workspace_dep_features/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_workspace_dep_features.out/primary/Cargo.toml b/tests/snapshots/add/overwrite_workspace_dep_features/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/overwrite_workspace_dep_features.out/primary/Cargo.toml
rename to tests/snapshots/add/overwrite_workspace_dep_features/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/overwrite_workspace_dep_features.stderr b/tests/snapshots/add/overwrite_workspace_dep_features/stderr.log
similarity index 100%
rename from tests/snapshots/add/overwrite_workspace_dep_features.stderr
rename to tests/snapshots/add/overwrite_workspace_dep_features/stderr.log
diff --git a/tests/snapshots/add/overwrite_workspace_dep_features.stdout b/tests/snapshots/add/overwrite_workspace_dep_features/stdout.log
similarity index 100%
rename from tests/snapshots/add/overwrite_workspace_dep_features.stdout
rename to tests/snapshots/add/overwrite_workspace_dep_features/stdout.log
diff --git a/tests/snapshots/add/path.in/dependency/Cargo.toml b/tests/snapshots/add/path/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/path.in/dependency/Cargo.toml
rename to tests/snapshots/add/path/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/path.in/dependency/src/lib.rs b/tests/snapshots/add/path/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/path.in/dependency/src/lib.rs
rename to tests/snapshots/add/path/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/path.in/primary/Cargo.toml b/tests/snapshots/add/path/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/path.in/primary/Cargo.toml
rename to tests/snapshots/add/path/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/path.in/primary/src/lib.rs b/tests/snapshots/add/path/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/path.in/primary/src/lib.rs
rename to tests/snapshots/add/path/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/path.out/dependency/Cargo.toml b/tests/snapshots/add/path/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/path.out/dependency/Cargo.toml
rename to tests/snapshots/add/path/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/path.out/primary/Cargo.toml b/tests/snapshots/add/path/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/path.out/primary/Cargo.toml
rename to tests/snapshots/add/path/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/path.stderr b/tests/snapshots/add/path/stderr.log
similarity index 100%
rename from tests/snapshots/add/path.stderr
rename to tests/snapshots/add/path/stderr.log
diff --git a/tests/snapshots/add/path.stdout b/tests/snapshots/add/path/stdout.log
similarity index 100%
rename from tests/snapshots/add/path.stdout
rename to tests/snapshots/add/path/stdout.log
diff --git a/tests/snapshots/add/path_dev.in/dependency/Cargo.toml b/tests/snapshots/add/path_dev/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/path_dev.in/dependency/Cargo.toml
rename to tests/snapshots/add/path_dev/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/path_dev.in/dependency/src/lib.rs b/tests/snapshots/add/path_dev/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/path_dev.in/dependency/src/lib.rs
rename to tests/snapshots/add/path_dev/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/path_dev.in/primary/Cargo.toml b/tests/snapshots/add/path_dev/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/path_dev.in/primary/Cargo.toml
rename to tests/snapshots/add/path_dev/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/path_dev.in/primary/src/lib.rs b/tests/snapshots/add/path_dev/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/path_dev.in/primary/src/lib.rs
rename to tests/snapshots/add/path_dev/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/path_dev.out/dependency/Cargo.toml b/tests/snapshots/add/path_dev/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/path_dev.out/dependency/Cargo.toml
rename to tests/snapshots/add/path_dev/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/path_dev.out/primary/Cargo.toml b/tests/snapshots/add/path_dev/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/path_dev.out/primary/Cargo.toml
rename to tests/snapshots/add/path_dev/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/path_dev.stderr b/tests/snapshots/add/path_dev/stderr.log
similarity index 100%
rename from tests/snapshots/add/path_dev.stderr
rename to tests/snapshots/add/path_dev/stderr.log
diff --git a/tests/snapshots/add/path_dev.stdout b/tests/snapshots/add/path_dev/stdout.log
similarity index 100%
rename from tests/snapshots/add/path_dev.stdout
rename to tests/snapshots/add/path_dev/stdout.log
diff --git a/tests/snapshots/add/path_inferred_name.in/dependency/Cargo.toml b/tests/snapshots/add/path_inferred_name/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/path_inferred_name.in/dependency/Cargo.toml
rename to tests/snapshots/add/path_inferred_name/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/path_inferred_name.in/dependency/src/lib.rs b/tests/snapshots/add/path_inferred_name/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/path_inferred_name.in/dependency/src/lib.rs
rename to tests/snapshots/add/path_inferred_name/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/path_inferred_name.in/primary/Cargo.toml b/tests/snapshots/add/path_inferred_name/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/path_inferred_name.in/primary/Cargo.toml
rename to tests/snapshots/add/path_inferred_name/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/path_inferred_name.in/primary/src/lib.rs b/tests/snapshots/add/path_inferred_name/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/path_inferred_name.in/primary/src/lib.rs
rename to tests/snapshots/add/path_inferred_name/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/path_inferred_name.out/dependency/Cargo.toml b/tests/snapshots/add/path_inferred_name/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/path_inferred_name.out/dependency/Cargo.toml
rename to tests/snapshots/add/path_inferred_name/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/path_inferred_name.out/primary/Cargo.toml b/tests/snapshots/add/path_inferred_name/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/path_inferred_name.out/primary/Cargo.toml
rename to tests/snapshots/add/path_inferred_name/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/path_inferred_name.stderr b/tests/snapshots/add/path_inferred_name/stderr.log
similarity index 100%
rename from tests/snapshots/add/path_inferred_name.stderr
rename to tests/snapshots/add/path_inferred_name/stderr.log
diff --git a/tests/snapshots/add/path_inferred_name.stdout b/tests/snapshots/add/path_inferred_name/stdout.log
similarity index 100%
rename from tests/snapshots/add/path_inferred_name.stdout
rename to tests/snapshots/add/path_inferred_name/stdout.log
diff --git a/tests/snapshots/add/path_inferred_name_conflicts_full_feature.in/Cargo.toml b/tests/snapshots/add/path_inferred_name_conflicts_full_feature/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/path_inferred_name_conflicts_full_feature.in/Cargo.toml
rename to tests/snapshots/add/path_inferred_name_conflicts_full_feature/in/Cargo.toml
diff --git a/tests/snapshots/add/path_inferred_name_conflicts_full_feature.in/dependency/Cargo.toml b/tests/snapshots/add/path_inferred_name_conflicts_full_feature/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/path_inferred_name_conflicts_full_feature.in/dependency/Cargo.toml
rename to tests/snapshots/add/path_inferred_name_conflicts_full_feature/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/path_inferred_name_conflicts_full_feature.in/dependency/src/lib.rs b/tests/snapshots/add/path_inferred_name_conflicts_full_feature/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/path_inferred_name_conflicts_full_feature.in/dependency/src/lib.rs
rename to tests/snapshots/add/path_inferred_name_conflicts_full_feature/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/path_inferred_name_conflicts_full_feature.in/optional/Cargo.toml b/tests/snapshots/add/path_inferred_name_conflicts_full_feature/in/optional/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/path_inferred_name_conflicts_full_feature.in/optional/Cargo.toml
rename to tests/snapshots/add/path_inferred_name_conflicts_full_feature/in/optional/Cargo.toml
diff --git a/tests/snapshots/add/path_inferred_name_conflicts_full_feature.in/optional/src/lib.rs b/tests/snapshots/add/path_inferred_name_conflicts_full_feature/in/optional/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/path_inferred_name_conflicts_full_feature.in/optional/src/lib.rs
rename to tests/snapshots/add/path_inferred_name_conflicts_full_feature/in/optional/src/lib.rs
diff --git a/tests/snapshots/add/path_inferred_name_conflicts_full_feature.in/primary/Cargo.toml b/tests/snapshots/add/path_inferred_name_conflicts_full_feature/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/path_inferred_name_conflicts_full_feature.in/primary/Cargo.toml
rename to tests/snapshots/add/path_inferred_name_conflicts_full_feature/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/path_inferred_name_conflicts_full_feature.in/primary/src/lib.rs b/tests/snapshots/add/path_inferred_name_conflicts_full_feature/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/path_inferred_name_conflicts_full_feature.in/primary/src/lib.rs
rename to tests/snapshots/add/path_inferred_name_conflicts_full_feature/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/path_inferred_name_conflicts_full_feature.out/Cargo.toml b/tests/snapshots/add/path_inferred_name_conflicts_full_feature/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/path_inferred_name_conflicts_full_feature.out/Cargo.toml
rename to tests/snapshots/add/path_inferred_name_conflicts_full_feature/out/Cargo.toml
diff --git a/tests/snapshots/add/path_inferred_name_conflicts_full_feature.out/dependency/Cargo.toml b/tests/snapshots/add/path_inferred_name_conflicts_full_feature/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/path_inferred_name_conflicts_full_feature.out/dependency/Cargo.toml
rename to tests/snapshots/add/path_inferred_name_conflicts_full_feature/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/path_inferred_name_conflicts_full_feature.out/primary/Cargo.toml b/tests/snapshots/add/path_inferred_name_conflicts_full_feature/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/path_inferred_name_conflicts_full_feature.out/primary/Cargo.toml
rename to tests/snapshots/add/path_inferred_name_conflicts_full_feature/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/path_inferred_name_conflicts_full_feature.stderr b/tests/snapshots/add/path_inferred_name_conflicts_full_feature/stderr.log
similarity index 100%
rename from tests/snapshots/add/path_inferred_name_conflicts_full_feature.stderr
rename to tests/snapshots/add/path_inferred_name_conflicts_full_feature/stderr.log
diff --git a/tests/snapshots/add/path_inferred_name_conflicts_full_feature.stdout b/tests/snapshots/add/path_inferred_name_conflicts_full_feature/stdout.log
similarity index 100%
rename from tests/snapshots/add/path_inferred_name_conflicts_full_feature.stdout
rename to tests/snapshots/add/path_inferred_name_conflicts_full_feature/stdout.log
diff --git a/tests/snapshots/add/path_normalized_name.in/dependency/Cargo.toml b/tests/snapshots/add/path_normalized_name/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/path_normalized_name.in/dependency/Cargo.toml
rename to tests/snapshots/add/path_normalized_name/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/path_normalized_name.in/dependency/src/lib.rs b/tests/snapshots/add/path_normalized_name/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/path_normalized_name.in/dependency/src/lib.rs
rename to tests/snapshots/add/path_normalized_name/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/path_normalized_name.in/primary/Cargo.toml b/tests/snapshots/add/path_normalized_name/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/path_normalized_name.in/primary/Cargo.toml
rename to tests/snapshots/add/path_normalized_name/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/path_normalized_name.in/primary/src/lib.rs b/tests/snapshots/add/path_normalized_name/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/path_normalized_name.in/primary/src/lib.rs
rename to tests/snapshots/add/path_normalized_name/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/path_normalized_name.out/dependency/Cargo.toml b/tests/snapshots/add/path_normalized_name/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/path_normalized_name.out/dependency/Cargo.toml
rename to tests/snapshots/add/path_normalized_name/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/path_normalized_name.out/primary/Cargo.toml b/tests/snapshots/add/path_normalized_name/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/path_normalized_name.out/primary/Cargo.toml
rename to tests/snapshots/add/path_normalized_name/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/path_normalized_name.stderr b/tests/snapshots/add/path_normalized_name/stderr.log
similarity index 100%
rename from tests/snapshots/add/path_normalized_name.stderr
rename to tests/snapshots/add/path_normalized_name/stderr.log
diff --git a/tests/snapshots/add/path_normalized_name.stdout b/tests/snapshots/add/path_normalized_name/stdout.log
similarity index 100%
rename from tests/snapshots/add/path_normalized_name.stdout
rename to tests/snapshots/add/path_normalized_name/stdout.log
diff --git a/tests/snapshots/add/preserve_sorted.in/Cargo.toml b/tests/snapshots/add/preserve_sorted/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/preserve_sorted.in/Cargo.toml
rename to tests/snapshots/add/preserve_sorted/in/Cargo.toml
diff --git a/tests/snapshots/add/preserve_sorted.in/src/lib.rs b/tests/snapshots/add/preserve_sorted/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/preserve_sorted.in/src/lib.rs
rename to tests/snapshots/add/preserve_sorted/in/src/lib.rs
diff --git a/tests/snapshots/add/preserve_sorted.out/Cargo.toml b/tests/snapshots/add/preserve_sorted/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/preserve_sorted.out/Cargo.toml
rename to tests/snapshots/add/preserve_sorted/out/Cargo.toml
diff --git a/tests/snapshots/add/preserve_sorted.stderr b/tests/snapshots/add/preserve_sorted/stderr.log
similarity index 100%
rename from tests/snapshots/add/preserve_sorted.stderr
rename to tests/snapshots/add/preserve_sorted/stderr.log
diff --git a/tests/snapshots/add/preserve_sorted.stdout b/tests/snapshots/add/preserve_sorted/stdout.log
similarity index 100%
rename from tests/snapshots/add/preserve_sorted.stdout
rename to tests/snapshots/add/preserve_sorted/stdout.log
diff --git a/tests/snapshots/add/preserve_unsorted.in/Cargo.toml b/tests/snapshots/add/preserve_unsorted/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/preserve_unsorted.in/Cargo.toml
rename to tests/snapshots/add/preserve_unsorted/in/Cargo.toml
diff --git a/tests/snapshots/add/preserve_unsorted.in/src/lib.rs b/tests/snapshots/add/preserve_unsorted/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/preserve_unsorted.in/src/lib.rs
rename to tests/snapshots/add/preserve_unsorted/in/src/lib.rs
diff --git a/tests/snapshots/add/preserve_unsorted.out/Cargo.toml b/tests/snapshots/add/preserve_unsorted/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/preserve_unsorted.out/Cargo.toml
rename to tests/snapshots/add/preserve_unsorted/out/Cargo.toml
diff --git a/tests/snapshots/add/preserve_unsorted.stderr b/tests/snapshots/add/preserve_unsorted/stderr.log
similarity index 100%
rename from tests/snapshots/add/preserve_unsorted.stderr
rename to tests/snapshots/add/preserve_unsorted/stderr.log
diff --git a/tests/snapshots/add/preserve_unsorted.stdout b/tests/snapshots/add/preserve_unsorted/stdout.log
similarity index 100%
rename from tests/snapshots/add/preserve_unsorted.stdout
rename to tests/snapshots/add/preserve_unsorted/stdout.log
diff --git a/tests/snapshots/add/quiet.in b/tests/snapshots/add/quiet.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/quiet.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/quiet/in b/tests/snapshots/add/quiet/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/quiet/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/quiet.out/Cargo.toml b/tests/snapshots/add/quiet/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/quiet.out/Cargo.toml
rename to tests/snapshots/add/quiet/out/Cargo.toml
diff --git a/tests/snapshots/add/quiet.stderr b/tests/snapshots/add/quiet/stderr.log
similarity index 100%
rename from tests/snapshots/add/quiet.stderr
rename to tests/snapshots/add/quiet/stderr.log
diff --git a/tests/snapshots/add/quiet.stdout b/tests/snapshots/add/quiet/stdout.log
similarity index 100%
rename from tests/snapshots/add/quiet.stdout
rename to tests/snapshots/add/quiet/stdout.log
diff --git a/tests/snapshots/add/registry.in/Cargo.toml b/tests/snapshots/add/registry/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/registry.in/Cargo.toml
rename to tests/snapshots/add/registry/in/Cargo.toml
diff --git a/tests/snapshots/add/registry.in/src/lib.rs b/tests/snapshots/add/registry/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/registry.in/src/lib.rs
rename to tests/snapshots/add/registry/in/src/lib.rs
diff --git a/tests/snapshots/add/registry.out/Cargo.toml b/tests/snapshots/add/registry/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/registry.out/Cargo.toml
rename to tests/snapshots/add/registry/out/Cargo.toml
diff --git a/tests/snapshots/add/registry.stderr b/tests/snapshots/add/registry/stderr.log
similarity index 100%
rename from tests/snapshots/add/registry.stderr
rename to tests/snapshots/add/registry/stderr.log
diff --git a/tests/snapshots/add/registry.stdout b/tests/snapshots/add/registry/stdout.log
similarity index 100%
rename from tests/snapshots/add/registry.stdout
rename to tests/snapshots/add/registry/stdout.log
diff --git a/tests/snapshots/add/rename.in b/tests/snapshots/add/rename.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/rename.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/rename/in b/tests/snapshots/add/rename/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/rename/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/rename.out/Cargo.toml b/tests/snapshots/add/rename/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/rename.out/Cargo.toml
rename to tests/snapshots/add/rename/out/Cargo.toml
diff --git a/tests/snapshots/add/rename.stderr b/tests/snapshots/add/rename/stderr.log
similarity index 100%
rename from tests/snapshots/add/rename.stderr
rename to tests/snapshots/add/rename/stderr.log
diff --git a/tests/snapshots/add/rename.stdout b/tests/snapshots/add/rename/stdout.log
similarity index 100%
rename from tests/snapshots/add/rename.stdout
rename to tests/snapshots/add/rename/stdout.log
diff --git a/tests/snapshots/add/require_weak.in/Cargo.toml b/tests/snapshots/add/require_weak/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/require_weak.in/Cargo.toml
rename to tests/snapshots/add/require_weak/in/Cargo.toml
diff --git a/tests/snapshots/add/require_weak.in/src/lib.rs b/tests/snapshots/add/require_weak/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/require_weak.in/src/lib.rs
rename to tests/snapshots/add/require_weak/in/src/lib.rs
diff --git a/tests/snapshots/add/require_weak.out/Cargo.toml b/tests/snapshots/add/require_weak/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/require_weak.out/Cargo.toml
rename to tests/snapshots/add/require_weak/out/Cargo.toml
diff --git a/tests/snapshots/add/require_weak.stderr b/tests/snapshots/add/require_weak/stderr.log
similarity index 100%
rename from tests/snapshots/add/require_weak.stderr
rename to tests/snapshots/add/require_weak/stderr.log
diff --git a/tests/snapshots/add/require_weak.stdout b/tests/snapshots/add/require_weak/stdout.log
similarity index 100%
rename from tests/snapshots/add/require_weak.stdout
rename to tests/snapshots/add/require_weak/stdout.log
diff --git a/tests/snapshots/add/target.in b/tests/snapshots/add/target.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/target.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/target/in b/tests/snapshots/add/target/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/target/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/target.out/Cargo.toml b/tests/snapshots/add/target/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/target.out/Cargo.toml
rename to tests/snapshots/add/target/out/Cargo.toml
diff --git a/tests/snapshots/add/target.stderr b/tests/snapshots/add/target/stderr.log
similarity index 100%
rename from tests/snapshots/add/target.stderr
rename to tests/snapshots/add/target/stderr.log
diff --git a/tests/snapshots/add/target.stdout b/tests/snapshots/add/target/stdout.log
similarity index 100%
rename from tests/snapshots/add/target.stdout
rename to tests/snapshots/add/target/stdout.log
diff --git a/tests/snapshots/add/target_cfg.in b/tests/snapshots/add/target_cfg.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/target_cfg.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/target_cfg/in b/tests/snapshots/add/target_cfg/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/target_cfg/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/target_cfg.out/Cargo.toml b/tests/snapshots/add/target_cfg/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/target_cfg.out/Cargo.toml
rename to tests/snapshots/add/target_cfg/out/Cargo.toml
diff --git a/tests/snapshots/add/target_cfg.stderr b/tests/snapshots/add/target_cfg/stderr.log
similarity index 100%
rename from tests/snapshots/add/target_cfg.stderr
rename to tests/snapshots/add/target_cfg/stderr.log
diff --git a/tests/snapshots/add/target_cfg.stdout b/tests/snapshots/add/target_cfg/stdout.log
similarity index 100%
rename from tests/snapshots/add/target_cfg.stdout
rename to tests/snapshots/add/target_cfg/stdout.log
diff --git a/tests/snapshots/add/unknown_inherited_feature.in/Cargo.toml b/tests/snapshots/add/unknown_inherited_feature/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/unknown_inherited_feature.in/Cargo.toml
rename to tests/snapshots/add/unknown_inherited_feature/in/Cargo.toml
diff --git a/tests/snapshots/add/unknown_inherited_feature.in/dependency/Cargo.toml b/tests/snapshots/add/unknown_inherited_feature/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/unknown_inherited_feature.in/dependency/Cargo.toml
rename to tests/snapshots/add/unknown_inherited_feature/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/unknown_inherited_feature.in/dependency/src/lib.rs b/tests/snapshots/add/unknown_inherited_feature/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/unknown_inherited_feature.in/dependency/src/lib.rs
rename to tests/snapshots/add/unknown_inherited_feature/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/unknown_inherited_feature.in/primary/Cargo.toml b/tests/snapshots/add/unknown_inherited_feature/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/unknown_inherited_feature.in/primary/Cargo.toml
rename to tests/snapshots/add/unknown_inherited_feature/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/unknown_inherited_feature.in/primary/src/lib.rs b/tests/snapshots/add/unknown_inherited_feature/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/unknown_inherited_feature.in/primary/src/lib.rs
rename to tests/snapshots/add/unknown_inherited_feature/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/unknown_inherited_feature.out/Cargo.toml b/tests/snapshots/add/unknown_inherited_feature/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/unknown_inherited_feature.out/Cargo.toml
rename to tests/snapshots/add/unknown_inherited_feature/out/Cargo.toml
diff --git a/tests/snapshots/add/unknown_inherited_feature.out/dependency/Cargo.toml b/tests/snapshots/add/unknown_inherited_feature/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/unknown_inherited_feature.out/dependency/Cargo.toml
rename to tests/snapshots/add/unknown_inherited_feature/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/unknown_inherited_feature.out/primary/Cargo.toml b/tests/snapshots/add/unknown_inherited_feature/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/unknown_inherited_feature.out/primary/Cargo.toml
rename to tests/snapshots/add/unknown_inherited_feature/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/unknown_inherited_feature.stderr b/tests/snapshots/add/unknown_inherited_feature/stderr.log
similarity index 100%
rename from tests/snapshots/add/unknown_inherited_feature.stderr
rename to tests/snapshots/add/unknown_inherited_feature/stderr.log
diff --git a/tests/snapshots/add/unknown_inherited_feature.stdout b/tests/snapshots/add/unknown_inherited_feature/stdout.log
similarity index 100%
rename from tests/snapshots/add/unknown_inherited_feature.stdout
rename to tests/snapshots/add/unknown_inherited_feature/stdout.log
diff --git a/tests/snapshots/add/vers.in b/tests/snapshots/add/vers.in
deleted file mode 120000
index 87eae145313..00000000000
--- a/tests/snapshots/add/vers.in
+++ /dev/null
@@ -1 +0,0 @@
-add-basic.in/
\ No newline at end of file
diff --git a/tests/snapshots/add/vers/in b/tests/snapshots/add/vers/in
new file mode 120000
index 00000000000..6c6a27fcfb5
--- /dev/null
+++ b/tests/snapshots/add/vers/in
@@ -0,0 +1 @@
+../add-basic.in
\ No newline at end of file
diff --git a/tests/snapshots/add/vers.out/Cargo.toml b/tests/snapshots/add/vers/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/vers.out/Cargo.toml
rename to tests/snapshots/add/vers/out/Cargo.toml
diff --git a/tests/snapshots/add/vers.stderr b/tests/snapshots/add/vers/stderr.log
similarity index 100%
rename from tests/snapshots/add/vers.stderr
rename to tests/snapshots/add/vers/stderr.log
diff --git a/tests/snapshots/add/vers.stdout b/tests/snapshots/add/vers/stdout.log
similarity index 100%
rename from tests/snapshots/add/vers.stdout
rename to tests/snapshots/add/vers/stdout.log
diff --git a/tests/snapshots/add/workspace_name.in/Cargo.toml b/tests/snapshots/add/workspace_name/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/workspace_name.in/Cargo.toml
rename to tests/snapshots/add/workspace_name/in/Cargo.toml
diff --git a/tests/snapshots/add/workspace_name.in/dependency/Cargo.toml b/tests/snapshots/add/workspace_name/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/workspace_name.in/dependency/Cargo.toml
rename to tests/snapshots/add/workspace_name/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/workspace_name.in/dependency/src/lib.rs b/tests/snapshots/add/workspace_name/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/workspace_name.in/dependency/src/lib.rs
rename to tests/snapshots/add/workspace_name/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/workspace_name.in/primary/Cargo.toml b/tests/snapshots/add/workspace_name/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/workspace_name.in/primary/Cargo.toml
rename to tests/snapshots/add/workspace_name/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/workspace_name.in/primary/src/lib.rs b/tests/snapshots/add/workspace_name/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/workspace_name.in/primary/src/lib.rs
rename to tests/snapshots/add/workspace_name/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/workspace_name.out/Cargo.toml b/tests/snapshots/add/workspace_name/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/workspace_name.out/Cargo.toml
rename to tests/snapshots/add/workspace_name/out/Cargo.toml
diff --git a/tests/snapshots/add/workspace_name.out/dependency/Cargo.toml b/tests/snapshots/add/workspace_name/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/workspace_name.out/dependency/Cargo.toml
rename to tests/snapshots/add/workspace_name/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/workspace_name.out/primary/Cargo.toml b/tests/snapshots/add/workspace_name/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/workspace_name.out/primary/Cargo.toml
rename to tests/snapshots/add/workspace_name/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/workspace_name.stderr b/tests/snapshots/add/workspace_name/stderr.log
similarity index 100%
rename from tests/snapshots/add/workspace_name.stderr
rename to tests/snapshots/add/workspace_name/stderr.log
diff --git a/tests/snapshots/add/workspace_name.stdout b/tests/snapshots/add/workspace_name/stdout.log
similarity index 100%
rename from tests/snapshots/add/workspace_name.stdout
rename to tests/snapshots/add/workspace_name/stdout.log
diff --git a/tests/snapshots/add/workspace_path.in/Cargo.toml b/tests/snapshots/add/workspace_path/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/workspace_path.in/Cargo.toml
rename to tests/snapshots/add/workspace_path/in/Cargo.toml
diff --git a/tests/snapshots/add/workspace_path.in/dependency/Cargo.toml b/tests/snapshots/add/workspace_path/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/workspace_path.in/dependency/Cargo.toml
rename to tests/snapshots/add/workspace_path/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/workspace_path.in/dependency/src/lib.rs b/tests/snapshots/add/workspace_path/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/workspace_path.in/dependency/src/lib.rs
rename to tests/snapshots/add/workspace_path/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/workspace_path.in/primary/Cargo.toml b/tests/snapshots/add/workspace_path/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/workspace_path.in/primary/Cargo.toml
rename to tests/snapshots/add/workspace_path/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/workspace_path.in/primary/src/lib.rs b/tests/snapshots/add/workspace_path/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/workspace_path.in/primary/src/lib.rs
rename to tests/snapshots/add/workspace_path/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/workspace_path.out/Cargo.toml b/tests/snapshots/add/workspace_path/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/workspace_path.out/Cargo.toml
rename to tests/snapshots/add/workspace_path/out/Cargo.toml
diff --git a/tests/snapshots/add/workspace_path.out/dependency/Cargo.toml b/tests/snapshots/add/workspace_path/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/workspace_path.out/dependency/Cargo.toml
rename to tests/snapshots/add/workspace_path/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/workspace_path.out/primary/Cargo.toml b/tests/snapshots/add/workspace_path/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/workspace_path.out/primary/Cargo.toml
rename to tests/snapshots/add/workspace_path/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/workspace_path.stderr b/tests/snapshots/add/workspace_path/stderr.log
similarity index 100%
rename from tests/snapshots/add/workspace_path.stderr
rename to tests/snapshots/add/workspace_path/stderr.log
diff --git a/tests/snapshots/add/workspace_path.stdout b/tests/snapshots/add/workspace_path/stdout.log
similarity index 100%
rename from tests/snapshots/add/workspace_path.stdout
rename to tests/snapshots/add/workspace_path/stdout.log
diff --git a/tests/snapshots/add/workspace_path_dev.in/Cargo.toml b/tests/snapshots/add/workspace_path_dev/in/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/workspace_path_dev.in/Cargo.toml
rename to tests/snapshots/add/workspace_path_dev/in/Cargo.toml
diff --git a/tests/snapshots/add/workspace_path_dev.in/dependency/Cargo.toml b/tests/snapshots/add/workspace_path_dev/in/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/workspace_path_dev.in/dependency/Cargo.toml
rename to tests/snapshots/add/workspace_path_dev/in/dependency/Cargo.toml
diff --git a/tests/snapshots/add/workspace_path_dev.in/dependency/src/lib.rs b/tests/snapshots/add/workspace_path_dev/in/dependency/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/workspace_path_dev.in/dependency/src/lib.rs
rename to tests/snapshots/add/workspace_path_dev/in/dependency/src/lib.rs
diff --git a/tests/snapshots/add/workspace_path_dev.in/primary/Cargo.toml b/tests/snapshots/add/workspace_path_dev/in/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/workspace_path_dev.in/primary/Cargo.toml
rename to tests/snapshots/add/workspace_path_dev/in/primary/Cargo.toml
diff --git a/tests/snapshots/add/workspace_path_dev.in/primary/src/lib.rs b/tests/snapshots/add/workspace_path_dev/in/primary/src/lib.rs
similarity index 100%
rename from tests/snapshots/add/workspace_path_dev.in/primary/src/lib.rs
rename to tests/snapshots/add/workspace_path_dev/in/primary/src/lib.rs
diff --git a/tests/snapshots/add/workspace_path_dev.out/Cargo.toml b/tests/snapshots/add/workspace_path_dev/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/workspace_path_dev.out/Cargo.toml
rename to tests/snapshots/add/workspace_path_dev/out/Cargo.toml
diff --git a/tests/snapshots/add/workspace_path_dev.out/dependency/Cargo.toml b/tests/snapshots/add/workspace_path_dev/out/dependency/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/workspace_path_dev.out/dependency/Cargo.toml
rename to tests/snapshots/add/workspace_path_dev/out/dependency/Cargo.toml
diff --git a/tests/snapshots/add/workspace_path_dev.out/primary/Cargo.toml b/tests/snapshots/add/workspace_path_dev/out/primary/Cargo.toml
similarity index 100%
rename from tests/snapshots/add/workspace_path_dev.out/primary/Cargo.toml
rename to tests/snapshots/add/workspace_path_dev/out/primary/Cargo.toml
diff --git a/tests/snapshots/add/workspace_path_dev.stderr b/tests/snapshots/add/workspace_path_dev/stderr.log
similarity index 100%
rename from tests/snapshots/add/workspace_path_dev.stderr
rename to tests/snapshots/add/workspace_path_dev/stderr.log
diff --git a/tests/snapshots/add/workspace_path_dev.stdout b/tests/snapshots/add/workspace_path_dev/stdout.log
similarity index 100%
rename from tests/snapshots/add/workspace_path_dev.stdout
rename to tests/snapshots/add/workspace_path_dev/stdout.log
diff --git a/tests/snapshots/copy.sh b/tests/snapshots/copy.sh
deleted file mode 100755
index c09d9a3c845..00000000000
--- a/tests/snapshots/copy.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-BEFORE=$1
-AFTER=$2
-if [ -z "${BEFORE}" ] || [ -z "${AFTER}" ]; then
-    echo "Copy a snapshot"
-    echo
-    echo "Run this from the snapshots directory, using the base name for the snapshots"
-    echo
-    echo "Usage: $0 <BEFORE> <AFTER>"
-    exit 1
-fi
-
-IN_LINK=$(readlink $1.in)
-if [ -n "${IN_LINK}" ]; then
-    echo "Linking to '${IN_LINK}'"
-    ln -s ${IN_LINK} $2.in
-elif [ -e "$1.in" ]; then
-    echo "Copying '$1.in'"
-    cp -r $1.in $2.in
-else
-    echo "No '$1.in'"
-fi
-if [ -e "$1.out" ]; then
-    echo "Copying '$1.out'"
-    cp -r $1.out $2.out
-else
-    echo "No '$1.out'"
-fi
-if [ -e "$1.stdout" ]; then
-    echo "Copying '$1.stdout'"
-    cp -r $1.stdout $2.stdout
-else
-    echo "No '$1.stdout'"
-fi
-if [ -e "$1.stderr" ]; then
-    echo "Copying '$1.stderr'"
-    cp -r $1.stderr $2.stderr
-else
-    echo "No '$1.stderr'"
-fi
-git add $2.*
diff --git a/tests/snapshots/init/auto_git.in b/tests/snapshots/init/auto_git.in
deleted file mode 120000
index 10ad175ba3f..00000000000
--- a/tests/snapshots/init/auto_git.in
+++ /dev/null
@@ -1 +0,0 @@
-empty-dir
\ No newline at end of file
diff --git a/tests/snapshots/init/auto_git/in b/tests/snapshots/init/auto_git/in
new file mode 120000
index 00000000000..55a0d0ef92e
--- /dev/null
+++ b/tests/snapshots/init/auto_git/in
@@ -0,0 +1 @@
+../empty-dir
\ No newline at end of file
diff --git a/tests/snapshots/init/auto_git.out/.gitignore b/tests/snapshots/init/auto_git/out/.gitignore
similarity index 100%
rename from tests/snapshots/init/auto_git.out/.gitignore
rename to tests/snapshots/init/auto_git/out/.gitignore
diff --git a/tests/snapshots/init/auto_git.out/Cargo.toml b/tests/snapshots/init/auto_git/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/auto_git.out/Cargo.toml
rename to tests/snapshots/init/auto_git/out/Cargo.toml
diff --git a/tests/snapshots/init/auto_git.out/src/lib.rs b/tests/snapshots/init/auto_git/out/src/lib.rs
similarity index 100%
rename from tests/snapshots/init/auto_git.out/src/lib.rs
rename to tests/snapshots/init/auto_git/out/src/lib.rs
diff --git a/tests/snapshots/init/auto_git.stderr b/tests/snapshots/init/auto_git/stderr.log
similarity index 100%
rename from tests/snapshots/init/auto_git.stderr
rename to tests/snapshots/init/auto_git/stderr.log
diff --git a/tests/snapshots/init/auto_git.stdout b/tests/snapshots/init/auto_git/stdout.log
similarity index 100%
rename from tests/snapshots/init/auto_git.stdout
rename to tests/snapshots/init/auto_git/stdout.log
diff --git a/tests/snapshots/init/bin_already_exists_explicit.in/src/main.rs b/tests/snapshots/init/bin_already_exists_explicit/in/src/main.rs
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_explicit.in/src/main.rs
rename to tests/snapshots/init/bin_already_exists_explicit/in/src/main.rs
diff --git a/tests/snapshots/init/bin_already_exists_explicit.out/Cargo.toml b/tests/snapshots/init/bin_already_exists_explicit/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_explicit.out/Cargo.toml
rename to tests/snapshots/init/bin_already_exists_explicit/out/Cargo.toml
diff --git a/tests/snapshots/init/bin_already_exists_explicit.out/src/main.rs b/tests/snapshots/init/bin_already_exists_explicit/out/src/main.rs
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_explicit.out/src/main.rs
rename to tests/snapshots/init/bin_already_exists_explicit/out/src/main.rs
diff --git a/tests/snapshots/init/bin_already_exists_explicit.stderr b/tests/snapshots/init/bin_already_exists_explicit/stderr.log
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_explicit.stderr
rename to tests/snapshots/init/bin_already_exists_explicit/stderr.log
diff --git a/tests/snapshots/init/bin_already_exists_explicit.stdout b/tests/snapshots/init/bin_already_exists_explicit/stdout.log
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_explicit.stdout
rename to tests/snapshots/init/bin_already_exists_explicit/stdout.log
diff --git a/tests/snapshots/init/bin_already_exists_explicit_nosrc.in/main.rs b/tests/snapshots/init/bin_already_exists_explicit_nosrc/in/main.rs
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_explicit_nosrc.in/main.rs
rename to tests/snapshots/init/bin_already_exists_explicit_nosrc/in/main.rs
diff --git a/tests/snapshots/init/bin_already_exists_explicit_nosrc.out/Cargo.toml b/tests/snapshots/init/bin_already_exists_explicit_nosrc/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_explicit_nosrc.out/Cargo.toml
rename to tests/snapshots/init/bin_already_exists_explicit_nosrc/out/Cargo.toml
diff --git a/tests/snapshots/init/bin_already_exists_explicit_nosrc.out/main.rs b/tests/snapshots/init/bin_already_exists_explicit_nosrc/out/main.rs
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_explicit_nosrc.out/main.rs
rename to tests/snapshots/init/bin_already_exists_explicit_nosrc/out/main.rs
diff --git a/tests/snapshots/init/bin_already_exists_explicit_nosrc.stderr b/tests/snapshots/init/bin_already_exists_explicit_nosrc/stderr.log
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_explicit_nosrc.stderr
rename to tests/snapshots/init/bin_already_exists_explicit_nosrc/stderr.log
diff --git a/tests/snapshots/init/bin_already_exists_explicit_nosrc.stdout b/tests/snapshots/init/bin_already_exists_explicit_nosrc/stdout.log
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_explicit_nosrc.stdout
rename to tests/snapshots/init/bin_already_exists_explicit_nosrc/stdout.log
diff --git a/tests/snapshots/init/bin_already_exists_implicit.in/src/main.rs b/tests/snapshots/init/bin_already_exists_implicit/in/src/main.rs
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_implicit.in/src/main.rs
rename to tests/snapshots/init/bin_already_exists_implicit/in/src/main.rs
diff --git a/tests/snapshots/init/bin_already_exists_implicit.out/Cargo.toml b/tests/snapshots/init/bin_already_exists_implicit/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_implicit.out/Cargo.toml
rename to tests/snapshots/init/bin_already_exists_implicit/out/Cargo.toml
diff --git a/tests/snapshots/init/bin_already_exists_implicit.out/src/main.rs b/tests/snapshots/init/bin_already_exists_implicit/out/src/main.rs
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_implicit.out/src/main.rs
rename to tests/snapshots/init/bin_already_exists_implicit/out/src/main.rs
diff --git a/tests/snapshots/init/bin_already_exists_implicit.stderr b/tests/snapshots/init/bin_already_exists_implicit/stderr.log
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_implicit.stderr
rename to tests/snapshots/init/bin_already_exists_implicit/stderr.log
diff --git a/tests/snapshots/init/bin_already_exists_implicit.stdout b/tests/snapshots/init/bin_already_exists_implicit/stdout.log
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_implicit.stdout
rename to tests/snapshots/init/bin_already_exists_implicit/stdout.log
diff --git a/tests/snapshots/init/bin_already_exists_implicit_namenosrc.in/case.rs b/tests/snapshots/init/bin_already_exists_implicit_namenosrc/in/case.rs
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_implicit_namenosrc.in/case.rs
rename to tests/snapshots/init/bin_already_exists_implicit_namenosrc/in/case.rs
diff --git a/tests/snapshots/init/bin_already_exists_implicit_namenosrc.out/Cargo.toml b/tests/snapshots/init/bin_already_exists_implicit_namenosrc/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_implicit_namenosrc.out/Cargo.toml
rename to tests/snapshots/init/bin_already_exists_implicit_namenosrc/out/Cargo.toml
diff --git a/tests/snapshots/init/bin_already_exists_implicit_namenosrc.out/case.rs b/tests/snapshots/init/bin_already_exists_implicit_namenosrc/out/case.rs
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_implicit_namenosrc.out/case.rs
rename to tests/snapshots/init/bin_already_exists_implicit_namenosrc/out/case.rs
diff --git a/tests/snapshots/init/bin_already_exists_implicit_namenosrc.stderr b/tests/snapshots/init/bin_already_exists_implicit_namenosrc/stderr.log
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_implicit_namenosrc.stderr
rename to tests/snapshots/init/bin_already_exists_implicit_namenosrc/stderr.log
diff --git a/tests/snapshots/init/bin_already_exists_implicit_namenosrc.stdout b/tests/snapshots/init/bin_already_exists_implicit_namenosrc/stdout.log
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_implicit_namenosrc.stdout
rename to tests/snapshots/init/bin_already_exists_implicit_namenosrc/stdout.log
diff --git a/tests/snapshots/init/bin_already_exists_implicit_namesrc.in/src/case.rs b/tests/snapshots/init/bin_already_exists_implicit_namesrc/in/src/case.rs
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_implicit_namesrc.in/src/case.rs
rename to tests/snapshots/init/bin_already_exists_implicit_namesrc/in/src/case.rs
diff --git a/tests/snapshots/init/bin_already_exists_implicit_namesrc.out/Cargo.toml b/tests/snapshots/init/bin_already_exists_implicit_namesrc/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_implicit_namesrc.out/Cargo.toml
rename to tests/snapshots/init/bin_already_exists_implicit_namesrc/out/Cargo.toml
diff --git a/tests/snapshots/init/bin_already_exists_implicit_namesrc.out/src/case.rs b/tests/snapshots/init/bin_already_exists_implicit_namesrc/out/src/case.rs
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_implicit_namesrc.out/src/case.rs
rename to tests/snapshots/init/bin_already_exists_implicit_namesrc/out/src/case.rs
diff --git a/tests/snapshots/init/bin_already_exists_implicit_namesrc.stderr b/tests/snapshots/init/bin_already_exists_implicit_namesrc/stderr.log
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_implicit_namesrc.stderr
rename to tests/snapshots/init/bin_already_exists_implicit_namesrc/stderr.log
diff --git a/tests/snapshots/init/bin_already_exists_implicit_namesrc.stdout b/tests/snapshots/init/bin_already_exists_implicit_namesrc/stdout.log
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_implicit_namesrc.stdout
rename to tests/snapshots/init/bin_already_exists_implicit_namesrc/stdout.log
diff --git a/tests/snapshots/init/bin_already_exists_implicit_nosrc.in/main.rs b/tests/snapshots/init/bin_already_exists_implicit_nosrc/in/main.rs
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_implicit_nosrc.in/main.rs
rename to tests/snapshots/init/bin_already_exists_implicit_nosrc/in/main.rs
diff --git a/tests/snapshots/init/bin_already_exists_implicit_nosrc.out/Cargo.toml b/tests/snapshots/init/bin_already_exists_implicit_nosrc/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_implicit_nosrc.out/Cargo.toml
rename to tests/snapshots/init/bin_already_exists_implicit_nosrc/out/Cargo.toml
diff --git a/tests/snapshots/init/bin_already_exists_implicit_nosrc.out/main.rs b/tests/snapshots/init/bin_already_exists_implicit_nosrc/out/main.rs
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_implicit_nosrc.out/main.rs
rename to tests/snapshots/init/bin_already_exists_implicit_nosrc/out/main.rs
diff --git a/tests/snapshots/init/bin_already_exists_implicit_nosrc.stderr b/tests/snapshots/init/bin_already_exists_implicit_nosrc/stderr.log
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_implicit_nosrc.stderr
rename to tests/snapshots/init/bin_already_exists_implicit_nosrc/stderr.log
diff --git a/tests/snapshots/init/bin_already_exists_implicit_nosrc.stdout b/tests/snapshots/init/bin_already_exists_implicit_nosrc/stdout.log
similarity index 100%
rename from tests/snapshots/init/bin_already_exists_implicit_nosrc.stdout
rename to tests/snapshots/init/bin_already_exists_implicit_nosrc/stdout.log
diff --git a/tests/snapshots/init/both_lib_and_bin.stderr b/tests/snapshots/init/both_lib_and_bin/stderr.log
similarity index 100%
rename from tests/snapshots/init/both_lib_and_bin.stderr
rename to tests/snapshots/init/both_lib_and_bin/stderr.log
diff --git a/tests/snapshots/init/both_lib_and_bin.stdout b/tests/snapshots/init/both_lib_and_bin/stdout.log
similarity index 100%
rename from tests/snapshots/init/both_lib_and_bin.stdout
rename to tests/snapshots/init/both_lib_and_bin/stdout.log
diff --git a/tests/snapshots/init/cant_create_library_when_both_binlib_present.in/case.rs b/tests/snapshots/init/cant_create_library_when_both_binlib_present/in/case.rs
similarity index 100%
rename from tests/snapshots/init/cant_create_library_when_both_binlib_present.in/case.rs
rename to tests/snapshots/init/cant_create_library_when_both_binlib_present/in/case.rs
diff --git a/tests/snapshots/init/cant_create_library_when_both_binlib_present.in/lib.rs b/tests/snapshots/init/cant_create_library_when_both_binlib_present/in/lib.rs
similarity index 100%
rename from tests/snapshots/init/cant_create_library_when_both_binlib_present.in/lib.rs
rename to tests/snapshots/init/cant_create_library_when_both_binlib_present/in/lib.rs
diff --git a/tests/snapshots/init/cant_create_library_when_both_binlib_present.stderr b/tests/snapshots/init/cant_create_library_when_both_binlib_present/stderr.log
similarity index 100%
rename from tests/snapshots/init/cant_create_library_when_both_binlib_present.stderr
rename to tests/snapshots/init/cant_create_library_when_both_binlib_present/stderr.log
diff --git a/tests/snapshots/init/cant_create_library_when_both_binlib_present.stdout b/tests/snapshots/init/cant_create_library_when_both_binlib_present/stdout.log
similarity index 100%
rename from tests/snapshots/init/cant_create_library_when_both_binlib_present.stdout
rename to tests/snapshots/init/cant_create_library_when_both_binlib_present/stdout.log
diff --git a/tests/snapshots/init/confused_by_multiple_lib_files.in/lib.rs b/tests/snapshots/init/confused_by_multiple_lib_files/in/lib.rs
similarity index 100%
rename from tests/snapshots/init/confused_by_multiple_lib_files.in/lib.rs
rename to tests/snapshots/init/confused_by_multiple_lib_files/in/lib.rs
diff --git a/tests/snapshots/init/confused_by_multiple_lib_files.in/src/lib.rs b/tests/snapshots/init/confused_by_multiple_lib_files/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/init/confused_by_multiple_lib_files.in/src/lib.rs
rename to tests/snapshots/init/confused_by_multiple_lib_files/in/src/lib.rs
diff --git a/tests/snapshots/init/confused_by_multiple_lib_files.out/lib.rs b/tests/snapshots/init/confused_by_multiple_lib_files/out/lib.rs
similarity index 100%
rename from tests/snapshots/init/confused_by_multiple_lib_files.out/lib.rs
rename to tests/snapshots/init/confused_by_multiple_lib_files/out/lib.rs
diff --git a/tests/snapshots/init/confused_by_multiple_lib_files.out/src/lib.rs b/tests/snapshots/init/confused_by_multiple_lib_files/out/src/lib.rs
similarity index 100%
rename from tests/snapshots/init/confused_by_multiple_lib_files.out/src/lib.rs
rename to tests/snapshots/init/confused_by_multiple_lib_files/out/src/lib.rs
diff --git a/tests/snapshots/init/confused_by_multiple_lib_files.stderr b/tests/snapshots/init/confused_by_multiple_lib_files/stderr.log
similarity index 100%
rename from tests/snapshots/init/confused_by_multiple_lib_files.stderr
rename to tests/snapshots/init/confused_by_multiple_lib_files/stderr.log
diff --git a/tests/snapshots/init/confused_by_multiple_lib_files.stdout b/tests/snapshots/init/confused_by_multiple_lib_files/stdout.log
similarity index 100%
rename from tests/snapshots/init/confused_by_multiple_lib_files.stdout
rename to tests/snapshots/init/confused_by_multiple_lib_files/stdout.log
diff --git a/tests/snapshots/init/creates_binary_when_both_binlib_present.in/case.rs b/tests/snapshots/init/creates_binary_when_both_binlib_present/in/case.rs
similarity index 100%
rename from tests/snapshots/init/creates_binary_when_both_binlib_present.in/case.rs
rename to tests/snapshots/init/creates_binary_when_both_binlib_present/in/case.rs
diff --git a/tests/snapshots/init/creates_binary_when_both_binlib_present.in/lib.rs b/tests/snapshots/init/creates_binary_when_both_binlib_present/in/lib.rs
similarity index 100%
rename from tests/snapshots/init/creates_binary_when_both_binlib_present.in/lib.rs
rename to tests/snapshots/init/creates_binary_when_both_binlib_present/in/lib.rs
diff --git a/tests/snapshots/init/creates_binary_when_both_binlib_present.out/Cargo.toml b/tests/snapshots/init/creates_binary_when_both_binlib_present/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/creates_binary_when_both_binlib_present.out/Cargo.toml
rename to tests/snapshots/init/creates_binary_when_both_binlib_present/out/Cargo.toml
diff --git a/tests/snapshots/init/creates_binary_when_both_binlib_present.out/case.rs b/tests/snapshots/init/creates_binary_when_both_binlib_present/out/case.rs
similarity index 100%
rename from tests/snapshots/init/creates_binary_when_both_binlib_present.out/case.rs
rename to tests/snapshots/init/creates_binary_when_both_binlib_present/out/case.rs
diff --git a/tests/snapshots/init/creates_binary_when_both_binlib_present.out/lib.rs b/tests/snapshots/init/creates_binary_when_both_binlib_present/out/lib.rs
similarity index 100%
rename from tests/snapshots/init/creates_binary_when_both_binlib_present.out/lib.rs
rename to tests/snapshots/init/creates_binary_when_both_binlib_present/out/lib.rs
diff --git a/tests/snapshots/init/creates_binary_when_both_binlib_present.stderr b/tests/snapshots/init/creates_binary_when_both_binlib_present/stderr.log
similarity index 100%
rename from tests/snapshots/init/creates_binary_when_both_binlib_present.stderr
rename to tests/snapshots/init/creates_binary_when_both_binlib_present/stderr.log
diff --git a/tests/snapshots/init/creates_binary_when_both_binlib_present.stdout b/tests/snapshots/init/creates_binary_when_both_binlib_present/stdout.log
similarity index 100%
rename from tests/snapshots/init/creates_binary_when_both_binlib_present.stdout
rename to tests/snapshots/init/creates_binary_when_both_binlib_present/stdout.log
diff --git a/tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file.in/case.rs b/tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file/in/case.rs
similarity index 100%
rename from tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file.in/case.rs
rename to tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file/in/case.rs
diff --git a/tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file.out/Cargo.toml b/tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file.out/Cargo.toml
rename to tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file/out/Cargo.toml
diff --git a/tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file.out/case.rs b/tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file/out/case.rs
similarity index 100%
rename from tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file.out/case.rs
rename to tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file/out/case.rs
diff --git a/tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file.stderr b/tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file/stderr.log
similarity index 100%
rename from tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file.stderr
rename to tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file/stderr.log
diff --git a/tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file.stdout b/tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file/stdout.log
similarity index 100%
rename from tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file.stdout
rename to tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file/stdout.log
diff --git a/tests/snapshots/init/creates_library_when_instructed_and_has_bin_file.in/case.rs b/tests/snapshots/init/creates_library_when_instructed_and_has_bin_file/in/case.rs
similarity index 100%
rename from tests/snapshots/init/creates_library_when_instructed_and_has_bin_file.in/case.rs
rename to tests/snapshots/init/creates_library_when_instructed_and_has_bin_file/in/case.rs
diff --git a/tests/snapshots/init/creates_library_when_instructed_and_has_bin_file.out/Cargo.toml b/tests/snapshots/init/creates_library_when_instructed_and_has_bin_file/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/creates_library_when_instructed_and_has_bin_file.out/Cargo.toml
rename to tests/snapshots/init/creates_library_when_instructed_and_has_bin_file/out/Cargo.toml
diff --git a/tests/snapshots/init/creates_library_when_instructed_and_has_bin_file.out/case.rs b/tests/snapshots/init/creates_library_when_instructed_and_has_bin_file/out/case.rs
similarity index 100%
rename from tests/snapshots/init/creates_library_when_instructed_and_has_bin_file.out/case.rs
rename to tests/snapshots/init/creates_library_when_instructed_and_has_bin_file/out/case.rs
diff --git a/tests/snapshots/init/creates_library_when_instructed_and_has_bin_file.stderr b/tests/snapshots/init/creates_library_when_instructed_and_has_bin_file/stderr.log
similarity index 100%
rename from tests/snapshots/init/creates_library_when_instructed_and_has_bin_file.stderr
rename to tests/snapshots/init/creates_library_when_instructed_and_has_bin_file/stderr.log
diff --git a/tests/snapshots/init/creates_library_when_instructed_and_has_bin_file.stdout b/tests/snapshots/init/creates_library_when_instructed_and_has_bin_file/stdout.log
similarity index 100%
rename from tests/snapshots/init/creates_library_when_instructed_and_has_bin_file.stdout
rename to tests/snapshots/init/creates_library_when_instructed_and_has_bin_file/stdout.log
diff --git a/tests/snapshots/init/explicit_bin_with_git.in b/tests/snapshots/init/explicit_bin_with_git.in
deleted file mode 120000
index 10ad175ba3f..00000000000
--- a/tests/snapshots/init/explicit_bin_with_git.in
+++ /dev/null
@@ -1 +0,0 @@
-empty-dir
\ No newline at end of file
diff --git a/tests/snapshots/init/explicit_bin_with_git/in b/tests/snapshots/init/explicit_bin_with_git/in
new file mode 120000
index 00000000000..55a0d0ef92e
--- /dev/null
+++ b/tests/snapshots/init/explicit_bin_with_git/in
@@ -0,0 +1 @@
+../empty-dir
\ No newline at end of file
diff --git a/tests/snapshots/init/explicit_bin_with_git.out/.gitignore b/tests/snapshots/init/explicit_bin_with_git/out/.gitignore
similarity index 100%
rename from tests/snapshots/init/explicit_bin_with_git.out/.gitignore
rename to tests/snapshots/init/explicit_bin_with_git/out/.gitignore
diff --git a/tests/snapshots/init/explicit_bin_with_git.out/Cargo.toml b/tests/snapshots/init/explicit_bin_with_git/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/explicit_bin_with_git.out/Cargo.toml
rename to tests/snapshots/init/explicit_bin_with_git/out/Cargo.toml
diff --git a/tests/snapshots/init/explicit_bin_with_git.out/src/main.rs b/tests/snapshots/init/explicit_bin_with_git/out/src/main.rs
similarity index 100%
rename from tests/snapshots/init/explicit_bin_with_git.out/src/main.rs
rename to tests/snapshots/init/explicit_bin_with_git/out/src/main.rs
diff --git a/tests/snapshots/init/explicit_bin_with_git.stderr b/tests/snapshots/init/explicit_bin_with_git/stderr.log
similarity index 100%
rename from tests/snapshots/init/explicit_bin_with_git.stderr
rename to tests/snapshots/init/explicit_bin_with_git/stderr.log
diff --git a/tests/snapshots/init/explicit_bin_with_git.stdout b/tests/snapshots/init/explicit_bin_with_git/stdout.log
similarity index 100%
rename from tests/snapshots/init/explicit_bin_with_git.stdout
rename to tests/snapshots/init/explicit_bin_with_git/stdout.log
diff --git a/tests/snapshots/init/formats_source.in/rustfmt.toml b/tests/snapshots/init/formats_source/in/rustfmt.toml
similarity index 100%
rename from tests/snapshots/init/formats_source.in/rustfmt.toml
rename to tests/snapshots/init/formats_source/in/rustfmt.toml
diff --git a/tests/snapshots/init/formats_source.out/Cargo.toml b/tests/snapshots/init/formats_source/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/formats_source.out/Cargo.toml
rename to tests/snapshots/init/formats_source/out/Cargo.toml
diff --git a/tests/snapshots/init/formats_source.out/rustfmt.toml b/tests/snapshots/init/formats_source/out/rustfmt.toml
similarity index 100%
rename from tests/snapshots/init/formats_source.out/rustfmt.toml
rename to tests/snapshots/init/formats_source/out/rustfmt.toml
diff --git a/tests/snapshots/init/formats_source.out/src/lib.rs b/tests/snapshots/init/formats_source/out/src/lib.rs
similarity index 100%
rename from tests/snapshots/init/formats_source.out/src/lib.rs
rename to tests/snapshots/init/formats_source/out/src/lib.rs
diff --git a/tests/snapshots/init/formats_source.stderr b/tests/snapshots/init/formats_source/stderr.log
similarity index 100%
rename from tests/snapshots/init/formats_source.stderr
rename to tests/snapshots/init/formats_source/stderr.log
diff --git a/tests/snapshots/init/formats_source.stdout b/tests/snapshots/init/formats_source/stdout.log
similarity index 100%
rename from tests/snapshots/init/formats_source.stdout
rename to tests/snapshots/init/formats_source/stdout.log
diff --git a/tests/snapshots/init/fossil_autodetect.in/.fossil/.keep b/tests/snapshots/init/fossil_autodetect/in/.fossil/.keep
similarity index 100%
rename from tests/snapshots/init/fossil_autodetect.in/.fossil/.keep
rename to tests/snapshots/init/fossil_autodetect/in/.fossil/.keep
diff --git a/tests/snapshots/init/fossil_autodetect.out/.fossil-settings/clean-glob b/tests/snapshots/init/fossil_autodetect/out/.fossil-settings/clean-glob
similarity index 100%
rename from tests/snapshots/init/fossil_autodetect.out/.fossil-settings/clean-glob
rename to tests/snapshots/init/fossil_autodetect/out/.fossil-settings/clean-glob
diff --git a/tests/snapshots/init/fossil_autodetect.out/.fossil-settings/ignore-glob b/tests/snapshots/init/fossil_autodetect/out/.fossil-settings/ignore-glob
similarity index 100%
rename from tests/snapshots/init/fossil_autodetect.out/.fossil-settings/ignore-glob
rename to tests/snapshots/init/fossil_autodetect/out/.fossil-settings/ignore-glob
diff --git a/tests/snapshots/init/fossil_autodetect.out/Cargo.toml b/tests/snapshots/init/fossil_autodetect/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/fossil_autodetect.out/Cargo.toml
rename to tests/snapshots/init/fossil_autodetect/out/Cargo.toml
diff --git a/tests/snapshots/init/fossil_autodetect.out/src/lib.rs b/tests/snapshots/init/fossil_autodetect/out/src/lib.rs
similarity index 100%
rename from tests/snapshots/init/fossil_autodetect.out/src/lib.rs
rename to tests/snapshots/init/fossil_autodetect/out/src/lib.rs
diff --git a/tests/snapshots/init/fossil_autodetect.stderr b/tests/snapshots/init/fossil_autodetect/stderr.log
similarity index 100%
rename from tests/snapshots/init/fossil_autodetect.stderr
rename to tests/snapshots/init/fossil_autodetect/stderr.log
diff --git a/tests/snapshots/init/fossil_autodetect.stdout b/tests/snapshots/init/fossil_autodetect/stdout.log
similarity index 100%
rename from tests/snapshots/init/fossil_autodetect.stdout
rename to tests/snapshots/init/fossil_autodetect/stdout.log
diff --git a/tests/snapshots/init/git_autodetect.out/.gitignore b/tests/snapshots/init/git_autodetect/out/.gitignore
similarity index 100%
rename from tests/snapshots/init/git_autodetect.out/.gitignore
rename to tests/snapshots/init/git_autodetect/out/.gitignore
diff --git a/tests/snapshots/init/git_autodetect.out/Cargo.toml b/tests/snapshots/init/git_autodetect/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/git_autodetect.out/Cargo.toml
rename to tests/snapshots/init/git_autodetect/out/Cargo.toml
diff --git a/tests/snapshots/init/git_autodetect.out/src/lib.rs b/tests/snapshots/init/git_autodetect/out/src/lib.rs
similarity index 100%
rename from tests/snapshots/init/git_autodetect.out/src/lib.rs
rename to tests/snapshots/init/git_autodetect/out/src/lib.rs
diff --git a/tests/snapshots/init/git_autodetect.stderr b/tests/snapshots/init/git_autodetect/stderr.log
similarity index 100%
rename from tests/snapshots/init/git_autodetect.stderr
rename to tests/snapshots/init/git_autodetect/stderr.log
diff --git a/tests/snapshots/init/git_autodetect.stdout b/tests/snapshots/init/git_autodetect/stdout.log
similarity index 100%
rename from tests/snapshots/init/git_autodetect.stdout
rename to tests/snapshots/init/git_autodetect/stdout.log
diff --git a/tests/snapshots/init/git_ignore_exists_no_conflicting_entries.in/.gitignore b/tests/snapshots/init/git_ignore_exists_no_conflicting_entries/in/.gitignore
similarity index 100%
rename from tests/snapshots/init/git_ignore_exists_no_conflicting_entries.in/.gitignore
rename to tests/snapshots/init/git_ignore_exists_no_conflicting_entries/in/.gitignore
diff --git a/tests/snapshots/init/git_ignore_exists_no_conflicting_entries.out/.gitignore b/tests/snapshots/init/git_ignore_exists_no_conflicting_entries/out/.gitignore
similarity index 100%
rename from tests/snapshots/init/git_ignore_exists_no_conflicting_entries.out/.gitignore
rename to tests/snapshots/init/git_ignore_exists_no_conflicting_entries/out/.gitignore
diff --git a/tests/snapshots/init/git_ignore_exists_no_conflicting_entries.out/Cargo.toml b/tests/snapshots/init/git_ignore_exists_no_conflicting_entries/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/git_ignore_exists_no_conflicting_entries.out/Cargo.toml
rename to tests/snapshots/init/git_ignore_exists_no_conflicting_entries/out/Cargo.toml
diff --git a/tests/snapshots/init/git_ignore_exists_no_conflicting_entries.out/src/lib.rs b/tests/snapshots/init/git_ignore_exists_no_conflicting_entries/out/src/lib.rs
similarity index 100%
rename from tests/snapshots/init/git_ignore_exists_no_conflicting_entries.out/src/lib.rs
rename to tests/snapshots/init/git_ignore_exists_no_conflicting_entries/out/src/lib.rs
diff --git a/tests/snapshots/init/git_ignore_exists_no_conflicting_entries.stderr b/tests/snapshots/init/git_ignore_exists_no_conflicting_entries/stderr.log
similarity index 100%
rename from tests/snapshots/init/git_ignore_exists_no_conflicting_entries.stderr
rename to tests/snapshots/init/git_ignore_exists_no_conflicting_entries/stderr.log
diff --git a/tests/snapshots/init/git_ignore_exists_no_conflicting_entries.stdout b/tests/snapshots/init/git_ignore_exists_no_conflicting_entries/stdout.log
similarity index 100%
rename from tests/snapshots/init/git_ignore_exists_no_conflicting_entries.stdout
rename to tests/snapshots/init/git_ignore_exists_no_conflicting_entries/stdout.log
diff --git a/tests/snapshots/init/ignores_failure_to_format_source.in/rustfmt.toml b/tests/snapshots/init/ignores_failure_to_format_source/in/rustfmt.toml
similarity index 100%
rename from tests/snapshots/init/ignores_failure_to_format_source.in/rustfmt.toml
rename to tests/snapshots/init/ignores_failure_to_format_source/in/rustfmt.toml
diff --git a/tests/snapshots/init/ignores_failure_to_format_source.out/Cargo.toml b/tests/snapshots/init/ignores_failure_to_format_source/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/ignores_failure_to_format_source.out/Cargo.toml
rename to tests/snapshots/init/ignores_failure_to_format_source/out/Cargo.toml
diff --git a/tests/snapshots/init/ignores_failure_to_format_source.out/rustfmt.toml b/tests/snapshots/init/ignores_failure_to_format_source/out/rustfmt.toml
similarity index 100%
rename from tests/snapshots/init/ignores_failure_to_format_source.out/rustfmt.toml
rename to tests/snapshots/init/ignores_failure_to_format_source/out/rustfmt.toml
diff --git a/tests/snapshots/init/ignores_failure_to_format_source.out/src/lib.rs b/tests/snapshots/init/ignores_failure_to_format_source/out/src/lib.rs
similarity index 100%
rename from tests/snapshots/init/ignores_failure_to_format_source.out/src/lib.rs
rename to tests/snapshots/init/ignores_failure_to_format_source/out/src/lib.rs
diff --git a/tests/snapshots/init/ignores_failure_to_format_source.stderr b/tests/snapshots/init/ignores_failure_to_format_source/stderr.log
similarity index 100%
rename from tests/snapshots/init/ignores_failure_to_format_source.stderr
rename to tests/snapshots/init/ignores_failure_to_format_source/stderr.log
diff --git a/tests/snapshots/init/ignores_failure_to_format_source.stdout b/tests/snapshots/init/ignores_failure_to_format_source/stdout.log
similarity index 100%
rename from tests/snapshots/init/ignores_failure_to_format_source.stdout
rename to tests/snapshots/init/ignores_failure_to_format_source/stdout.log
diff --git a/tests/snapshots/init/implicit_bin_with_git.stderr b/tests/snapshots/init/implicit_bin_with_git/stderr.log
similarity index 100%
rename from tests/snapshots/init/implicit_bin_with_git.stderr
rename to tests/snapshots/init/implicit_bin_with_git/stderr.log
diff --git a/tests/snapshots/init/implicit_bin_with_git.stdout b/tests/snapshots/init/implicit_bin_with_git/stdout.log
similarity index 100%
rename from tests/snapshots/init/implicit_bin_with_git.stdout
rename to tests/snapshots/init/implicit_bin_with_git/stdout.log
diff --git a/tests/snapshots/init/inferred_bin_with_git.in/main.rs b/tests/snapshots/init/inferred_bin_with_git/in/main.rs
similarity index 100%
rename from tests/snapshots/init/inferred_bin_with_git.in/main.rs
rename to tests/snapshots/init/inferred_bin_with_git/in/main.rs
diff --git a/tests/snapshots/init/inferred_bin_with_git.out/.gitignore b/tests/snapshots/init/inferred_bin_with_git/out/.gitignore
similarity index 100%
rename from tests/snapshots/init/inferred_bin_with_git.out/.gitignore
rename to tests/snapshots/init/inferred_bin_with_git/out/.gitignore
diff --git a/tests/snapshots/init/inferred_bin_with_git.out/Cargo.toml b/tests/snapshots/init/inferred_bin_with_git/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/inferred_bin_with_git.out/Cargo.toml
rename to tests/snapshots/init/inferred_bin_with_git/out/Cargo.toml
diff --git a/tests/snapshots/init/inferred_bin_with_git.out/main.rs b/tests/snapshots/init/inferred_bin_with_git/out/main.rs
similarity index 100%
rename from tests/snapshots/init/inferred_bin_with_git.out/main.rs
rename to tests/snapshots/init/inferred_bin_with_git/out/main.rs
diff --git a/tests/snapshots/init/inferred_bin_with_git.stderr b/tests/snapshots/init/inferred_bin_with_git/stderr.log
similarity index 100%
rename from tests/snapshots/init/inferred_bin_with_git.stderr
rename to tests/snapshots/init/inferred_bin_with_git/stderr.log
diff --git a/tests/snapshots/init/inferred_bin_with_git.stdout b/tests/snapshots/init/inferred_bin_with_git/stdout.log
similarity index 100%
rename from tests/snapshots/init/inferred_bin_with_git.stdout
rename to tests/snapshots/init/inferred_bin_with_git/stdout.log
diff --git a/tests/snapshots/init/inferred_lib_with_git.in/lib.rs b/tests/snapshots/init/inferred_lib_with_git/in/lib.rs
similarity index 100%
rename from tests/snapshots/init/inferred_lib_with_git.in/lib.rs
rename to tests/snapshots/init/inferred_lib_with_git/in/lib.rs
diff --git a/tests/snapshots/init/inferred_lib_with_git.out/.gitignore b/tests/snapshots/init/inferred_lib_with_git/out/.gitignore
similarity index 100%
rename from tests/snapshots/init/inferred_lib_with_git.out/.gitignore
rename to tests/snapshots/init/inferred_lib_with_git/out/.gitignore
diff --git a/tests/snapshots/init/inferred_lib_with_git.out/Cargo.toml b/tests/snapshots/init/inferred_lib_with_git/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/inferred_lib_with_git.out/Cargo.toml
rename to tests/snapshots/init/inferred_lib_with_git/out/Cargo.toml
diff --git a/tests/snapshots/init/inferred_lib_with_git.out/lib.rs b/tests/snapshots/init/inferred_lib_with_git/out/lib.rs
similarity index 100%
rename from tests/snapshots/init/inferred_lib_with_git.out/lib.rs
rename to tests/snapshots/init/inferred_lib_with_git/out/lib.rs
diff --git a/tests/snapshots/init/inferred_lib_with_git.stderr b/tests/snapshots/init/inferred_lib_with_git/stderr.log
similarity index 100%
rename from tests/snapshots/init/inferred_lib_with_git.stderr
rename to tests/snapshots/init/inferred_lib_with_git/stderr.log
diff --git a/tests/snapshots/init/inferred_lib_with_git.stdout b/tests/snapshots/init/inferred_lib_with_git/stdout.log
similarity index 100%
rename from tests/snapshots/init/inferred_lib_with_git.stdout
rename to tests/snapshots/init/inferred_lib_with_git/stdout.log
diff --git a/tests/snapshots/init/invalid_dir_name.stderr b/tests/snapshots/init/invalid_dir_name/stderr.log
similarity index 100%
rename from tests/snapshots/init/invalid_dir_name.stderr
rename to tests/snapshots/init/invalid_dir_name/stderr.log
diff --git a/tests/snapshots/init/invalid_dir_name.stdout b/tests/snapshots/init/invalid_dir_name/stdout.log
similarity index 100%
rename from tests/snapshots/init/invalid_dir_name.stdout
rename to tests/snapshots/init/invalid_dir_name/stdout.log
diff --git a/tests/snapshots/init/lib_already_exists_nosrc.in/lib.rs b/tests/snapshots/init/lib_already_exists_nosrc/in/lib.rs
similarity index 100%
rename from tests/snapshots/init/lib_already_exists_nosrc.in/lib.rs
rename to tests/snapshots/init/lib_already_exists_nosrc/in/lib.rs
diff --git a/tests/snapshots/init/lib_already_exists_nosrc.out/Cargo.toml b/tests/snapshots/init/lib_already_exists_nosrc/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/lib_already_exists_nosrc.out/Cargo.toml
rename to tests/snapshots/init/lib_already_exists_nosrc/out/Cargo.toml
diff --git a/tests/snapshots/init/lib_already_exists_nosrc.out/lib.rs b/tests/snapshots/init/lib_already_exists_nosrc/out/lib.rs
similarity index 100%
rename from tests/snapshots/init/lib_already_exists_nosrc.out/lib.rs
rename to tests/snapshots/init/lib_already_exists_nosrc/out/lib.rs
diff --git a/tests/snapshots/init/lib_already_exists_nosrc.stderr b/tests/snapshots/init/lib_already_exists_nosrc/stderr.log
similarity index 100%
rename from tests/snapshots/init/lib_already_exists_nosrc.stderr
rename to tests/snapshots/init/lib_already_exists_nosrc/stderr.log
diff --git a/tests/snapshots/init/lib_already_exists_nosrc.stdout b/tests/snapshots/init/lib_already_exists_nosrc/stdout.log
similarity index 100%
rename from tests/snapshots/init/lib_already_exists_nosrc.stdout
rename to tests/snapshots/init/lib_already_exists_nosrc/stdout.log
diff --git a/tests/snapshots/init/lib_already_exists_src.in/src/lib.rs b/tests/snapshots/init/lib_already_exists_src/in/src/lib.rs
similarity index 100%
rename from tests/snapshots/init/lib_already_exists_src.in/src/lib.rs
rename to tests/snapshots/init/lib_already_exists_src/in/src/lib.rs
diff --git a/tests/snapshots/init/lib_already_exists_src.out/Cargo.toml b/tests/snapshots/init/lib_already_exists_src/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/lib_already_exists_src.out/Cargo.toml
rename to tests/snapshots/init/lib_already_exists_src/out/Cargo.toml
diff --git a/tests/snapshots/init/lib_already_exists_src.out/src/lib.rs b/tests/snapshots/init/lib_already_exists_src/out/src/lib.rs
similarity index 100%
rename from tests/snapshots/init/lib_already_exists_src.out/src/lib.rs
rename to tests/snapshots/init/lib_already_exists_src/out/src/lib.rs
diff --git a/tests/snapshots/init/lib_already_exists_src.stderr b/tests/snapshots/init/lib_already_exists_src/stderr.log
similarity index 100%
rename from tests/snapshots/init/lib_already_exists_src.stderr
rename to tests/snapshots/init/lib_already_exists_src/stderr.log
diff --git a/tests/snapshots/init/lib_already_exists_src.stdout b/tests/snapshots/init/lib_already_exists_src/stdout.log
similarity index 100%
rename from tests/snapshots/init/lib_already_exists_src.stdout
rename to tests/snapshots/init/lib_already_exists_src/stdout.log
diff --git a/tests/snapshots/init/mercurial_autodetect.in/.hg/.keep b/tests/snapshots/init/mercurial_autodetect/in/.hg/.keep
similarity index 100%
rename from tests/snapshots/init/mercurial_autodetect.in/.hg/.keep
rename to tests/snapshots/init/mercurial_autodetect/in/.hg/.keep
diff --git a/tests/snapshots/init/mercurial_autodetect.out/.hgignore b/tests/snapshots/init/mercurial_autodetect/out/.hgignore
similarity index 100%
rename from tests/snapshots/init/mercurial_autodetect.out/.hgignore
rename to tests/snapshots/init/mercurial_autodetect/out/.hgignore
diff --git a/tests/snapshots/init/mercurial_autodetect.out/Cargo.toml b/tests/snapshots/init/mercurial_autodetect/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/mercurial_autodetect.out/Cargo.toml
rename to tests/snapshots/init/mercurial_autodetect/out/Cargo.toml
diff --git a/tests/snapshots/init/mercurial_autodetect.out/src/lib.rs b/tests/snapshots/init/mercurial_autodetect/out/src/lib.rs
similarity index 100%
rename from tests/snapshots/init/mercurial_autodetect.out/src/lib.rs
rename to tests/snapshots/init/mercurial_autodetect/out/src/lib.rs
diff --git a/tests/snapshots/init/mercurial_autodetect.stderr b/tests/snapshots/init/mercurial_autodetect/stderr.log
similarity index 100%
rename from tests/snapshots/init/mercurial_autodetect.stderr
rename to tests/snapshots/init/mercurial_autodetect/stderr.log
diff --git a/tests/snapshots/init/mercurial_autodetect.stdout b/tests/snapshots/init/mercurial_autodetect/stdout.log
similarity index 100%
rename from tests/snapshots/init/mercurial_autodetect.stdout
rename to tests/snapshots/init/mercurial_autodetect/stdout.log
diff --git a/tests/snapshots/init/multibin_project_name_clash.in/case.rs b/tests/snapshots/init/multibin_project_name_clash/in/case.rs
similarity index 100%
rename from tests/snapshots/init/multibin_project_name_clash.in/case.rs
rename to tests/snapshots/init/multibin_project_name_clash/in/case.rs
diff --git a/tests/snapshots/init/multibin_project_name_clash.in/main.rs b/tests/snapshots/init/multibin_project_name_clash/in/main.rs
similarity index 100%
rename from tests/snapshots/init/multibin_project_name_clash.in/main.rs
rename to tests/snapshots/init/multibin_project_name_clash/in/main.rs
diff --git a/tests/snapshots/init/multibin_project_name_clash.out/case.rs b/tests/snapshots/init/multibin_project_name_clash/out/case.rs
similarity index 100%
rename from tests/snapshots/init/multibin_project_name_clash.out/case.rs
rename to tests/snapshots/init/multibin_project_name_clash/out/case.rs
diff --git a/tests/snapshots/init/multibin_project_name_clash.out/main.rs b/tests/snapshots/init/multibin_project_name_clash/out/main.rs
similarity index 100%
rename from tests/snapshots/init/multibin_project_name_clash.out/main.rs
rename to tests/snapshots/init/multibin_project_name_clash/out/main.rs
diff --git a/tests/snapshots/init/multibin_project_name_clash.stderr b/tests/snapshots/init/multibin_project_name_clash/stderr.log
similarity index 100%
rename from tests/snapshots/init/multibin_project_name_clash.stderr
rename to tests/snapshots/init/multibin_project_name_clash/stderr.log
diff --git a/tests/snapshots/init/multibin_project_name_clash.stdout b/tests/snapshots/init/multibin_project_name_clash/stdout.log
similarity index 100%
rename from tests/snapshots/init/multibin_project_name_clash.stdout
rename to tests/snapshots/init/multibin_project_name_clash/stdout.log
diff --git a/tests/snapshots/init/no_filename.stderr b/tests/snapshots/init/no_filename/stderr.log
similarity index 100%
rename from tests/snapshots/init/no_filename.stderr
rename to tests/snapshots/init/no_filename/stderr.log
diff --git a/tests/snapshots/init/no_filename.stdout b/tests/snapshots/init/no_filename/stdout.log
similarity index 100%
rename from tests/snapshots/init/no_filename.stdout
rename to tests/snapshots/init/no_filename/stdout.log
diff --git a/tests/snapshots/init/pijul_autodetect.in/.pijul/.keep b/tests/snapshots/init/pijul_autodetect/in/.pijul/.keep
similarity index 100%
rename from tests/snapshots/init/pijul_autodetect.in/.pijul/.keep
rename to tests/snapshots/init/pijul_autodetect/in/.pijul/.keep
diff --git a/tests/snapshots/init/pijul_autodetect.out/.ignore b/tests/snapshots/init/pijul_autodetect/out/.ignore
similarity index 100%
rename from tests/snapshots/init/pijul_autodetect.out/.ignore
rename to tests/snapshots/init/pijul_autodetect/out/.ignore
diff --git a/tests/snapshots/init/pijul_autodetect.out/Cargo.toml b/tests/snapshots/init/pijul_autodetect/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/pijul_autodetect.out/Cargo.toml
rename to tests/snapshots/init/pijul_autodetect/out/Cargo.toml
diff --git a/tests/snapshots/init/pijul_autodetect.out/src/lib.rs b/tests/snapshots/init/pijul_autodetect/out/src/lib.rs
similarity index 100%
rename from tests/snapshots/init/pijul_autodetect.out/src/lib.rs
rename to tests/snapshots/init/pijul_autodetect/out/src/lib.rs
diff --git a/tests/snapshots/init/pijul_autodetect.stderr b/tests/snapshots/init/pijul_autodetect/stderr.log
similarity index 100%
rename from tests/snapshots/init/pijul_autodetect.stderr
rename to tests/snapshots/init/pijul_autodetect/stderr.log
diff --git a/tests/snapshots/init/pijul_autodetect.stdout b/tests/snapshots/init/pijul_autodetect/stdout.log
similarity index 100%
rename from tests/snapshots/init/pijul_autodetect.stdout
rename to tests/snapshots/init/pijul_autodetect/stdout.log
diff --git a/tests/snapshots/init/reserved_name.stderr b/tests/snapshots/init/reserved_name/stderr.log
similarity index 100%
rename from tests/snapshots/init/reserved_name.stderr
rename to tests/snapshots/init/reserved_name/stderr.log
diff --git a/tests/snapshots/init/reserved_name.stdout b/tests/snapshots/init/reserved_name/stdout.log
similarity index 100%
rename from tests/snapshots/init/reserved_name.stdout
rename to tests/snapshots/init/reserved_name/stdout.log
diff --git a/tests/snapshots/init/simple_bin.in b/tests/snapshots/init/simple_bin.in
deleted file mode 120000
index 10ad175ba3f..00000000000
--- a/tests/snapshots/init/simple_bin.in
+++ /dev/null
@@ -1 +0,0 @@
-empty-dir
\ No newline at end of file
diff --git a/tests/snapshots/init/simple_bin/in b/tests/snapshots/init/simple_bin/in
new file mode 120000
index 00000000000..55a0d0ef92e
--- /dev/null
+++ b/tests/snapshots/init/simple_bin/in
@@ -0,0 +1 @@
+../empty-dir
\ No newline at end of file
diff --git a/tests/snapshots/init/simple_bin.out/Cargo.toml b/tests/snapshots/init/simple_bin/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/simple_bin.out/Cargo.toml
rename to tests/snapshots/init/simple_bin/out/Cargo.toml
diff --git a/tests/snapshots/init/simple_bin.out/src/main.rs b/tests/snapshots/init/simple_bin/out/src/main.rs
similarity index 100%
rename from tests/snapshots/init/simple_bin.out/src/main.rs
rename to tests/snapshots/init/simple_bin/out/src/main.rs
diff --git a/tests/snapshots/init/simple_bin.stderr b/tests/snapshots/init/simple_bin/stderr.log
similarity index 100%
rename from tests/snapshots/init/simple_bin.stderr
rename to tests/snapshots/init/simple_bin/stderr.log
diff --git a/tests/snapshots/init/simple_bin.stdout b/tests/snapshots/init/simple_bin/stdout.log
similarity index 100%
rename from tests/snapshots/init/simple_bin.stdout
rename to tests/snapshots/init/simple_bin/stdout.log
diff --git a/tests/snapshots/init/simple_git.in b/tests/snapshots/init/simple_git.in
deleted file mode 120000
index 10ad175ba3f..00000000000
--- a/tests/snapshots/init/simple_git.in
+++ /dev/null
@@ -1 +0,0 @@
-empty-dir
\ No newline at end of file
diff --git a/tests/snapshots/init/simple_git/in b/tests/snapshots/init/simple_git/in
new file mode 120000
index 00000000000..55a0d0ef92e
--- /dev/null
+++ b/tests/snapshots/init/simple_git/in
@@ -0,0 +1 @@
+../empty-dir
\ No newline at end of file
diff --git a/tests/snapshots/init/simple_git.out/.gitignore b/tests/snapshots/init/simple_git/out/.gitignore
similarity index 100%
rename from tests/snapshots/init/simple_git.out/.gitignore
rename to tests/snapshots/init/simple_git/out/.gitignore
diff --git a/tests/snapshots/init/simple_git.out/Cargo.toml b/tests/snapshots/init/simple_git/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/simple_git.out/Cargo.toml
rename to tests/snapshots/init/simple_git/out/Cargo.toml
diff --git a/tests/snapshots/init/simple_git.out/src/lib.rs b/tests/snapshots/init/simple_git/out/src/lib.rs
similarity index 100%
rename from tests/snapshots/init/simple_git.out/src/lib.rs
rename to tests/snapshots/init/simple_git/out/src/lib.rs
diff --git a/tests/snapshots/init/simple_git.stderr b/tests/snapshots/init/simple_git/stderr.log
similarity index 100%
rename from tests/snapshots/init/simple_git.stderr
rename to tests/snapshots/init/simple_git/stderr.log
diff --git a/tests/snapshots/init/simple_git.stdout b/tests/snapshots/init/simple_git/stdout.log
similarity index 100%
rename from tests/snapshots/init/simple_git.stdout
rename to tests/snapshots/init/simple_git/stdout.log
diff --git a/tests/snapshots/init/simple_git_ignore_exists.in/.gitignore b/tests/snapshots/init/simple_git_ignore_exists/in/.gitignore
similarity index 100%
rename from tests/snapshots/init/simple_git_ignore_exists.in/.gitignore
rename to tests/snapshots/init/simple_git_ignore_exists/in/.gitignore
diff --git a/tests/snapshots/init/simple_git_ignore_exists.out/.gitignore b/tests/snapshots/init/simple_git_ignore_exists/out/.gitignore
similarity index 100%
rename from tests/snapshots/init/simple_git_ignore_exists.out/.gitignore
rename to tests/snapshots/init/simple_git_ignore_exists/out/.gitignore
diff --git a/tests/snapshots/init/simple_git_ignore_exists.out/Cargo.toml b/tests/snapshots/init/simple_git_ignore_exists/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/simple_git_ignore_exists.out/Cargo.toml
rename to tests/snapshots/init/simple_git_ignore_exists/out/Cargo.toml
diff --git a/tests/snapshots/init/simple_git_ignore_exists.out/src/lib.rs b/tests/snapshots/init/simple_git_ignore_exists/out/src/lib.rs
similarity index 100%
rename from tests/snapshots/init/simple_git_ignore_exists.out/src/lib.rs
rename to tests/snapshots/init/simple_git_ignore_exists/out/src/lib.rs
diff --git a/tests/snapshots/init/simple_git_ignore_exists.stderr b/tests/snapshots/init/simple_git_ignore_exists/stderr.log
similarity index 100%
rename from tests/snapshots/init/simple_git_ignore_exists.stderr
rename to tests/snapshots/init/simple_git_ignore_exists/stderr.log
diff --git a/tests/snapshots/init/simple_git_ignore_exists.stdout b/tests/snapshots/init/simple_git_ignore_exists/stdout.log
similarity index 100%
rename from tests/snapshots/init/simple_git_ignore_exists.stdout
rename to tests/snapshots/init/simple_git_ignore_exists/stdout.log
diff --git a/tests/snapshots/init/simple_hg.in b/tests/snapshots/init/simple_hg.in
deleted file mode 120000
index 10ad175ba3f..00000000000
--- a/tests/snapshots/init/simple_hg.in
+++ /dev/null
@@ -1 +0,0 @@
-empty-dir
\ No newline at end of file
diff --git a/tests/snapshots/init/simple_hg/in b/tests/snapshots/init/simple_hg/in
new file mode 120000
index 00000000000..55a0d0ef92e
--- /dev/null
+++ b/tests/snapshots/init/simple_hg/in
@@ -0,0 +1 @@
+../empty-dir
\ No newline at end of file
diff --git a/tests/snapshots/init/simple_hg.out/.hgignore b/tests/snapshots/init/simple_hg/out/.hgignore
similarity index 100%
rename from tests/snapshots/init/simple_hg.out/.hgignore
rename to tests/snapshots/init/simple_hg/out/.hgignore
diff --git a/tests/snapshots/init/simple_hg.out/Cargo.toml b/tests/snapshots/init/simple_hg/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/simple_hg.out/Cargo.toml
rename to tests/snapshots/init/simple_hg/out/Cargo.toml
diff --git a/tests/snapshots/init/simple_hg.out/src/lib.rs b/tests/snapshots/init/simple_hg/out/src/lib.rs
similarity index 100%
rename from tests/snapshots/init/simple_hg.out/src/lib.rs
rename to tests/snapshots/init/simple_hg/out/src/lib.rs
diff --git a/tests/snapshots/init/simple_hg.stderr b/tests/snapshots/init/simple_hg/stderr.log
similarity index 100%
rename from tests/snapshots/init/simple_hg.stderr
rename to tests/snapshots/init/simple_hg/stderr.log
diff --git a/tests/snapshots/init/simple_hg.stdout b/tests/snapshots/init/simple_hg/stdout.log
similarity index 100%
rename from tests/snapshots/init/simple_hg.stdout
rename to tests/snapshots/init/simple_hg/stdout.log
diff --git a/tests/snapshots/init/simple_hg_ignore_exists.in/.hg/.keep b/tests/snapshots/init/simple_hg_ignore_exists/in/.hg/.keep
similarity index 100%
rename from tests/snapshots/init/simple_hg_ignore_exists.in/.hg/.keep
rename to tests/snapshots/init/simple_hg_ignore_exists/in/.hg/.keep
diff --git a/tests/snapshots/init/simple_hg_ignore_exists.in/.hgignore b/tests/snapshots/init/simple_hg_ignore_exists/in/.hgignore
similarity index 100%
rename from tests/snapshots/init/simple_hg_ignore_exists.in/.hgignore
rename to tests/snapshots/init/simple_hg_ignore_exists/in/.hgignore
diff --git a/tests/snapshots/init/simple_hg_ignore_exists.out/.hgignore b/tests/snapshots/init/simple_hg_ignore_exists/out/.hgignore
similarity index 100%
rename from tests/snapshots/init/simple_hg_ignore_exists.out/.hgignore
rename to tests/snapshots/init/simple_hg_ignore_exists/out/.hgignore
diff --git a/tests/snapshots/init/simple_hg_ignore_exists.out/Cargo.toml b/tests/snapshots/init/simple_hg_ignore_exists/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/simple_hg_ignore_exists.out/Cargo.toml
rename to tests/snapshots/init/simple_hg_ignore_exists/out/Cargo.toml
diff --git a/tests/snapshots/init/simple_hg_ignore_exists.out/src/lib.rs b/tests/snapshots/init/simple_hg_ignore_exists/out/src/lib.rs
similarity index 100%
rename from tests/snapshots/init/simple_hg_ignore_exists.out/src/lib.rs
rename to tests/snapshots/init/simple_hg_ignore_exists/out/src/lib.rs
diff --git a/tests/snapshots/init/simple_hg_ignore_exists.stderr b/tests/snapshots/init/simple_hg_ignore_exists/stderr.log
similarity index 100%
rename from tests/snapshots/init/simple_hg_ignore_exists.stderr
rename to tests/snapshots/init/simple_hg_ignore_exists/stderr.log
diff --git a/tests/snapshots/init/simple_hg_ignore_exists.stdout b/tests/snapshots/init/simple_hg_ignore_exists/stdout.log
similarity index 100%
rename from tests/snapshots/init/simple_hg_ignore_exists.stdout
rename to tests/snapshots/init/simple_hg_ignore_exists/stdout.log
diff --git a/tests/snapshots/init/simple_lib.in b/tests/snapshots/init/simple_lib.in
deleted file mode 120000
index 10ad175ba3f..00000000000
--- a/tests/snapshots/init/simple_lib.in
+++ /dev/null
@@ -1 +0,0 @@
-empty-dir
\ No newline at end of file
diff --git a/tests/snapshots/init/simple_lib/in b/tests/snapshots/init/simple_lib/in
new file mode 120000
index 00000000000..55a0d0ef92e
--- /dev/null
+++ b/tests/snapshots/init/simple_lib/in
@@ -0,0 +1 @@
+../empty-dir
\ No newline at end of file
diff --git a/tests/snapshots/init/simple_lib.out/Cargo.toml b/tests/snapshots/init/simple_lib/out/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/simple_lib.out/Cargo.toml
rename to tests/snapshots/init/simple_lib/out/Cargo.toml
diff --git a/tests/snapshots/init/simple_lib.out/src/lib.rs b/tests/snapshots/init/simple_lib/out/src/lib.rs
similarity index 100%
rename from tests/snapshots/init/simple_lib.out/src/lib.rs
rename to tests/snapshots/init/simple_lib/out/src/lib.rs
diff --git a/tests/snapshots/init/simple_lib.stderr b/tests/snapshots/init/simple_lib/stderr.log
similarity index 100%
rename from tests/snapshots/init/simple_lib.stderr
rename to tests/snapshots/init/simple_lib/stderr.log
diff --git a/tests/snapshots/init/simple_lib.stdout b/tests/snapshots/init/simple_lib/stdout.log
similarity index 100%
rename from tests/snapshots/init/simple_lib.stdout
rename to tests/snapshots/init/simple_lib/stdout.log
diff --git a/tests/snapshots/init/unknown_flags.stderr b/tests/snapshots/init/unknown_flags/stderr.log
similarity index 100%
rename from tests/snapshots/init/unknown_flags.stderr
rename to tests/snapshots/init/unknown_flags/stderr.log
diff --git a/tests/snapshots/init/unknown_flags.stdout b/tests/snapshots/init/unknown_flags/stdout.log
similarity index 100%
rename from tests/snapshots/init/unknown_flags.stdout
rename to tests/snapshots/init/unknown_flags/stdout.log
diff --git a/tests/snapshots/init/with_argument.in/foo/.keep b/tests/snapshots/init/with_argument/in/foo/.keep
similarity index 100%
rename from tests/snapshots/init/with_argument.in/foo/.keep
rename to tests/snapshots/init/with_argument/in/foo/.keep
diff --git a/tests/snapshots/init/with_argument.out/foo/Cargo.toml b/tests/snapshots/init/with_argument/out/foo/Cargo.toml
similarity index 100%
rename from tests/snapshots/init/with_argument.out/foo/Cargo.toml
rename to tests/snapshots/init/with_argument/out/foo/Cargo.toml
diff --git a/tests/snapshots/init/with_argument.out/foo/src/main.rs b/tests/snapshots/init/with_argument/out/foo/src/main.rs
similarity index 100%
rename from tests/snapshots/init/with_argument.out/foo/src/main.rs
rename to tests/snapshots/init/with_argument/out/foo/src/main.rs
diff --git a/tests/snapshots/init/with_argument.stderr b/tests/snapshots/init/with_argument/stderr.log
similarity index 100%
rename from tests/snapshots/init/with_argument.stderr
rename to tests/snapshots/init/with_argument/stderr.log
diff --git a/tests/snapshots/init/with_argument.stdout b/tests/snapshots/init/with_argument/stdout.log
similarity index 100%
rename from tests/snapshots/init/with_argument.stdout
rename to tests/snapshots/init/with_argument/stdout.log
diff --git a/tests/snapshots/rename.sh b/tests/snapshots/rename.sh
deleted file mode 100755
index 4c854f5ac62..00000000000
--- a/tests/snapshots/rename.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-BEFORE=$1
-AFTER=$2
-if [ -z "${BEFORE}" ] || [ -z "${AFTER}" ]; then
-    echo "Rename a snapshot"
-    echo
-    echo "Run this from the snapshots directory, using the base name for the snapshots"
-    echo
-    echo "Usage: $0 <BEFORE> <AFTER>"
-    exit 1
-fi
-
-if [ -e "$1.stdout" ]; then
-    echo "Renaming '$1.in"
-    mv $1.in $2.in
-else
-    echo "No '$1.in'"
-fi
-if [ -e "$1.stdout" ]; then
-    echo "Renaming '$1.out"
-    mv $1.out $2.out
-else
-    echo "No '$1.out'"
-fi
-if [ -e "$1.stdout" ]; then
-    echo "Renaming '$1.stdout"
-    mv $1.stdout $2.stdout
-else
-    echo "No '$1.stdout'"
-fi
-if [ -e "$1.stderr" ]; then
-    echo "Renaming '$1.stderr'"
-    mv $1.stderr $2.stderr
-else
-    echo "No '$1.stderr'"
-fi
-git add $2.*
diff --git a/tests/testsuite/cargo_add.rs b/tests/testsuite/cargo_add.rs
index c6924b37d43..5e5a3a564e5 100644
--- a/tests/testsuite/cargo_add.rs
+++ b/tests/testsuite/cargo_add.rs
@@ -88,7 +88,7 @@ fn add_registry_packages(alt: bool) {
 #[cargo_test]
 fn add_basic() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/add_basic.in");
+    let project = Project::from_template("tests/snapshots/add/add_basic/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -98,16 +98,16 @@ fn add_basic() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/add_basic.stdout")
-        .stderr_matches_path("tests/snapshots/add/add_basic.stderr");
+        .stdout_matches_path("tests/snapshots/add/add_basic/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/add_basic/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/add_basic.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/add_basic/out", &project_root);
 }
 
 #[cargo_test]
 fn add_multiple() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/add_multiple.in");
+    let project = Project::from_template("tests/snapshots/add/add_multiple/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -117,16 +117,16 @@ fn add_multiple() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/add_multiple.stdout")
-        .stderr_matches_path("tests/snapshots/add/add_multiple.stderr");
+        .stdout_matches_path("tests/snapshots/add/add_multiple/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/add_multiple/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/add_multiple.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/add_multiple/out", &project_root);
 }
 
 #[cargo_test]
 fn quiet() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/quiet.in");
+    let project = Project::from_template("tests/snapshots/add/quiet/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -136,16 +136,16 @@ fn quiet() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/quiet.stdout")
-        .stderr_matches_path("tests/snapshots/add/quiet.stderr");
+        .stdout_matches_path("tests/snapshots/add/quiet/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/quiet/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/quiet.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/quiet/out", &project_root);
 }
 
 #[cargo_test]
 fn add_normalized_name_external() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/add_normalized_name_external.in");
+    let project = Project::from_template("tests/snapshots/add/add_normalized_name_external/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -155,11 +155,11 @@ fn add_normalized_name_external() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/add_normalized_name_external.stdout")
-        .stderr_matches_path("tests/snapshots/add/add_normalized_name_external.stderr");
+        .stdout_matches_path("tests/snapshots/add/add_normalized_name_external/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/add_normalized_name_external/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/add_normalized_name_external.out",
+        "tests/snapshots/add/add_normalized_name_external/out",
         &project_root,
     );
 }
@@ -167,7 +167,7 @@ fn add_normalized_name_external() {
 #[cargo_test]
 fn infer_prerelease() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/infer_prerelease.in");
+    let project = Project::from_template("tests/snapshots/add/infer_prerelease/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -177,16 +177,16 @@ fn infer_prerelease() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/infer_prerelease.stdout")
-        .stderr_matches_path("tests/snapshots/add/infer_prerelease.stderr");
+        .stdout_matches_path("tests/snapshots/add/infer_prerelease/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/infer_prerelease/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/infer_prerelease.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/infer_prerelease/out", &project_root);
 }
 
 #[cargo_test]
 fn build() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/build.in");
+    let project = Project::from_template("tests/snapshots/add/build/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -196,16 +196,16 @@ fn build() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/build.stdout")
-        .stderr_matches_path("tests/snapshots/add/build.stderr");
+        .stdout_matches_path("tests/snapshots/add/build/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/build/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/build.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/build/out", &project_root);
 }
 
 #[cargo_test]
 fn build_prefer_existing_version() {
     init_alt_registry();
-    let project = Project::from_template("tests/snapshots/add/build_prefer_existing_version.in");
+    let project = Project::from_template("tests/snapshots/add/build_prefer_existing_version/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -215,11 +215,11 @@ fn build_prefer_existing_version() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/build_prefer_existing_version.stdout")
-        .stderr_matches_path("tests/snapshots/add/build_prefer_existing_version.stderr");
+        .stdout_matches_path("tests/snapshots/add/build_prefer_existing_version/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/build_prefer_existing_version/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/build_prefer_existing_version.out",
+        "tests/snapshots/add/build_prefer_existing_version/out",
         &project_root,
     );
 }
@@ -227,7 +227,7 @@ fn build_prefer_existing_version() {
 #[cargo_test]
 fn default_features() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/default_features.in");
+    let project = Project::from_template("tests/snapshots/add/default_features/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -237,16 +237,16 @@ fn default_features() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/default_features.stdout")
-        .stderr_matches_path("tests/snapshots/add/default_features.stderr");
+        .stdout_matches_path("tests/snapshots/add/default_features/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/default_features/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/default_features.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/default_features/out", &project_root);
 }
 
 #[cargo_test]
 fn require_weak() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/require_weak.in");
+    let project = Project::from_template("tests/snapshots/add/require_weak/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -256,16 +256,16 @@ fn require_weak() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/require_weak.stdout")
-        .stderr_matches_path("tests/snapshots/add/require_weak.stderr");
+        .stdout_matches_path("tests/snapshots/add/require_weak/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/require_weak/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/require_weak.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/require_weak/out", &project_root);
 }
 
 #[cargo_test]
 fn detect_workspace_inherit() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/detect_workspace_inherit.in");
+    let project = Project::from_template("tests/snapshots/add/detect_workspace_inherit/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -276,11 +276,11 @@ fn detect_workspace_inherit() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/detect_workspace_inherit.stdout")
-        .stderr_matches_path("tests/snapshots/add/detect_workspace_inherit.stderr");
+        .stdout_matches_path("tests/snapshots/add/detect_workspace_inherit/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/detect_workspace_inherit/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/detect_workspace_inherit.out",
+        "tests/snapshots/add/detect_workspace_inherit/out",
         &project_root,
     );
 }
@@ -289,7 +289,7 @@ fn detect_workspace_inherit() {
 fn detect_workspace_inherit_features() {
     init_registry();
     let project =
-        Project::from_template("tests/snapshots/add/detect_workspace_inherit_features.in");
+        Project::from_template("tests/snapshots/add/detect_workspace_inherit_features/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -300,11 +300,11 @@ fn detect_workspace_inherit_features() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/detect_workspace_inherit_features.stdout")
-        .stderr_matches_path("tests/snapshots/add/detect_workspace_inherit_features.stderr");
+        .stdout_matches_path("tests/snapshots/add/detect_workspace_inherit_features/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/detect_workspace_inherit_features/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/detect_workspace_inherit_features.out",
+        "tests/snapshots/add/detect_workspace_inherit_features/out",
         &project_root,
     );
 }
@@ -313,7 +313,7 @@ fn detect_workspace_inherit_features() {
 fn detect_workspace_inherit_optional() {
     init_registry();
     let project =
-        Project::from_template("tests/snapshots/add/detect_workspace_inherit_optional.in");
+        Project::from_template("tests/snapshots/add/detect_workspace_inherit_optional/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -324,11 +324,11 @@ fn detect_workspace_inherit_optional() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/detect_workspace_inherit_optional.stdout")
-        .stderr_matches_path("tests/snapshots/add/detect_workspace_inherit_optional.stderr");
+        .stdout_matches_path("tests/snapshots/add/detect_workspace_inherit_optional/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/detect_workspace_inherit_optional/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/detect_workspace_inherit_optional.out",
+        "tests/snapshots/add/detect_workspace_inherit_optional/out",
         &project_root,
     );
 }
@@ -336,7 +336,7 @@ fn detect_workspace_inherit_optional() {
 #[cargo_test]
 fn dev() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/dev.in");
+    let project = Project::from_template("tests/snapshots/add/dev/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -346,16 +346,16 @@ fn dev() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/dev.stdout")
-        .stderr_matches_path("tests/snapshots/add/dev.stderr");
+        .stdout_matches_path("tests/snapshots/add/dev/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/dev/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/dev.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/dev/out", &project_root);
 }
 
 #[cargo_test]
 fn dev_build_conflict() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/dev_build_conflict.in");
+    let project = Project::from_template("tests/snapshots/add/dev_build_conflict/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -365,16 +365,16 @@ fn dev_build_conflict() {
         .current_dir(cwd)
         .assert()
         .code(1)
-        .stdout_matches_path("tests/snapshots/add/dev_build_conflict.stdout")
-        .stderr_matches_path("tests/snapshots/add/dev_build_conflict.stderr");
+        .stdout_matches_path("tests/snapshots/add/dev_build_conflict/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/dev_build_conflict/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/dev_build_conflict.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/dev_build_conflict/out", &project_root);
 }
 
 #[cargo_test]
 fn dev_prefer_existing_version() {
     init_alt_registry();
-    let project = Project::from_template("tests/snapshots/add/dev_prefer_existing_version.in");
+    let project = Project::from_template("tests/snapshots/add/dev_prefer_existing_version/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -384,11 +384,11 @@ fn dev_prefer_existing_version() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/dev_prefer_existing_version.stdout")
-        .stderr_matches_path("tests/snapshots/add/dev_prefer_existing_version.stderr");
+        .stdout_matches_path("tests/snapshots/add/dev_prefer_existing_version/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/dev_prefer_existing_version/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/dev_prefer_existing_version.out",
+        "tests/snapshots/add/dev_prefer_existing_version/out",
         &project_root,
     );
 }
@@ -396,7 +396,7 @@ fn dev_prefer_existing_version() {
 #[cargo_test]
 fn dry_run() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/dry_run.in");
+    let project = Project::from_template("tests/snapshots/add/dry_run/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -406,16 +406,16 @@ fn dry_run() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/dry_run.stdout")
-        .stderr_matches_path("tests/snapshots/add/dry_run.stderr");
+        .stdout_matches_path("tests/snapshots/add/dry_run/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/dry_run/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/dry_run.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/dry_run/out", &project_root);
 }
 
 #[cargo_test]
 fn features() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/features.in");
+    let project = Project::from_template("tests/snapshots/add/features/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -425,16 +425,16 @@ fn features() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/features.stdout")
-        .stderr_matches_path("tests/snapshots/add/features.stderr");
+        .stdout_matches_path("tests/snapshots/add/features/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/features/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/features.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/features/out", &project_root);
 }
 
 #[cargo_test]
 fn features_empty() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/features_empty.in");
+    let project = Project::from_template("tests/snapshots/add/features_empty/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -444,16 +444,16 @@ fn features_empty() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/features_empty.stdout")
-        .stderr_matches_path("tests/snapshots/add/features_empty.stderr");
+        .stdout_matches_path("tests/snapshots/add/features_empty/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/features_empty/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/features_empty.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/features_empty/out", &project_root);
 }
 
 #[cargo_test]
 fn features_multiple_occurrences() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/features_multiple_occurrences.in");
+    let project = Project::from_template("tests/snapshots/add/features_multiple_occurrences/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -463,11 +463,11 @@ fn features_multiple_occurrences() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/features_multiple_occurrences.stdout")
-        .stderr_matches_path("tests/snapshots/add/features_multiple_occurrences.stderr");
+        .stdout_matches_path("tests/snapshots/add/features_multiple_occurrences/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/features_multiple_occurrences/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/features_multiple_occurrences.out",
+        "tests/snapshots/add/features_multiple_occurrences/out",
         &project_root,
     );
 }
@@ -475,7 +475,7 @@ fn features_multiple_occurrences() {
 #[cargo_test]
 fn features_preserve() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/features_preserve.in");
+    let project = Project::from_template("tests/snapshots/add/features_preserve/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -485,16 +485,16 @@ fn features_preserve() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/features_preserve.stdout")
-        .stderr_matches_path("tests/snapshots/add/features_preserve.stderr");
+        .stdout_matches_path("tests/snapshots/add/features_preserve/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/features_preserve/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/features_preserve.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/features_preserve/out", &project_root);
 }
 
 #[cargo_test]
 fn features_spaced_values() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/features_spaced_values.in");
+    let project = Project::from_template("tests/snapshots/add/features_spaced_values/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -504,11 +504,11 @@ fn features_spaced_values() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/features_spaced_values.stdout")
-        .stderr_matches_path("tests/snapshots/add/features_spaced_values.stderr");
+        .stdout_matches_path("tests/snapshots/add/features_spaced_values/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/features_spaced_values/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/features_spaced_values.out",
+        "tests/snapshots/add/features_spaced_values/out",
         &project_root,
     );
 }
@@ -516,7 +516,7 @@ fn features_spaced_values() {
 #[cargo_test]
 fn features_unknown() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/features_unknown.in");
+    let project = Project::from_template("tests/snapshots/add/features_unknown/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -526,16 +526,16 @@ fn features_unknown() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches_path("tests/snapshots/add/features_unknown.stdout")
-        .stderr_matches_path("tests/snapshots/add/features_unknown.stderr");
+        .stdout_matches_path("tests/snapshots/add/features_unknown/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/features_unknown/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/features_unknown.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/features_unknown/out", &project_root);
 }
 
 #[cargo_test]
 fn git() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/git.in");
+    let project = Project::from_template("tests/snapshots/add/git/in");
     let project_root = project.root();
     let cwd = &project_root;
     let git_dep = cargo_test_support::git::new("git-package", |project| {
@@ -554,16 +554,16 @@ fn git() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/git.stdout")
-        .stderr_matches_path("tests/snapshots/add/git.stderr");
+        .stdout_matches_path("tests/snapshots/add/git/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/git/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/git.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/git/out", &project_root);
 }
 
 #[cargo_test]
 fn git_inferred_name() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/git_inferred_name.in");
+    let project = Project::from_template("tests/snapshots/add/git_inferred_name/in");
     let project_root = project.root();
     let cwd = &project_root;
     let git_dep = cargo_test_support::git::new("git-package", |project| {
@@ -582,16 +582,16 @@ fn git_inferred_name() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/git_inferred_name.stdout")
-        .stderr_matches_path("tests/snapshots/add/git_inferred_name.stderr");
+        .stdout_matches_path("tests/snapshots/add/git_inferred_name/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/git_inferred_name/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/git_inferred_name.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/git_inferred_name/out", &project_root);
 }
 
 #[cargo_test]
 fn git_inferred_name_multiple() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/git_inferred_name_multiple.in");
+    let project = Project::from_template("tests/snapshots/add/git_inferred_name_multiple/in");
     let project_root = project.root();
     let cwd = &project_root;
     let git_dep = cargo_test_support::git::new("git-package", |project| {
@@ -615,11 +615,11 @@ fn git_inferred_name_multiple() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches_path("tests/snapshots/add/git_inferred_name_multiple.stdout")
-        .stderr_matches_path("tests/snapshots/add/git_inferred_name_multiple.stderr");
+        .stdout_matches_path("tests/snapshots/add/git_inferred_name_multiple/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/git_inferred_name_multiple/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/git_inferred_name_multiple.out",
+        "tests/snapshots/add/git_inferred_name_multiple/out",
         &project_root,
     );
 }
@@ -627,7 +627,7 @@ fn git_inferred_name_multiple() {
 #[cargo_test]
 fn git_normalized_name() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/git_normalized_name.in");
+    let project = Project::from_template("tests/snapshots/add/git_normalized_name/in");
     let project_root = project.root();
     let cwd = &project_root;
     let git_dep = cargo_test_support::git::new("git-package", |project| {
@@ -646,16 +646,16 @@ fn git_normalized_name() {
         .current_dir(cwd)
         .assert()
         .failure() // Fuzzy searching for paths isn't supported at this time
-        .stdout_matches_path("tests/snapshots/add/git_normalized_name.stdout")
-        .stderr_matches_path("tests/snapshots/add/git_normalized_name.stderr");
+        .stdout_matches_path("tests/snapshots/add/git_normalized_name/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/git_normalized_name/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/git_normalized_name.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/git_normalized_name/out", &project_root);
 }
 
 #[cargo_test]
 fn invalid_git_name() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/invalid_git_name.in");
+    let project = Project::from_template("tests/snapshots/add/invalid_git_name/in");
     let project_root = project.root();
     let cwd = &project_root;
     let git_dep = cargo_test_support::git::new("git-package", |project| {
@@ -674,16 +674,16 @@ fn invalid_git_name() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches_path("tests/snapshots/add/invalid_git_name.stdout")
-        .stderr_matches_path("tests/snapshots/add/invalid_git_name.stderr");
+        .stdout_matches_path("tests/snapshots/add/invalid_git_name/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/invalid_git_name/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/invalid_git_name.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/invalid_git_name/out", &project_root);
 }
 
 #[cargo_test]
 fn git_branch() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/git_branch.in");
+    let project = Project::from_template("tests/snapshots/add/git_branch/in");
     let project_root = project.root();
     let cwd = &project_root;
     let (git_dep, git_repo) = cargo_test_support::git::new_repo("git-package", |project| {
@@ -705,16 +705,16 @@ fn git_branch() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/git_branch.stdout")
-        .stderr_matches_path("tests/snapshots/add/git_branch.stderr");
+        .stdout_matches_path("tests/snapshots/add/git_branch/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/git_branch/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/git_branch.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/git_branch/out", &project_root);
 }
 
 #[cargo_test]
 fn git_conflicts_namever() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/git_conflicts_namever.in");
+    let project = Project::from_template("tests/snapshots/add/git_conflicts_namever/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -728,11 +728,11 @@ fn git_conflicts_namever() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches_path("tests/snapshots/add/git_conflicts_namever.stdout")
-        .stderr_matches_path("tests/snapshots/add/git_conflicts_namever.stderr");
+        .stdout_matches_path("tests/snapshots/add/git_conflicts_namever/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/git_conflicts_namever/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/git_conflicts_namever.out",
+        "tests/snapshots/add/git_conflicts_namever/out",
         &project_root,
     );
 }
@@ -740,7 +740,7 @@ fn git_conflicts_namever() {
 #[cargo_test]
 fn git_registry() {
     init_alt_registry();
-    let project = Project::from_template("tests/snapshots/add/git_registry.in");
+    let project = Project::from_template("tests/snapshots/add/git_registry/in");
     let project_root = project.root();
     let cwd = &project_root;
     let git_dep = cargo_test_support::git::new("versioned-package", |project| {
@@ -765,16 +765,16 @@ fn git_registry() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/git_registry.stdout")
-        .stderr_matches_path("tests/snapshots/add/git_registry.stderr");
+        .stdout_matches_path("tests/snapshots/add/git_registry/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/git_registry/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/git_registry.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/git_registry/out", &project_root);
 }
 
 #[cargo_test]
 fn git_dev() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/git_dev.in");
+    let project = Project::from_template("tests/snapshots/add/git_dev/in");
     let project_root = project.root();
     let cwd = &project_root;
     let git_dep = cargo_test_support::git::new("git-package", |project| {
@@ -793,16 +793,16 @@ fn git_dev() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/git_dev.stdout")
-        .stderr_matches_path("tests/snapshots/add/git_dev.stderr");
+        .stdout_matches_path("tests/snapshots/add/git_dev/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/git_dev/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/git_dev.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/git_dev/out", &project_root);
 }
 
 #[cargo_test]
 fn git_rev() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/git_rev.in");
+    let project = Project::from_template("tests/snapshots/add/git_rev/in");
     let project_root = project.root();
     let cwd = &project_root;
     let (git_dep, git_repo) = cargo_test_support::git::new_repo("git-package", |project| {
@@ -823,16 +823,16 @@ fn git_rev() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/git_rev.stdout")
-        .stderr_matches_path("tests/snapshots/add/git_rev.stderr");
+        .stdout_matches_path("tests/snapshots/add/git_rev/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/git_rev/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/git_rev.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/git_rev/out", &project_root);
 }
 
 #[cargo_test]
 fn git_tag() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/git_tag.in");
+    let project = Project::from_template("tests/snapshots/add/git_tag/in");
     let project_root = project.root();
     let cwd = &project_root;
     let (git_dep, git_repo) = cargo_test_support::git::new_repo("git-package", |project| {
@@ -853,16 +853,16 @@ fn git_tag() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/git_tag.stdout")
-        .stderr_matches_path("tests/snapshots/add/git_tag.stderr");
+        .stdout_matches_path("tests/snapshots/add/git_tag/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/git_tag/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/git_tag.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/git_tag/out", &project_root);
 }
 
 #[cargo_test]
 fn path() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/path.in");
+    let project = Project::from_template("tests/snapshots/add/path/in");
     let project_root = project.root();
     let cwd = project_root.join("primary");
 
@@ -872,16 +872,16 @@ fn path() {
         .current_dir(&cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/path.stdout")
-        .stderr_matches_path("tests/snapshots/add/path.stderr");
+        .stdout_matches_path("tests/snapshots/add/path/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/path/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/path.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/path/out", &project_root);
 }
 
 #[cargo_test]
 fn path_inferred_name() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/path_inferred_name.in");
+    let project = Project::from_template("tests/snapshots/add/path_inferred_name/in");
     let project_root = project.root();
     let cwd = project_root.join("primary");
 
@@ -891,17 +891,17 @@ fn path_inferred_name() {
         .current_dir(&cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/path_inferred_name.stdout")
-        .stderr_matches_path("tests/snapshots/add/path_inferred_name.stderr");
+        .stdout_matches_path("tests/snapshots/add/path_inferred_name/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/path_inferred_name/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/path_inferred_name.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/path_inferred_name/out", &project_root);
 }
 
 #[cargo_test]
 fn path_inferred_name_conflicts_full_feature() {
     init_registry();
     let project =
-        Project::from_template("tests/snapshots/add/path_inferred_name_conflicts_full_feature.in");
+        Project::from_template("tests/snapshots/add/path_inferred_name_conflicts_full_feature/in");
     let project_root = project.root();
     let cwd = project_root.join("primary");
 
@@ -911,13 +911,15 @@ fn path_inferred_name_conflicts_full_feature() {
         .current_dir(&cwd)
         .assert()
         .code(101)
-        .stdout_matches_path("tests/snapshots/add/path_inferred_name_conflicts_full_feature.stdout")
+        .stdout_matches_path(
+            "tests/snapshots/add/path_inferred_name_conflicts_full_feature/stdout.log",
+        )
         .stderr_matches_path(
-            "tests/snapshots/add/path_inferred_name_conflicts_full_feature.stderr",
+            "tests/snapshots/add/path_inferred_name_conflicts_full_feature/stderr.log",
         );
 
     assert().subset_matches(
-        "tests/snapshots/add/path_inferred_name_conflicts_full_feature.out",
+        "tests/snapshots/add/path_inferred_name_conflicts_full_feature/out",
         &project_root,
     );
 }
@@ -925,7 +927,7 @@ fn path_inferred_name_conflicts_full_feature() {
 #[cargo_test]
 fn path_normalized_name() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/path_normalized_name.in");
+    let project = Project::from_template("tests/snapshots/add/path_normalized_name/in");
     let project_root = project.root();
     let cwd = project_root.join("primary");
 
@@ -935,11 +937,11 @@ fn path_normalized_name() {
         .current_dir(&cwd)
         .assert()
         .failure() // Fuzzy searching for paths isn't supported at this time
-        .stdout_matches_path("tests/snapshots/add/path_normalized_name.stdout")
-        .stderr_matches_path("tests/snapshots/add/path_normalized_name.stderr");
+        .stdout_matches_path("tests/snapshots/add/path_normalized_name/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/path_normalized_name/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/path_normalized_name.out",
+        "tests/snapshots/add/path_normalized_name/out",
         &project_root,
     );
 }
@@ -947,7 +949,7 @@ fn path_normalized_name() {
 #[cargo_test]
 fn invalid_path_name() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/invalid_path_name.in");
+    let project = Project::from_template("tests/snapshots/add/invalid_path_name/in");
     let project_root = project.root();
     let cwd = project_root.join("primary");
 
@@ -957,16 +959,16 @@ fn invalid_path_name() {
         .current_dir(&cwd)
         .assert()
         .code(101)
-        .stdout_matches_path("tests/snapshots/add/invalid_path_name.stdout")
-        .stderr_matches_path("tests/snapshots/add/invalid_path_name.stderr");
+        .stdout_matches_path("tests/snapshots/add/invalid_path_name/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/invalid_path_name/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/invalid_path_name.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/invalid_path_name/out", &project_root);
 }
 
 #[cargo_test]
 fn path_dev() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/path_dev.in");
+    let project = Project::from_template("tests/snapshots/add/path_dev/in");
     let project_root = project.root();
     let cwd = project_root.join("primary");
 
@@ -976,16 +978,16 @@ fn path_dev() {
         .current_dir(&cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/path_dev.stdout")
-        .stderr_matches_path("tests/snapshots/add/path_dev.stderr");
+        .stdout_matches_path("tests/snapshots/add/path_dev/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/path_dev/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/path_dev.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/path_dev/out", &project_root);
 }
 
 #[cargo_test]
 fn invalid_arg() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/invalid_arg.in");
+    let project = Project::from_template("tests/snapshots/add/invalid_arg/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -995,16 +997,16 @@ fn invalid_arg() {
         .current_dir(cwd)
         .assert()
         .code(1)
-        .stdout_matches_path("tests/snapshots/add/invalid_arg.stdout")
-        .stderr_matches_path("tests/snapshots/add/invalid_arg.stderr");
+        .stdout_matches_path("tests/snapshots/add/invalid_arg/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/invalid_arg/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/invalid_arg.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/invalid_arg/out", &project_root);
 }
 
 #[cargo_test]
 fn invalid_git_external() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/invalid_git_external.in");
+    let project = Project::from_template("tests/snapshots/add/invalid_git_external/in");
     let project_root = project.root();
     let cwd = &project_root;
     let git_url = url::Url::from_directory_path(cwd.join("does-not-exist"))
@@ -1017,18 +1019,18 @@ fn invalid_git_external() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches_path("tests/snapshots/add/invalid_git_external.stdout")
-        .stderr_matches_path("tests/snapshots/add/invalid_git_external.stderr");
+        .stdout_matches_path("tests/snapshots/add/invalid_git_external/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/invalid_git_external/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/invalid_git_external.out",
+        "tests/snapshots/add/invalid_git_external/out",
         &project_root,
     );
 }
 
 #[cargo_test]
 fn invalid_key_inherit_dependency() {
-    let project = Project::from_template("tests/snapshots/add/invalid_key_inherit_dependency.in");
+    let project = Project::from_template("tests/snapshots/add/invalid_key_inherit_dependency/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1039,11 +1041,11 @@ fn invalid_key_inherit_dependency() {
         .current_dir(cwd)
         .assert()
         .failure()
-        .stdout_matches_path("tests/snapshots/add/invalid_key_inherit_dependency.stdout")
-        .stderr_matches_path("tests/snapshots/add/invalid_key_inherit_dependency.stderr");
+        .stdout_matches_path("tests/snapshots/add/invalid_key_inherit_dependency/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/invalid_key_inherit_dependency/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/invalid_key_inherit_dependency.out",
+        "tests/snapshots/add/invalid_key_inherit_dependency/out",
         &project_root,
     );
 }
@@ -1051,7 +1053,7 @@ fn invalid_key_inherit_dependency() {
 #[cargo_test]
 fn invalid_key_rename_inherit_dependency() {
     let project =
-        Project::from_template("tests/snapshots/add/invalid_key_rename_inherit_dependency.in");
+        Project::from_template("tests/snapshots/add/invalid_key_rename_inherit_dependency/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1062,11 +1064,13 @@ fn invalid_key_rename_inherit_dependency() {
         .current_dir(cwd)
         .assert()
         .failure()
-        .stdout_matches_path("tests/snapshots/add/invalid_key_rename_inherit_dependency.stdout")
-        .stderr_matches_path("tests/snapshots/add/invalid_key_rename_inherit_dependency.stderr");
+        .stdout_matches_path("tests/snapshots/add/invalid_key_rename_inherit_dependency/stdout.log")
+        .stderr_matches_path(
+            "tests/snapshots/add/invalid_key_rename_inherit_dependency/stderr.log",
+        );
 
     assert().subset_matches(
-        "tests/snapshots/add/invalid_key_rename_inherit_dependency.out",
+        "tests/snapshots/add/invalid_key_rename_inherit_dependency/out",
         &project_root,
     );
 }
@@ -1074,7 +1078,7 @@ fn invalid_key_rename_inherit_dependency() {
 #[cargo_test]
 fn invalid_key_overwrite_inherit_dependency() {
     let project =
-        Project::from_template("tests/snapshots/add/invalid_key_overwrite_inherit_dependency.in");
+        Project::from_template("tests/snapshots/add/invalid_key_overwrite_inherit_dependency/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1085,11 +1089,15 @@ fn invalid_key_overwrite_inherit_dependency() {
         .current_dir(cwd)
         .assert()
         .failure()
-        .stdout_matches_path("tests/snapshots/add/invalid_key_overwrite_inherit_dependency.stdout")
-        .stderr_matches_path("tests/snapshots/add/invalid_key_overwrite_inherit_dependency.stderr");
+        .stdout_matches_path(
+            "tests/snapshots/add/invalid_key_overwrite_inherit_dependency/stdout.log",
+        )
+        .stderr_matches_path(
+            "tests/snapshots/add/invalid_key_overwrite_inherit_dependency/stderr.log",
+        );
 
     assert().subset_matches(
-        "tests/snapshots/add/invalid_key_overwrite_inherit_dependency.out",
+        "tests/snapshots/add/invalid_key_overwrite_inherit_dependency/out",
         &project_root,
     );
 }
@@ -1097,7 +1105,7 @@ fn invalid_key_overwrite_inherit_dependency() {
 #[cargo_test]
 fn invalid_path() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/invalid_path.in");
+    let project = Project::from_template("tests/snapshots/add/invalid_path/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1107,16 +1115,16 @@ fn invalid_path() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches_path("tests/snapshots/add/invalid_path.stdout")
-        .stderr_matches_path("tests/snapshots/add/invalid_path.stderr");
+        .stdout_matches_path("tests/snapshots/add/invalid_path/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/invalid_path/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/invalid_path.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/invalid_path/out", &project_root);
 }
 
 #[cargo_test]
 fn invalid_path_self() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/invalid_path_self.in");
+    let project = Project::from_template("tests/snapshots/add/invalid_path_self/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1126,16 +1134,16 @@ fn invalid_path_self() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches_path("tests/snapshots/add/invalid_path_self.stdout")
-        .stderr_matches_path("tests/snapshots/add/invalid_path_self.stderr");
+        .stdout_matches_path("tests/snapshots/add/invalid_path_self/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/invalid_path_self/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/invalid_path_self.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/invalid_path_self/out", &project_root);
 }
 
 #[cargo_test]
 fn invalid_manifest() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/invalid_manifest.in");
+    let project = Project::from_template("tests/snapshots/add/invalid_manifest/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1145,16 +1153,16 @@ fn invalid_manifest() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches_path("tests/snapshots/add/invalid_manifest.stdout")
-        .stderr_matches_path("tests/snapshots/add/invalid_manifest.stderr");
+        .stdout_matches_path("tests/snapshots/add/invalid_manifest/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/invalid_manifest/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/invalid_manifest.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/invalid_manifest/out", &project_root);
 }
 
 #[cargo_test]
 fn invalid_name_external() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/invalid_name_external.in");
+    let project = Project::from_template("tests/snapshots/add/invalid_name_external/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1164,11 +1172,11 @@ fn invalid_name_external() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches_path("tests/snapshots/add/invalid_name_external.stdout")
-        .stderr_matches_path("tests/snapshots/add/invalid_name_external.stderr");
+        .stdout_matches_path("tests/snapshots/add/invalid_name_external/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/invalid_name_external/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/invalid_name_external.out",
+        "tests/snapshots/add/invalid_name_external/out",
         &project_root,
     );
 }
@@ -1176,7 +1184,7 @@ fn invalid_name_external() {
 #[cargo_test]
 fn invalid_target_empty() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/invalid_target_empty.in");
+    let project = Project::from_template("tests/snapshots/add/invalid_target_empty/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1186,11 +1194,11 @@ fn invalid_target_empty() {
         .current_dir(cwd)
         .assert()
         .code(1)
-        .stdout_matches_path("tests/snapshots/add/invalid_target_empty.stdout")
-        .stderr_matches_path("tests/snapshots/add/invalid_target_empty.stderr");
+        .stdout_matches_path("tests/snapshots/add/invalid_target_empty/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/invalid_target_empty/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/invalid_target_empty.out",
+        "tests/snapshots/add/invalid_target_empty/out",
         &project_root,
     );
 }
@@ -1198,7 +1206,7 @@ fn invalid_target_empty() {
 #[cargo_test]
 fn invalid_vers() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/invalid_vers.in");
+    let project = Project::from_template("tests/snapshots/add/invalid_vers/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1208,16 +1216,16 @@ fn invalid_vers() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches_path("tests/snapshots/add/invalid_vers.stdout")
-        .stderr_matches_path("tests/snapshots/add/invalid_vers.stderr");
+        .stdout_matches_path("tests/snapshots/add/invalid_vers/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/invalid_vers/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/invalid_vers.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/invalid_vers/out", &project_root);
 }
 
 #[cargo_test]
 fn list_features() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/list_features.in");
+    let project = Project::from_template("tests/snapshots/add/list_features/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1227,16 +1235,16 @@ fn list_features() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/list_features.stdout")
-        .stderr_matches_path("tests/snapshots/add/list_features.stderr");
+        .stdout_matches_path("tests/snapshots/add/list_features/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/list_features/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/list_features.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/list_features/out", &project_root);
 }
 
 #[cargo_test]
 fn list_features_path() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/list_features_path.in");
+    let project = Project::from_template("tests/snapshots/add/list_features_path/in");
     let project_root = project.root();
     let cwd = project_root.join("primary");
 
@@ -1246,16 +1254,16 @@ fn list_features_path() {
         .current_dir(&cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/list_features_path.stdout")
-        .stderr_matches_path("tests/snapshots/add/list_features_path.stderr");
+        .stdout_matches_path("tests/snapshots/add/list_features_path/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/list_features_path/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/list_features_path.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/list_features_path/out", &project_root);
 }
 
 #[cargo_test]
 fn list_features_path_no_default() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/list_features_path_no_default.in");
+    let project = Project::from_template("tests/snapshots/add/list_features_path_no_default/in");
     let project_root = project.root();
     let cwd = project_root.join("primary");
 
@@ -1270,11 +1278,11 @@ fn list_features_path_no_default() {
         .current_dir(&cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/list_features_path_no_default.stdout")
-        .stderr_matches_path("tests/snapshots/add/list_features_path_no_default.stderr");
+        .stdout_matches_path("tests/snapshots/add/list_features_path_no_default/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/list_features_path_no_default/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/list_features_path_no_default.out",
+        "tests/snapshots/add/list_features_path_no_default/out",
         &project_root,
     );
 }
@@ -1282,7 +1290,7 @@ fn list_features_path_no_default() {
 #[cargo_test]
 fn manifest_path_package() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/manifest_path_package.in");
+    let project = Project::from_template("tests/snapshots/add/manifest_path_package/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1298,18 +1306,18 @@ fn manifest_path_package() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/manifest_path_package.stdout")
-        .stderr_matches_path("tests/snapshots/add/manifest_path_package.stderr");
+        .stdout_matches_path("tests/snapshots/add/manifest_path_package/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/manifest_path_package/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/manifest_path_package.out",
+        "tests/snapshots/add/manifest_path_package/out",
         &project_root,
     );
 }
 
 #[cargo_test]
 fn merge_activated_features() {
-    let project = Project::from_template("tests/snapshots/add/merge_activated_features.in");
+    let project = Project::from_template("tests/snapshots/add/merge_activated_features/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1320,11 +1328,11 @@ fn merge_activated_features() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/merge_activated_features.stdout")
-        .stderr_matches_path("tests/snapshots/add/merge_activated_features.stderr");
+        .stdout_matches_path("tests/snapshots/add/merge_activated_features/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/merge_activated_features/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/merge_activated_features.out",
+        "tests/snapshots/add/merge_activated_features/out",
         &project_root,
     );
 }
@@ -1332,7 +1340,7 @@ fn merge_activated_features() {
 #[cargo_test]
 fn multiple_conflicts_with_features() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/multiple_conflicts_with_features.in");
+    let project = Project::from_template("tests/snapshots/add/multiple_conflicts_with_features/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1342,11 +1350,11 @@ fn multiple_conflicts_with_features() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches_path("tests/snapshots/add/multiple_conflicts_with_features.stdout")
-        .stderr_matches_path("tests/snapshots/add/multiple_conflicts_with_features.stderr");
+        .stdout_matches_path("tests/snapshots/add/multiple_conflicts_with_features/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/multiple_conflicts_with_features/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/multiple_conflicts_with_features.out",
+        "tests/snapshots/add/multiple_conflicts_with_features/out",
         &project_root,
     );
 }
@@ -1354,7 +1362,7 @@ fn multiple_conflicts_with_features() {
 #[cargo_test]
 fn git_multiple_names() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/git_multiple_names.in");
+    let project = Project::from_template("tests/snapshots/add/git_multiple_names/in");
     let project_root = project.root();
     let cwd = &project_root;
     let git_dep = cargo_test_support::git::new("git-package", |project| {
@@ -1378,16 +1386,16 @@ fn git_multiple_names() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/git_multiple_names.stdout")
-        .stderr_matches_path("tests/snapshots/add/git_multiple_names.stderr");
+        .stdout_matches_path("tests/snapshots/add/git_multiple_names/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/git_multiple_names/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/git_multiple_names.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/git_multiple_names/out", &project_root);
 }
 
 #[cargo_test]
 fn multiple_conflicts_with_rename() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/multiple_conflicts_with_rename.in");
+    let project = Project::from_template("tests/snapshots/add/multiple_conflicts_with_rename/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1397,11 +1405,11 @@ fn multiple_conflicts_with_rename() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches_path("tests/snapshots/add/multiple_conflicts_with_rename.stdout")
-        .stderr_matches_path("tests/snapshots/add/multiple_conflicts_with_rename.stderr");
+        .stdout_matches_path("tests/snapshots/add/multiple_conflicts_with_rename/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/multiple_conflicts_with_rename/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/multiple_conflicts_with_rename.out",
+        "tests/snapshots/add/multiple_conflicts_with_rename/out",
         &project_root,
     );
 }
@@ -1409,7 +1417,7 @@ fn multiple_conflicts_with_rename() {
 #[cargo_test]
 fn namever() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/namever.in");
+    let project = Project::from_template("tests/snapshots/add/namever/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1419,16 +1427,16 @@ fn namever() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/namever.stdout")
-        .stderr_matches_path("tests/snapshots/add/namever.stderr");
+        .stdout_matches_path("tests/snapshots/add/namever/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/namever/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/namever.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/namever/out", &project_root);
 }
 
 #[cargo_test]
 fn no_args() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/no_args.in");
+    let project = Project::from_template("tests/snapshots/add/no_args/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1437,16 +1445,16 @@ fn no_args() {
         .current_dir(cwd)
         .assert()
         .code(1)
-        .stdout_matches_path("tests/snapshots/add/no_args.stdout")
-        .stderr_matches_path("tests/snapshots/add/no_args.stderr");
+        .stdout_matches_path("tests/snapshots/add/no_args/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/no_args/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/no_args.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/no_args/out", &project_root);
 }
 
 #[cargo_test]
 fn no_default_features() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/no_default_features.in");
+    let project = Project::from_template("tests/snapshots/add/no_default_features/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1456,16 +1464,16 @@ fn no_default_features() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/no_default_features.stdout")
-        .stderr_matches_path("tests/snapshots/add/no_default_features.stderr");
+        .stdout_matches_path("tests/snapshots/add/no_default_features/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/no_default_features/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/no_default_features.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/no_default_features/out", &project_root);
 }
 
 #[cargo_test]
 fn no_optional() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/no_optional.in");
+    let project = Project::from_template("tests/snapshots/add/no_optional/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1475,16 +1483,16 @@ fn no_optional() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/no_optional.stdout")
-        .stderr_matches_path("tests/snapshots/add/no_optional.stderr");
+        .stdout_matches_path("tests/snapshots/add/no_optional/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/no_optional/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/no_optional.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/no_optional/out", &project_root);
 }
 
 #[cargo_test]
 fn optional() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/optional.in");
+    let project = Project::from_template("tests/snapshots/add/optional/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1494,16 +1502,16 @@ fn optional() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/optional.stdout")
-        .stderr_matches_path("tests/snapshots/add/optional.stderr");
+        .stdout_matches_path("tests/snapshots/add/optional/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/optional/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/optional.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/optional/out", &project_root);
 }
 
 #[cargo_test]
 fn overwrite_default_features() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/overwrite_default_features.in");
+    let project = Project::from_template("tests/snapshots/add/overwrite_default_features/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1513,11 +1521,11 @@ fn overwrite_default_features() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_default_features.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_default_features.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_default_features/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_default_features/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/overwrite_default_features.out",
+        "tests/snapshots/add/overwrite_default_features/out",
         &project_root,
     );
 }
@@ -1526,7 +1534,7 @@ fn overwrite_default_features() {
 fn overwrite_default_features_with_no_default_features() {
     init_registry();
     let project = Project::from_template(
-        "tests/snapshots/add/overwrite_default_features_with_no_default_features.in",
+        "tests/snapshots/add/overwrite_default_features_with_no_default_features/in",
     );
     let project_root = project.root();
     let cwd = &project_root;
@@ -1538,14 +1546,14 @@ fn overwrite_default_features_with_no_default_features() {
         .assert()
         .success()
         .stdout_matches_path(
-            "tests/snapshots/add/overwrite_default_features_with_no_default_features.stdout",
+            "tests/snapshots/add/overwrite_default_features_with_no_default_features/stdout.log",
         )
         .stderr_matches_path(
-            "tests/snapshots/add/overwrite_default_features_with_no_default_features.stderr",
+            "tests/snapshots/add/overwrite_default_features_with_no_default_features/stderr.log",
         );
 
     assert().subset_matches(
-        "tests/snapshots/add/overwrite_default_features_with_no_default_features.out",
+        "tests/snapshots/add/overwrite_default_features_with_no_default_features/out",
         &project_root,
     );
 }
@@ -1553,7 +1561,7 @@ fn overwrite_default_features_with_no_default_features() {
 #[cargo_test]
 fn overwrite_features() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/overwrite_features.in");
+    let project = Project::from_template("tests/snapshots/add/overwrite_features/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1563,16 +1571,16 @@ fn overwrite_features() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_features.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_features.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_features/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_features/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/overwrite_features.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/overwrite_features/out", &project_root);
 }
 
 #[cargo_test]
 fn overwrite_git_with_path() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/overwrite_git_with_path.in");
+    let project = Project::from_template("tests/snapshots/add/overwrite_git_with_path/in");
     let project_root = project.root();
     let cwd = project_root.join("primary");
 
@@ -1582,11 +1590,11 @@ fn overwrite_git_with_path() {
         .current_dir(&cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_git_with_path.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_git_with_path.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_git_with_path/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_git_with_path/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/overwrite_git_with_path.out",
+        "tests/snapshots/add/overwrite_git_with_path/out",
         &project_root,
     );
 }
@@ -1594,7 +1602,7 @@ fn overwrite_git_with_path() {
 #[cargo_test]
 fn overwrite_inline_features() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/overwrite_inline_features.in");
+    let project = Project::from_template("tests/snapshots/add/overwrite_inline_features/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1606,18 +1614,18 @@ fn overwrite_inline_features() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_inline_features.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_inline_features.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_inline_features/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_inline_features/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/overwrite_inline_features.out",
+        "tests/snapshots/add/overwrite_inline_features/out",
         &project_root,
     );
 }
 
 #[cargo_test]
 fn overwrite_inherit_features_noop() {
-    let project = Project::from_template("tests/snapshots/add/overwrite_inherit_features_noop.in");
+    let project = Project::from_template("tests/snapshots/add/overwrite_inherit_features_noop/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1628,11 +1636,11 @@ fn overwrite_inherit_features_noop() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_inherit_features_noop.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_inherit_features_noop.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_inherit_features_noop/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_inherit_features_noop/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/overwrite_inherit_features_noop.out",
+        "tests/snapshots/add/overwrite_inherit_features_noop/out",
         &project_root,
     );
 }
@@ -1640,7 +1648,7 @@ fn overwrite_inherit_features_noop() {
 #[cargo_test]
 fn overwrite_inherit_noop() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/overwrite_inherit_noop.in");
+    let project = Project::from_template("tests/snapshots/add/overwrite_inherit_noop/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1651,11 +1659,11 @@ fn overwrite_inherit_noop() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_inherit_noop.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_inherit_noop.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_inherit_noop/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_inherit_noop/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/overwrite_inherit_noop.out",
+        "tests/snapshots/add/overwrite_inherit_noop/out",
         &project_root,
     );
 }
@@ -1663,7 +1671,7 @@ fn overwrite_inherit_noop() {
 #[cargo_test]
 fn overwrite_inherit_optional_noop() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/overwrite_inherit_optional_noop.in");
+    let project = Project::from_template("tests/snapshots/add/overwrite_inherit_optional_noop/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1674,11 +1682,11 @@ fn overwrite_inherit_optional_noop() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_inherit_optional_noop.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_inherit_optional_noop.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_inherit_optional_noop/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_inherit_optional_noop/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/overwrite_inherit_optional_noop.out",
+        "tests/snapshots/add/overwrite_inherit_optional_noop/out",
         &project_root,
     );
 }
@@ -1686,7 +1694,7 @@ fn overwrite_inherit_optional_noop() {
 #[cargo_test]
 fn overwrite_name_dev_noop() {
     init_alt_registry();
-    let project = Project::from_template("tests/snapshots/add/overwrite_name_dev_noop.in");
+    let project = Project::from_template("tests/snapshots/add/overwrite_name_dev_noop/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1696,11 +1704,11 @@ fn overwrite_name_dev_noop() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_name_dev_noop.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_name_dev_noop.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_name_dev_noop/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_name_dev_noop/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/overwrite_name_dev_noop.out",
+        "tests/snapshots/add/overwrite_name_dev_noop/out",
         &project_root,
     );
 }
@@ -1708,7 +1716,7 @@ fn overwrite_name_dev_noop() {
 #[cargo_test]
 fn overwrite_name_noop() {
     init_alt_registry();
-    let project = Project::from_template("tests/snapshots/add/overwrite_name_noop.in");
+    let project = Project::from_template("tests/snapshots/add/overwrite_name_noop/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1718,16 +1726,16 @@ fn overwrite_name_noop() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_name_noop.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_name_noop.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_name_noop/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_name_noop/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/overwrite_name_noop.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/overwrite_name_noop/out", &project_root);
 }
 
 #[cargo_test]
 fn overwrite_no_default_features() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/overwrite_no_default_features.in");
+    let project = Project::from_template("tests/snapshots/add/overwrite_no_default_features/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1737,11 +1745,11 @@ fn overwrite_no_default_features() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_no_default_features.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_no_default_features.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_no_default_features/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_no_default_features/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/overwrite_no_default_features.out",
+        "tests/snapshots/add/overwrite_no_default_features/out",
         &project_root,
     );
 }
@@ -1750,7 +1758,7 @@ fn overwrite_no_default_features() {
 fn overwrite_no_default_features_with_default_features() {
     init_registry();
     let project = Project::from_template(
-        "tests/snapshots/add/overwrite_no_default_features_with_default_features.in",
+        "tests/snapshots/add/overwrite_no_default_features_with_default_features/in",
     );
     let project_root = project.root();
     let cwd = &project_root;
@@ -1762,14 +1770,14 @@ fn overwrite_no_default_features_with_default_features() {
         .assert()
         .success()
         .stdout_matches_path(
-            "tests/snapshots/add/overwrite_no_default_features_with_default_features.stdout",
+            "tests/snapshots/add/overwrite_no_default_features_with_default_features/stdout.log",
         )
         .stderr_matches_path(
-            "tests/snapshots/add/overwrite_no_default_features_with_default_features.stderr",
+            "tests/snapshots/add/overwrite_no_default_features_with_default_features/stderr.log",
         );
 
     assert().subset_matches(
-        "tests/snapshots/add/overwrite_no_default_features_with_default_features.out",
+        "tests/snapshots/add/overwrite_no_default_features_with_default_features/out",
         &project_root,
     );
 }
@@ -1777,7 +1785,7 @@ fn overwrite_no_default_features_with_default_features() {
 #[cargo_test]
 fn overwrite_no_optional() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/overwrite_no_optional.in");
+    let project = Project::from_template("tests/snapshots/add/overwrite_no_optional/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1787,11 +1795,11 @@ fn overwrite_no_optional() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_no_optional.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_no_optional.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_no_optional/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_no_optional/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/overwrite_no_optional.out",
+        "tests/snapshots/add/overwrite_no_optional/out",
         &project_root,
     );
 }
@@ -1800,7 +1808,7 @@ fn overwrite_no_optional() {
 fn overwrite_no_optional_with_optional() {
     init_registry();
     let project =
-        Project::from_template("tests/snapshots/add/overwrite_no_optional_with_optional.in");
+        Project::from_template("tests/snapshots/add/overwrite_no_optional_with_optional/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1810,11 +1818,11 @@ fn overwrite_no_optional_with_optional() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_no_optional_with_optional.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_no_optional_with_optional.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_no_optional_with_optional/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_no_optional_with_optional/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/overwrite_no_optional_with_optional.out",
+        "tests/snapshots/add/overwrite_no_optional_with_optional/out",
         &project_root,
     );
 }
@@ -1822,7 +1830,7 @@ fn overwrite_no_optional_with_optional() {
 #[cargo_test]
 fn overwrite_optional() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/overwrite_optional.in");
+    let project = Project::from_template("tests/snapshots/add/overwrite_optional/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1832,17 +1840,17 @@ fn overwrite_optional() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_optional.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_optional.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_optional/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_optional/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/overwrite_optional.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/overwrite_optional/out", &project_root);
 }
 
 #[cargo_test]
 fn overwrite_optional_with_no_optional() {
     init_registry();
     let project =
-        Project::from_template("tests/snapshots/add/overwrite_optional_with_no_optional.in");
+        Project::from_template("tests/snapshots/add/overwrite_optional_with_no_optional/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1852,11 +1860,11 @@ fn overwrite_optional_with_no_optional() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_optional_with_no_optional.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_optional_with_no_optional.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_optional_with_no_optional/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_optional_with_no_optional/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/overwrite_optional_with_no_optional.out",
+        "tests/snapshots/add/overwrite_optional_with_no_optional/out",
         &project_root,
     );
 }
@@ -1864,7 +1872,7 @@ fn overwrite_optional_with_no_optional() {
 #[cargo_test]
 fn overwrite_path_noop() {
     init_alt_registry();
-    let project = Project::from_template("tests/snapshots/add/overwrite_path_noop.in");
+    let project = Project::from_template("tests/snapshots/add/overwrite_path_noop/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1874,16 +1882,16 @@ fn overwrite_path_noop() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_path_noop.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_path_noop.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_path_noop/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_path_noop/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/overwrite_path_noop.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/overwrite_path_noop/out", &project_root);
 }
 
 #[cargo_test]
 fn overwrite_path_with_version() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/overwrite_path_with_version.in");
+    let project = Project::from_template("tests/snapshots/add/overwrite_path_with_version/in");
     let project_root = project.root();
     let cwd = project_root.join("primary");
 
@@ -1893,11 +1901,11 @@ fn overwrite_path_with_version() {
         .current_dir(&cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_path_with_version.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_path_with_version.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_path_with_version/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_path_with_version/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/overwrite_path_with_version.out",
+        "tests/snapshots/add/overwrite_path_with_version/out",
         &project_root,
     );
 }
@@ -1905,7 +1913,7 @@ fn overwrite_path_with_version() {
 #[cargo_test]
 fn overwrite_rename_with_no_rename() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/overwrite_rename_with_no_rename.in");
+    let project = Project::from_template("tests/snapshots/add/overwrite_rename_with_no_rename/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1915,11 +1923,11 @@ fn overwrite_rename_with_no_rename() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_rename_with_no_rename.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_rename_with_no_rename.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_rename_with_no_rename/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_rename_with_no_rename/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/overwrite_rename_with_no_rename.out",
+        "tests/snapshots/add/overwrite_rename_with_no_rename/out",
         &project_root,
     );
 }
@@ -1927,7 +1935,7 @@ fn overwrite_rename_with_no_rename() {
 #[cargo_test]
 fn overwrite_rename_with_rename() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/overwrite_rename_with_rename.in");
+    let project = Project::from_template("tests/snapshots/add/overwrite_rename_with_rename/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1937,11 +1945,11 @@ fn overwrite_rename_with_rename() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_rename_with_rename.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_rename_with_rename.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_rename_with_rename/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_rename_with_rename/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/overwrite_rename_with_rename.out",
+        "tests/snapshots/add/overwrite_rename_with_rename/out",
         &project_root,
     );
 }
@@ -1949,7 +1957,7 @@ fn overwrite_rename_with_rename() {
 #[cargo_test]
 fn change_rename_target() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/change_rename_target.in");
+    let project = Project::from_template("tests/snapshots/add/change_rename_target/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1959,11 +1967,11 @@ fn change_rename_target() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/change_rename_target.stdout")
-        .stderr_matches_path("tests/snapshots/add/change_rename_target.stderr");
+        .stdout_matches_path("tests/snapshots/add/change_rename_target/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/change_rename_target/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/change_rename_target.out",
+        "tests/snapshots/add/change_rename_target/out",
         &project_root,
     );
 }
@@ -1972,7 +1980,7 @@ fn change_rename_target() {
 fn overwrite_rename_with_rename_noop() {
     init_registry();
     let project =
-        Project::from_template("tests/snapshots/add/overwrite_rename_with_rename_noop.in");
+        Project::from_template("tests/snapshots/add/overwrite_rename_with_rename_noop/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -1982,11 +1990,11 @@ fn overwrite_rename_with_rename_noop() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_rename_with_rename_noop.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_rename_with_rename_noop.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_rename_with_rename_noop/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_rename_with_rename_noop/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/overwrite_rename_with_rename_noop.out",
+        "tests/snapshots/add/overwrite_rename_with_rename_noop/out",
         &project_root,
     );
 }
@@ -1994,7 +2002,7 @@ fn overwrite_rename_with_rename_noop() {
 #[cargo_test]
 fn overwrite_version_with_git() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/overwrite_version_with_git.in");
+    let project = Project::from_template("tests/snapshots/add/overwrite_version_with_git/in");
     let project_root = project.root();
     let cwd = &project_root;
     let git_dep = cargo_test_support::git::new("versioned-package", |project| {
@@ -2013,11 +2021,11 @@ fn overwrite_version_with_git() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_version_with_git.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_version_with_git.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_version_with_git/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_version_with_git/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/overwrite_version_with_git.out",
+        "tests/snapshots/add/overwrite_version_with_git/out",
         &project_root,
     );
 }
@@ -2025,7 +2033,7 @@ fn overwrite_version_with_git() {
 #[cargo_test]
 fn overwrite_version_with_path() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/overwrite_version_with_path.in");
+    let project = Project::from_template("tests/snapshots/add/overwrite_version_with_path/in");
     let project_root = project.root();
     let cwd = project_root.join("primary");
 
@@ -2035,11 +2043,11 @@ fn overwrite_version_with_path() {
         .current_dir(&cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_version_with_path.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_version_with_path.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_version_with_path/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_version_with_path/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/overwrite_version_with_path.out",
+        "tests/snapshots/add/overwrite_version_with_path/out",
         &project_root,
     );
 }
@@ -2047,7 +2055,7 @@ fn overwrite_version_with_path() {
 #[cargo_test]
 fn overwrite_with_rename() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/overwrite_with_rename.in");
+    let project = Project::from_template("tests/snapshots/add/overwrite_with_rename/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -2057,11 +2065,11 @@ fn overwrite_with_rename() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_with_rename.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_with_rename.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_with_rename/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_with_rename/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/overwrite_with_rename.out",
+        "tests/snapshots/add/overwrite_with_rename/out",
         &project_root,
     );
 }
@@ -2069,7 +2077,7 @@ fn overwrite_with_rename() {
 #[cargo_test]
 fn overwrite_workspace_dep() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/overwrite_workspace_dep.in");
+    let project = Project::from_template("tests/snapshots/add/overwrite_workspace_dep/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -2080,11 +2088,11 @@ fn overwrite_workspace_dep() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_workspace_dep.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_workspace_dep.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_workspace_dep/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_workspace_dep/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/overwrite_workspace_dep.out",
+        "tests/snapshots/add/overwrite_workspace_dep/out",
         &project_root,
     );
 }
@@ -2092,7 +2100,7 @@ fn overwrite_workspace_dep() {
 #[cargo_test]
 fn overwrite_workspace_dep_features() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/overwrite_workspace_dep_features.in");
+    let project = Project::from_template("tests/snapshots/add/overwrite_workspace_dep_features/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -2103,11 +2111,11 @@ fn overwrite_workspace_dep_features() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/overwrite_workspace_dep_features.stdout")
-        .stderr_matches_path("tests/snapshots/add/overwrite_workspace_dep_features.stderr");
+        .stdout_matches_path("tests/snapshots/add/overwrite_workspace_dep_features/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/overwrite_workspace_dep_features/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/overwrite_workspace_dep_features.out",
+        "tests/snapshots/add/overwrite_workspace_dep_features/out",
         &project_root,
     );
 }
@@ -2115,7 +2123,7 @@ fn overwrite_workspace_dep_features() {
 #[cargo_test]
 fn preserve_sorted() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/preserve_sorted.in");
+    let project = Project::from_template("tests/snapshots/add/preserve_sorted/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -2125,16 +2133,16 @@ fn preserve_sorted() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/preserve_sorted.stdout")
-        .stderr_matches_path("tests/snapshots/add/preserve_sorted.stderr");
+        .stdout_matches_path("tests/snapshots/add/preserve_sorted/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/preserve_sorted/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/preserve_sorted.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/preserve_sorted/out", &project_root);
 }
 
 #[cargo_test]
 fn preserve_unsorted() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/preserve_unsorted.in");
+    let project = Project::from_template("tests/snapshots/add/preserve_unsorted/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -2144,16 +2152,16 @@ fn preserve_unsorted() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/preserve_unsorted.stdout")
-        .stderr_matches_path("tests/snapshots/add/preserve_unsorted.stderr");
+        .stdout_matches_path("tests/snapshots/add/preserve_unsorted/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/preserve_unsorted/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/preserve_unsorted.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/preserve_unsorted/out", &project_root);
 }
 
 #[cargo_test]
 fn registry() {
     init_alt_registry();
-    let project = Project::from_template("tests/snapshots/add/registry.in");
+    let project = Project::from_template("tests/snapshots/add/registry/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -2163,16 +2171,16 @@ fn registry() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/registry.stdout")
-        .stderr_matches_path("tests/snapshots/add/registry.stderr");
+        .stdout_matches_path("tests/snapshots/add/registry/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/registry/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/registry.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/registry/out", &project_root);
 }
 
 #[cargo_test]
 fn rename() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/rename.in");
+    let project = Project::from_template("tests/snapshots/add/rename/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -2182,16 +2190,16 @@ fn rename() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/rename.stdout")
-        .stderr_matches_path("tests/snapshots/add/rename.stderr");
+        .stdout_matches_path("tests/snapshots/add/rename/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/rename/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/rename.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/rename/out", &project_root);
 }
 
 #[cargo_test]
 fn target() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/target.in");
+    let project = Project::from_template("tests/snapshots/add/target/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -2201,16 +2209,16 @@ fn target() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/target.stdout")
-        .stderr_matches_path("tests/snapshots/add/target.stderr");
+        .stdout_matches_path("tests/snapshots/add/target/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/target/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/target.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/target/out", &project_root);
 }
 
 #[cargo_test]
 fn target_cfg() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/target_cfg.in");
+    let project = Project::from_template("tests/snapshots/add/target_cfg/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -2220,15 +2228,15 @@ fn target_cfg() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/target_cfg.stdout")
-        .stderr_matches_path("tests/snapshots/add/target_cfg.stderr");
+        .stdout_matches_path("tests/snapshots/add/target_cfg/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/target_cfg/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/target_cfg.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/target_cfg/out", &project_root);
 }
 
 #[cargo_test]
 fn unknown_inherited_feature() {
-    let project = Project::from_template("tests/snapshots/add/unknown_inherited_feature.in");
+    let project = Project::from_template("tests/snapshots/add/unknown_inherited_feature/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -2239,11 +2247,11 @@ fn unknown_inherited_feature() {
         .current_dir(cwd)
         .assert()
         .failure()
-        .stdout_matches_path("tests/snapshots/add/unknown_inherited_feature.stdout")
-        .stderr_matches_path("tests/snapshots/add/unknown_inherited_feature.stderr");
+        .stdout_matches_path("tests/snapshots/add/unknown_inherited_feature/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/unknown_inherited_feature/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/unknown_inherited_feature.out",
+        "tests/snapshots/add/unknown_inherited_feature/out",
         &project_root,
     );
 }
@@ -2251,7 +2259,7 @@ fn unknown_inherited_feature() {
 #[cargo_test]
 fn vers() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/vers.in");
+    let project = Project::from_template("tests/snapshots/add/vers/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -2261,16 +2269,16 @@ fn vers() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/vers.stdout")
-        .stderr_matches_path("tests/snapshots/add/vers.stderr");
+        .stdout_matches_path("tests/snapshots/add/vers/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/vers/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/vers.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/vers/out", &project_root);
 }
 
 #[cargo_test]
 fn workspace_path() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/workspace_path.in");
+    let project = Project::from_template("tests/snapshots/add/workspace_path/in");
     let project_root = project.root();
     let cwd = project_root.join("primary");
 
@@ -2280,16 +2288,16 @@ fn workspace_path() {
         .current_dir(&cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/workspace_path.stdout")
-        .stderr_matches_path("tests/snapshots/add/workspace_path.stderr");
+        .stdout_matches_path("tests/snapshots/add/workspace_path/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/workspace_path/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/workspace_path.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/workspace_path/out", &project_root);
 }
 
 #[cargo_test]
 fn workspace_path_dev() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/workspace_path_dev.in");
+    let project = Project::from_template("tests/snapshots/add/workspace_path_dev/in");
     let project_root = project.root();
     let cwd = project_root.join("primary");
 
@@ -2299,16 +2307,16 @@ fn workspace_path_dev() {
         .current_dir(&cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/workspace_path_dev.stdout")
-        .stderr_matches_path("tests/snapshots/add/workspace_path_dev.stderr");
+        .stdout_matches_path("tests/snapshots/add/workspace_path_dev/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/workspace_path_dev/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/workspace_path_dev.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/workspace_path_dev/out", &project_root);
 }
 
 #[cargo_test]
 fn workspace_name() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/workspace_name.in");
+    let project = Project::from_template("tests/snapshots/add/workspace_name/in");
     let project_root = project.root();
     let cwd = project_root.join("primary");
 
@@ -2318,16 +2326,16 @@ fn workspace_name() {
         .current_dir(&cwd)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/add/workspace_name.stdout")
-        .stderr_matches_path("tests/snapshots/add/workspace_name.stderr");
+        .stdout_matches_path("tests/snapshots/add/workspace_name/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/workspace_name/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/workspace_name.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/workspace_name/out", &project_root);
 }
 
 #[cargo_test]
 fn deprecated_default_features() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/deprecated_default_features.in");
+    let project = Project::from_template("tests/snapshots/add/deprecated_default_features/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -2337,11 +2345,11 @@ fn deprecated_default_features() {
         .current_dir(&cwd)
         .assert()
         .failure()
-        .stdout_matches_path("tests/snapshots/add/deprecated_default_features.stdout")
-        .stderr_matches_path("tests/snapshots/add/deprecated_default_features.stderr");
+        .stdout_matches_path("tests/snapshots/add/deprecated_default_features/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/deprecated_default_features/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/add/deprecated_default_features.out",
+        "tests/snapshots/add/deprecated_default_features/out",
         &project_root,
     );
 }
@@ -2349,7 +2357,7 @@ fn deprecated_default_features() {
 #[cargo_test]
 fn deprecated_section() {
     init_registry();
-    let project = Project::from_template("tests/snapshots/add/deprecated_section.in");
+    let project = Project::from_template("tests/snapshots/add/deprecated_section/in");
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -2359,8 +2367,8 @@ fn deprecated_section() {
         .current_dir(&cwd)
         .assert()
         .failure()
-        .stdout_matches_path("tests/snapshots/add/deprecated_section.stdout")
-        .stderr_matches_path("tests/snapshots/add/deprecated_section.stderr");
+        .stdout_matches_path("tests/snapshots/add/deprecated_section/stdout.log")
+        .stderr_matches_path("tests/snapshots/add/deprecated_section/stderr.log");
 
-    assert().subset_matches("tests/snapshots/add/deprecated_section.out", &project_root);
+    assert().subset_matches("tests/snapshots/add/deprecated_section/out", &project_root);
 }
diff --git a/tests/testsuite/init.rs b/tests/testsuite/init.rs
index ebb05f3885a..819dc14b3cb 100644
--- a/tests/testsuite/init.rs
+++ b/tests/testsuite/init.rs
@@ -20,7 +20,7 @@ fn mercurial_available() -> bool {
 
 #[cargo_test]
 fn simple_lib() {
-    let project = Project::from_template("tests/snapshots/init/simple_lib.in");
+    let project = Project::from_template("tests/snapshots/init/simple_lib/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -28,10 +28,10 @@ fn simple_lib() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/simple_lib.stdout")
-        .stderr_matches_path("tests/snapshots/init/simple_lib.stderr");
+        .stdout_matches_path("tests/snapshots/init/simple_lib/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/simple_lib/stderr.log");
 
-    assert().subset_matches("tests/snapshots/init/simple_lib.out", project_root);
+    assert().subset_matches("tests/snapshots/init/simple_lib/out", project_root);
     assert!(!project_root.join(".gitignore").is_file());
 
     snapbox::cmd::Command::cargo()
@@ -44,7 +44,7 @@ fn simple_lib() {
 
 #[cargo_test]
 fn simple_bin() {
-    let project = Project::from_template("tests/snapshots/init/simple_bin.in");
+    let project = Project::from_template("tests/snapshots/init/simple_bin/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -52,10 +52,10 @@ fn simple_bin() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/simple_bin.stdout")
-        .stderr_matches_path("tests/snapshots/init/simple_bin.stderr");
+        .stdout_matches_path("tests/snapshots/init/simple_bin/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/simple_bin/stderr.log");
 
-    assert().subset_matches("tests/snapshots/init/simple_bin.out", project_root);
+    assert().subset_matches("tests/snapshots/init/simple_bin/out", project_root);
     assert!(!project_root.join(".gitignore").is_file());
 
     snapbox::cmd::Command::cargo()
@@ -68,7 +68,7 @@ fn simple_bin() {
 
 #[cargo_test]
 fn simple_git_ignore_exists() {
-    let project = Project::from_template("tests/snapshots/init/simple_git_ignore_exists.in");
+    let project = Project::from_template("tests/snapshots/init/simple_git_ignore_exists/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -76,11 +76,11 @@ fn simple_git_ignore_exists() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/simple_git_ignore_exists.stdout")
-        .stderr_matches_path("tests/snapshots/init/simple_git_ignore_exists.stderr");
+        .stdout_matches_path("tests/snapshots/init/simple_git_ignore_exists/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/simple_git_ignore_exists/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/init/simple_git_ignore_exists.out",
+        "tests/snapshots/init/simple_git_ignore_exists/out",
         project_root,
     );
     assert!(project_root.join(".git").is_dir());
@@ -95,7 +95,7 @@ fn simple_git_ignore_exists() {
 #[cargo_test]
 fn git_ignore_exists_no_conflicting_entries() {
     let project =
-        Project::from_template("tests/snapshots/init/git_ignore_exists_no_conflicting_entries.in");
+        Project::from_template("tests/snapshots/init/git_ignore_exists_no_conflicting_entries/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -103,13 +103,15 @@ fn git_ignore_exists_no_conflicting_entries() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/git_ignore_exists_no_conflicting_entries.stdout")
+        .stdout_matches_path(
+            "tests/snapshots/init/git_ignore_exists_no_conflicting_entries/stdout.log",
+        )
         .stderr_matches_path(
-            "tests/snapshots/init/git_ignore_exists_no_conflicting_entries.stderr",
+            "tests/snapshots/init/git_ignore_exists_no_conflicting_entries/stderr.log",
         );
 
     assert().subset_matches(
-        "tests/snapshots/init/git_ignore_exists_no_conflicting_entries.out",
+        "tests/snapshots/init/git_ignore_exists_no_conflicting_entries/out",
         project_root,
     );
     assert!(project_root.join(".git").is_dir());
@@ -124,15 +126,15 @@ fn both_lib_and_bin() {
         .current_dir(&cwd)
         .assert()
         .code(101)
-        .stdout_matches_path("tests/snapshots/init/both_lib_and_bin.stdout")
-        .stderr_matches_path("tests/snapshots/init/both_lib_and_bin.stderr");
+        .stdout_matches_path("tests/snapshots/init/both_lib_and_bin/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/both_lib_and_bin/stderr.log");
 
     assert!(!cwd.join("Cargo.toml").is_file());
 }
 
 #[cargo_test]
 fn bin_already_exists_explicit() {
-    let project = Project::from_template("tests/snapshots/init/bin_already_exists_explicit.in");
+    let project = Project::from_template("tests/snapshots/init/bin_already_exists_explicit/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -140,18 +142,18 @@ fn bin_already_exists_explicit() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/bin_already_exists_explicit.stdout")
-        .stderr_matches_path("tests/snapshots/init/bin_already_exists_explicit.stderr");
+        .stdout_matches_path("tests/snapshots/init/bin_already_exists_explicit/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/bin_already_exists_explicit/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/init/bin_already_exists_explicit.out",
+        "tests/snapshots/init/bin_already_exists_explicit/out",
         project_root,
     );
 }
 
 #[cargo_test]
 fn bin_already_exists_implicit() {
-    let project = Project::from_template("tests/snapshots/init/bin_already_exists_implicit.in");
+    let project = Project::from_template("tests/snapshots/init/bin_already_exists_implicit/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -159,11 +161,11 @@ fn bin_already_exists_implicit() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/bin_already_exists_implicit.stdout")
-        .stderr_matches_path("tests/snapshots/init/bin_already_exists_implicit.stderr");
+        .stdout_matches_path("tests/snapshots/init/bin_already_exists_implicit/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/bin_already_exists_implicit/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/init/bin_already_exists_implicit.out",
+        "tests/snapshots/init/bin_already_exists_implicit/out",
         project_root,
     );
 }
@@ -171,7 +173,7 @@ fn bin_already_exists_implicit() {
 #[cargo_test]
 fn bin_already_exists_explicit_nosrc() {
     let project =
-        Project::from_template("tests/snapshots/init/bin_already_exists_explicit_nosrc.in");
+        Project::from_template("tests/snapshots/init/bin_already_exists_explicit_nosrc/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -179,11 +181,11 @@ fn bin_already_exists_explicit_nosrc() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/bin_already_exists_explicit_nosrc.stdout")
-        .stderr_matches_path("tests/snapshots/init/bin_already_exists_explicit_nosrc.stderr");
+        .stdout_matches_path("tests/snapshots/init/bin_already_exists_explicit_nosrc/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/bin_already_exists_explicit_nosrc/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/init/bin_already_exists_explicit_nosrc.out",
+        "tests/snapshots/init/bin_already_exists_explicit_nosrc/out",
         project_root,
     );
     assert!(!project_root.join("src").is_dir());
@@ -192,7 +194,7 @@ fn bin_already_exists_explicit_nosrc() {
 #[cargo_test]
 fn bin_already_exists_implicit_nosrc() {
     let project =
-        Project::from_template("tests/snapshots/init/bin_already_exists_implicit_nosrc.in");
+        Project::from_template("tests/snapshots/init/bin_already_exists_implicit_nosrc/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -200,11 +202,11 @@ fn bin_already_exists_implicit_nosrc() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/bin_already_exists_implicit_nosrc.stdout")
-        .stderr_matches_path("tests/snapshots/init/bin_already_exists_implicit_nosrc.stderr");
+        .stdout_matches_path("tests/snapshots/init/bin_already_exists_implicit_nosrc/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/bin_already_exists_implicit_nosrc/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/init/bin_already_exists_implicit_nosrc.out",
+        "tests/snapshots/init/bin_already_exists_implicit_nosrc/out",
         project_root,
     );
     assert!(!project_root.join("src").is_dir());
@@ -213,7 +215,7 @@ fn bin_already_exists_implicit_nosrc() {
 #[cargo_test]
 fn bin_already_exists_implicit_namenosrc() {
     let project =
-        Project::from_template("tests/snapshots/init/bin_already_exists_implicit_namenosrc.in");
+        Project::from_template("tests/snapshots/init/bin_already_exists_implicit_namenosrc/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -221,11 +223,15 @@ fn bin_already_exists_implicit_namenosrc() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/bin_already_exists_implicit_namenosrc.stdout")
-        .stderr_matches_path("tests/snapshots/init/bin_already_exists_implicit_namenosrc.stderr");
+        .stdout_matches_path(
+            "tests/snapshots/init/bin_already_exists_implicit_namenosrc/stdout.log",
+        )
+        .stderr_matches_path(
+            "tests/snapshots/init/bin_already_exists_implicit_namenosrc/stderr.log",
+        );
 
     assert().subset_matches(
-        "tests/snapshots/init/bin_already_exists_implicit_namenosrc.out",
+        "tests/snapshots/init/bin_already_exists_implicit_namenosrc/out",
         project_root,
     );
     assert!(!project_root.join("src").is_dir());
@@ -234,7 +240,7 @@ fn bin_already_exists_implicit_namenosrc() {
 #[cargo_test]
 fn bin_already_exists_implicit_namesrc() {
     let project =
-        Project::from_template("tests/snapshots/init/bin_already_exists_implicit_namesrc.in");
+        Project::from_template("tests/snapshots/init/bin_already_exists_implicit_namesrc/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -242,11 +248,11 @@ fn bin_already_exists_implicit_namesrc() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/bin_already_exists_implicit_namesrc.stdout")
-        .stderr_matches_path("tests/snapshots/init/bin_already_exists_implicit_namesrc.stderr");
+        .stdout_matches_path("tests/snapshots/init/bin_already_exists_implicit_namesrc/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/bin_already_exists_implicit_namesrc/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/init/bin_already_exists_implicit_namesrc.out",
+        "tests/snapshots/init/bin_already_exists_implicit_namesrc/out",
         project_root,
     );
     assert!(!project_root.join("src/main.rs").is_file());
@@ -254,7 +260,7 @@ fn bin_already_exists_implicit_namesrc() {
 
 #[cargo_test]
 fn confused_by_multiple_lib_files() {
-    let project = Project::from_template("tests/snapshots/init/confused_by_multiple_lib_files.in");
+    let project = Project::from_template("tests/snapshots/init/confused_by_multiple_lib_files/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -262,11 +268,11 @@ fn confused_by_multiple_lib_files() {
         .current_dir(project_root)
         .assert()
         .code(101)
-        .stdout_matches_path("tests/snapshots/init/confused_by_multiple_lib_files.stdout")
-        .stderr_matches_path("tests/snapshots/init/confused_by_multiple_lib_files.stderr");
+        .stdout_matches_path("tests/snapshots/init/confused_by_multiple_lib_files/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/confused_by_multiple_lib_files/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/init/confused_by_multiple_lib_files.out",
+        "tests/snapshots/init/confused_by_multiple_lib_files/out",
         project_root,
     );
     assert!(!project_root.join("Cargo.toml").is_file());
@@ -274,7 +280,7 @@ fn confused_by_multiple_lib_files() {
 
 #[cargo_test]
 fn multibin_project_name_clash() {
-    let project = Project::from_template("tests/snapshots/init/multibin_project_name_clash.in");
+    let project = Project::from_template("tests/snapshots/init/multibin_project_name_clash/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -282,11 +288,11 @@ fn multibin_project_name_clash() {
         .current_dir(project_root)
         .assert()
         .code(101)
-        .stdout_matches_path("tests/snapshots/init/multibin_project_name_clash.stdout")
-        .stderr_matches_path("tests/snapshots/init/multibin_project_name_clash.stderr");
+        .stdout_matches_path("tests/snapshots/init/multibin_project_name_clash/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/multibin_project_name_clash/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/init/multibin_project_name_clash.out",
+        "tests/snapshots/init/multibin_project_name_clash/out",
         project_root,
     );
     assert!(!project_root.join("Cargo.toml").is_file());
@@ -294,7 +300,7 @@ fn multibin_project_name_clash() {
 
 #[cargo_test]
 fn lib_already_exists_src() {
-    let project = Project::from_template("tests/snapshots/init/lib_already_exists_src.in");
+    let project = Project::from_template("tests/snapshots/init/lib_already_exists_src/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -302,11 +308,11 @@ fn lib_already_exists_src() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/lib_already_exists_src.stdout")
-        .stderr_matches_path("tests/snapshots/init/lib_already_exists_src.stderr");
+        .stdout_matches_path("tests/snapshots/init/lib_already_exists_src/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/lib_already_exists_src/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/init/lib_already_exists_src.out",
+        "tests/snapshots/init/lib_already_exists_src/out",
         project_root,
     );
     assert!(!project_root.join("src/main.rs").is_file());
@@ -314,7 +320,7 @@ fn lib_already_exists_src() {
 
 #[cargo_test]
 fn lib_already_exists_nosrc() {
-    let project = Project::from_template("tests/snapshots/init/lib_already_exists_nosrc.in");
+    let project = Project::from_template("tests/snapshots/init/lib_already_exists_nosrc/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -322,11 +328,11 @@ fn lib_already_exists_nosrc() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/lib_already_exists_nosrc.stdout")
-        .stderr_matches_path("tests/snapshots/init/lib_already_exists_nosrc.stderr");
+        .stdout_matches_path("tests/snapshots/init/lib_already_exists_nosrc/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/lib_already_exists_nosrc/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/init/lib_already_exists_nosrc.out",
+        "tests/snapshots/init/lib_already_exists_nosrc/out",
         project_root,
     );
     assert!(!project_root.join("src/main.rs").is_file());
@@ -334,7 +340,7 @@ fn lib_already_exists_nosrc() {
 
 #[cargo_test]
 fn simple_git() {
-    let project = Project::from_template("tests/snapshots/init/simple_git.in");
+    let project = Project::from_template("tests/snapshots/init/simple_git/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -342,16 +348,16 @@ fn simple_git() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/simple_git.stdout")
-        .stderr_matches_path("tests/snapshots/init/simple_git.stderr");
+        .stdout_matches_path("tests/snapshots/init/simple_git/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/simple_git/stderr.log");
 
-    assert().subset_matches("tests/snapshots/init/simple_git.out", project_root);
+    assert().subset_matches("tests/snapshots/init/simple_git/out", project_root);
     assert!(project_root.join(".git").is_dir());
 }
 
 #[cargo_test]
 fn auto_git() {
-    let project = Project::from_template("tests/snapshots/init/auto_git.in");
+    let project = Project::from_template("tests/snapshots/init/auto_git/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -359,10 +365,10 @@ fn auto_git() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/auto_git.stdout")
-        .stderr_matches_path("tests/snapshots/init/auto_git.stderr");
+        .stdout_matches_path("tests/snapshots/init/auto_git/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/auto_git/stderr.log");
 
-    assert().subset_matches("tests/snapshots/init/auto_git.out", &project_root);
+    assert().subset_matches("tests/snapshots/init/auto_git/out", &project_root);
     assert!(project_root.join(".git").is_dir());
 }
 
@@ -376,8 +382,8 @@ fn invalid_dir_name() {
         .current_dir(foo)
         .assert()
         .code(101)
-        .stdout_matches_path("tests/snapshots/init/invalid_dir_name.stdout")
-        .stderr_matches_path("tests/snapshots/init/invalid_dir_name.stderr");
+        .stdout_matches_path("tests/snapshots/init/invalid_dir_name/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/invalid_dir_name/stderr.log");
 
     assert!(!foo.join("Cargo.toml").is_file());
 }
@@ -392,8 +398,8 @@ fn reserved_name() {
         .current_dir(project_root)
         .assert()
         .code(101)
-        .stdout_matches_path("tests/snapshots/init/reserved_name.stdout")
-        .stderr_matches_path("tests/snapshots/init/reserved_name.stderr");
+        .stdout_matches_path("tests/snapshots/init/reserved_name/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/reserved_name/stderr.log");
 
     assert!(!project_root.join("Cargo.toml").is_file());
 }
@@ -409,16 +415,16 @@ fn git_autodetect() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/git_autodetect.stdout")
-        .stderr_matches_path("tests/snapshots/init/git_autodetect.stderr");
+        .stdout_matches_path("tests/snapshots/init/git_autodetect/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/git_autodetect/stderr.log");
 
-    assert().subset_matches("tests/snapshots/init/git_autodetect.out", project_root);
+    assert().subset_matches("tests/snapshots/init/git_autodetect/out", project_root);
     assert!(project_root.join(".git").is_dir());
 }
 
 #[cargo_test]
 fn mercurial_autodetect() {
-    let project = Project::from_template("tests/snapshots/init/mercurial_autodetect.in");
+    let project = Project::from_template("tests/snapshots/init/mercurial_autodetect/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -426,11 +432,11 @@ fn mercurial_autodetect() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/mercurial_autodetect.stdout")
-        .stderr_matches_path("tests/snapshots/init/mercurial_autodetect.stderr");
+        .stdout_matches_path("tests/snapshots/init/mercurial_autodetect/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/mercurial_autodetect/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/init/mercurial_autodetect.out",
+        "tests/snapshots/init/mercurial_autodetect/out",
         project_root,
     );
     assert!(!project_root.join(".git").is_dir());
@@ -438,7 +444,7 @@ fn mercurial_autodetect() {
 
 #[cargo_test]
 fn fossil_autodetect() {
-    let project = Project::from_template("tests/snapshots/init/fossil_autodetect.in");
+    let project = Project::from_template("tests/snapshots/init/fossil_autodetect/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -446,16 +452,16 @@ fn fossil_autodetect() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/fossil_autodetect.stdout")
-        .stderr_matches_path("tests/snapshots/init/fossil_autodetect.stderr");
+        .stdout_matches_path("tests/snapshots/init/fossil_autodetect/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/fossil_autodetect/stderr.log");
 
-    assert().subset_matches("tests/snapshots/init/fossil_autodetect.out", project_root);
+    assert().subset_matches("tests/snapshots/init/fossil_autodetect/out", project_root);
     assert!(!project_root.join(".git").is_dir());
 }
 
 #[cargo_test]
 fn pijul_autodetect() {
-    let project = Project::from_template("tests/snapshots/init/pijul_autodetect.in");
+    let project = Project::from_template("tests/snapshots/init/pijul_autodetect/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -463,10 +469,10 @@ fn pijul_autodetect() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/pijul_autodetect.stdout")
-        .stderr_matches_path("tests/snapshots/init/pijul_autodetect.stderr");
+        .stdout_matches_path("tests/snapshots/init/pijul_autodetect/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/pijul_autodetect/stderr.log");
 
-    assert().subset_matches("tests/snapshots/init/pijul_autodetect.out", project_root);
+    assert().subset_matches("tests/snapshots/init/pijul_autodetect/out", project_root);
     assert!(!project_root.join(".git").is_dir());
 }
 
@@ -476,7 +482,7 @@ fn simple_hg() {
         return;
     }
 
-    let project = Project::from_template("tests/snapshots/init/simple_hg.in");
+    let project = Project::from_template("tests/snapshots/init/simple_hg/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -484,16 +490,16 @@ fn simple_hg() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/simple_hg.stdout")
-        .stderr_matches_path("tests/snapshots/init/simple_hg.stderr");
+        .stdout_matches_path("tests/snapshots/init/simple_hg/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/simple_hg/stderr.log");
 
-    assert().subset_matches("tests/snapshots/init/simple_hg.out", project_root);
+    assert().subset_matches("tests/snapshots/init/simple_hg/out", project_root);
     assert!(!project_root.join(".git").is_dir());
 }
 
 #[cargo_test]
 fn simple_hg_ignore_exists() {
-    let project = Project::from_template("tests/snapshots/init/simple_hg_ignore_exists.in");
+    let project = Project::from_template("tests/snapshots/init/simple_hg_ignore_exists/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -501,11 +507,11 @@ fn simple_hg_ignore_exists() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/simple_hg_ignore_exists.stdout")
-        .stderr_matches_path("tests/snapshots/init/simple_hg_ignore_exists.stderr");
+        .stdout_matches_path("tests/snapshots/init/simple_hg_ignore_exists/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/simple_hg_ignore_exists/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/init/simple_hg_ignore_exists.out",
+        "tests/snapshots/init/simple_hg_ignore_exists/out",
         project_root,
     );
     assert!(!project_root.join(".git").is_dir());
@@ -513,7 +519,7 @@ fn simple_hg_ignore_exists() {
 
 #[cargo_test]
 fn inferred_lib_with_git() {
-    let project = Project::from_template("tests/snapshots/init/inferred_lib_with_git.in");
+    let project = Project::from_template("tests/snapshots/init/inferred_lib_with_git/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -521,18 +527,18 @@ fn inferred_lib_with_git() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/inferred_lib_with_git.stdout")
-        .stderr_matches_path("tests/snapshots/init/inferred_lib_with_git.stderr");
+        .stdout_matches_path("tests/snapshots/init/inferred_lib_with_git/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/inferred_lib_with_git/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/init/inferred_lib_with_git.out",
+        "tests/snapshots/init/inferred_lib_with_git/out",
         project_root,
     );
 }
 
 #[cargo_test]
 fn explicit_bin_with_git() {
-    let project = Project::from_template("tests/snapshots/init/explicit_bin_with_git.in");
+    let project = Project::from_template("tests/snapshots/init/explicit_bin_with_git/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -540,18 +546,18 @@ fn explicit_bin_with_git() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/explicit_bin_with_git.stdout")
-        .stderr_matches_path("tests/snapshots/init/explicit_bin_with_git.stderr");
+        .stdout_matches_path("tests/snapshots/init/explicit_bin_with_git/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/explicit_bin_with_git/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/init/explicit_bin_with_git.out",
+        "tests/snapshots/init/explicit_bin_with_git/out",
         project_root,
     );
 }
 
 #[cargo_test]
 fn inferred_bin_with_git() {
-    let project = Project::from_template("tests/snapshots/init/inferred_bin_with_git.in");
+    let project = Project::from_template("tests/snapshots/init/inferred_bin_with_git/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -559,18 +565,18 @@ fn inferred_bin_with_git() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/inferred_bin_with_git.stdout")
-        .stderr_matches_path("tests/snapshots/init/inferred_bin_with_git.stderr");
+        .stdout_matches_path("tests/snapshots/init/inferred_bin_with_git/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/inferred_bin_with_git/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/init/inferred_bin_with_git.out",
+        "tests/snapshots/init/inferred_bin_with_git/out",
         project_root,
     );
 }
 
 #[cargo_test]
 fn with_argument() {
-    let project = Project::from_template("tests/snapshots/init/with_argument.in");
+    let project = Project::from_template("tests/snapshots/init/with_argument/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -578,10 +584,10 @@ fn with_argument() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/with_argument.stdout")
-        .stderr_matches_path("tests/snapshots/init/with_argument.stderr");
+        .stdout_matches_path("tests/snapshots/init/with_argument/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/with_argument/stderr.log");
 
-    assert().subset_matches("tests/snapshots/init/with_argument.out", project_root);
+    assert().subset_matches("tests/snapshots/init/with_argument/out", project_root);
 }
 
 #[cargo_test]
@@ -591,8 +597,8 @@ fn unknown_flags() {
         .current_dir(paths::root())
         .assert()
         .code(1)
-        .stdout_matches_path("tests/snapshots/init/unknown_flags.stdout")
-        .stderr_matches_path("tests/snapshots/init/unknown_flags.stderr");
+        .stdout_matches_path("tests/snapshots/init/unknown_flags/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/unknown_flags/stderr.log");
 }
 
 #[cfg(not(windows))]
@@ -603,8 +609,8 @@ fn no_filename() {
         .current_dir(paths::root())
         .assert()
         .code(101)
-        .stdout_matches_path("tests/snapshots/init/no_filename.stdout")
-        .stderr_matches_path("tests/snapshots/init/no_filename.stderr");
+        .stdout_matches_path("tests/snapshots/init/no_filename/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/no_filename/stderr.log");
 }
 
 #[cargo_test]
@@ -613,7 +619,7 @@ fn formats_source() {
         return;
     }
 
-    let project = Project::from_template("tests/snapshots/init/formats_source.in");
+    let project = Project::from_template("tests/snapshots/init/formats_source/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -621,16 +627,16 @@ fn formats_source() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/formats_source.stdout")
-        .stderr_matches_path("tests/snapshots/init/formats_source.stderr");
+        .stdout_matches_path("tests/snapshots/init/formats_source/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/formats_source/stderr.log");
 
-    assert().subset_matches("tests/snapshots/init/formats_source.out", project_root);
+    assert().subset_matches("tests/snapshots/init/formats_source/out", project_root);
 }
 
 #[cargo_test]
 fn ignores_failure_to_format_source() {
     let project =
-        Project::from_template("tests/snapshots/init/ignores_failure_to_format_source.in");
+        Project::from_template("tests/snapshots/init/ignores_failure_to_format_source/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -639,11 +645,11 @@ fn ignores_failure_to_format_source() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/ignores_failure_to_format_source.stdout")
-        .stderr_matches_path("tests/snapshots/init/ignores_failure_to_format_source.stderr");
+        .stdout_matches_path("tests/snapshots/init/ignores_failure_to_format_source/stdout.log")
+        .stderr_matches_path("tests/snapshots/init/ignores_failure_to_format_source/stderr.log");
 
     assert().subset_matches(
-        "tests/snapshots/init/ignores_failure_to_format_source.out",
+        "tests/snapshots/init/ignores_failure_to_format_source/out",
         project_root,
     );
 }
@@ -651,7 +657,7 @@ fn ignores_failure_to_format_source() {
 #[cargo_test]
 fn creates_binary_when_instructed_and_has_lib_file() {
     let project = Project::from_template(
-        "tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file.in",
+        "tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file/in",
     );
     let project_root = &project.root();
 
@@ -661,14 +667,14 @@ fn creates_binary_when_instructed_and_has_lib_file() {
         .assert()
         .success()
         .stdout_matches_path(
-            "tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file.stdout",
+            "tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file/stdout.log",
         )
         .stderr_matches_path(
-            "tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file.stderr",
+            "tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file/stderr.log",
         );
 
     assert().subset_matches(
-        "tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file.out",
+        "tests/snapshots/init/creates_binary_when_instructed_and_has_lib_file/out",
         project_root,
     );
 }
@@ -676,7 +682,7 @@ fn creates_binary_when_instructed_and_has_lib_file() {
 #[cargo_test]
 fn creates_library_when_instructed_and_has_bin_file() {
     let project = Project::from_template(
-        "tests/snapshots/init/creates_library_when_instructed_and_has_bin_file.in",
+        "tests/snapshots/init/creates_library_when_instructed_and_has_bin_file/in",
     );
     let project_root = &project.root();
 
@@ -686,14 +692,14 @@ fn creates_library_when_instructed_and_has_bin_file() {
         .assert()
         .success()
         .stdout_matches_path(
-            "tests/snapshots/init/creates_library_when_instructed_and_has_bin_file.stdout",
+            "tests/snapshots/init/creates_library_when_instructed_and_has_bin_file/stdout.log",
         )
         .stderr_matches_path(
-            "tests/snapshots/init/creates_library_when_instructed_and_has_bin_file.stderr",
+            "tests/snapshots/init/creates_library_when_instructed_and_has_bin_file/stderr.log",
         );
 
     assert().subset_matches(
-        "tests/snapshots/init/creates_library_when_instructed_and_has_bin_file.out",
+        "tests/snapshots/init/creates_library_when_instructed_and_has_bin_file/out",
         project_root,
     );
 }
@@ -701,7 +707,7 @@ fn creates_library_when_instructed_and_has_bin_file() {
 #[cargo_test]
 fn creates_binary_when_both_binlib_present() {
     let project =
-        Project::from_template("tests/snapshots/init/creates_binary_when_both_binlib_present.in");
+        Project::from_template("tests/snapshots/init/creates_binary_when_both_binlib_present/in");
     let project_root = &project.root();
 
     snapbox::cmd::Command::cargo()
@@ -709,11 +715,15 @@ fn creates_binary_when_both_binlib_present() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches_path("tests/snapshots/init/creates_binary_when_both_binlib_present.stdout")
-        .stderr_matches_path("tests/snapshots/init/creates_binary_when_both_binlib_present.stderr");
+        .stdout_matches_path(
+            "tests/snapshots/init/creates_binary_when_both_binlib_present/stdout.log",
+        )
+        .stderr_matches_path(
+            "tests/snapshots/init/creates_binary_when_both_binlib_present/stderr.log",
+        );
 
     assert().subset_matches(
-        "tests/snapshots/init/creates_binary_when_both_binlib_present.out",
+        "tests/snapshots/init/creates_binary_when_both_binlib_present/out",
         project_root,
     );
 }
@@ -721,7 +731,7 @@ fn creates_binary_when_both_binlib_present() {
 #[cargo_test]
 fn cant_create_library_when_both_binlib_present() {
     let project = Project::from_template(
-        "tests/snapshots/init/cant_create_library_when_both_binlib_present.in",
+        "tests/snapshots/init/cant_create_library_when_both_binlib_present/in",
     );
     let project_root = &project.root();
 
@@ -731,9 +741,9 @@ fn cant_create_library_when_both_binlib_present() {
         .assert()
         .code(101)
         .stdout_matches_path(
-            "tests/snapshots/init/cant_create_library_when_both_binlib_present.stdout",
+            "tests/snapshots/init/cant_create_library_when_both_binlib_present/stdout.log",
         )
         .stderr_matches_path(
-            "tests/snapshots/init/cant_create_library_when_both_binlib_present.stderr",
+            "tests/snapshots/init/cant_create_library_when_both_binlib_present/stderr.log",
         );
 }