diff --git a/sbt-app/src/sbt-test/project/settings/changes/local.sbt b/sbt-app/src/sbt-test/project/settings/changes/local.sbt
deleted file mode 100644
index 8ccec0f28..000000000
--- a/sbt-app/src/sbt-test/project/settings/changes/local.sbt
+++ /dev/null
@@ -1 +0,0 @@
-maxErrors ~= (_ + 3)
diff --git a/sbt-app/src/sbt-test/project/Class.forName/build.sbt b/sbt-app/src/sbt-test/project1/Class.forName/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/Class.forName/build.sbt
rename to sbt-app/src/sbt-test/project1/Class.forName/build.sbt
diff --git a/sbt-app/src/sbt-test/project/Class.forName/changes/build2.sbt b/sbt-app/src/sbt-test/project1/Class.forName/changes/build2.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/Class.forName/changes/build2.sbt
rename to sbt-app/src/sbt-test/project1/Class.forName/changes/build2.sbt
diff --git a/sbt-app/src/sbt-test/project/Class.forName/src/main/scala/Test.scala b/sbt-app/src/sbt-test/project1/Class.forName/src/main/scala/Test.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/Class.forName/src/main/scala/Test.scala
rename to sbt-app/src/sbt-test/project1/Class.forName/src/main/scala/Test.scala
diff --git a/sbt-app/src/sbt-test/project/Class.forName/test b/sbt-app/src/sbt-test/project1/Class.forName/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/Class.forName/test
rename to sbt-app/src/sbt-test/project1/Class.forName/test
diff --git a/sbt-app/src/sbt-test/project/aggregate/build.sbt b/sbt-app/src/sbt-test/project1/aggregate/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/aggregate/build.sbt
rename to sbt-app/src/sbt-test/project1/aggregate/build.sbt
diff --git a/sbt-app/src/sbt-test/project/aggregate/projA/A.scala b/sbt-app/src/sbt-test/project1/aggregate/projA/A.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/aggregate/projA/A.scala
rename to sbt-app/src/sbt-test/project1/aggregate/projA/A.scala
diff --git a/sbt-app/src/sbt-test/project/aggregate/projA/build.sbt b/sbt-app/src/sbt-test/project1/aggregate/projA/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/aggregate/projA/build.sbt
rename to sbt-app/src/sbt-test/project1/aggregate/projA/build.sbt
diff --git a/sbt-app/src/sbt-test/project/aggregate/test b/sbt-app/src/sbt-test/project1/aggregate/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/aggregate/test
rename to sbt-app/src/sbt-test/project1/aggregate/test
diff --git a/sbt-app/src/sbt-test/project/append/build.sbt b/sbt-app/src/sbt-test/project1/append/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/append/build.sbt
rename to sbt-app/src/sbt-test/project1/append/build.sbt
diff --git a/sbt-app/src/sbt-test/project/append/test b/sbt-app/src/sbt-test/project1/append/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/append/test
rename to sbt-app/src/sbt-test/project1/append/test
diff --git a/sbt-app/src/sbt-test/project/auto-import/changes/build.sbt b/sbt-app/src/sbt-test/project1/auto-import/changes/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/auto-import/changes/build.sbt
rename to sbt-app/src/sbt-test/project1/auto-import/changes/build.sbt
diff --git a/sbt-app/src/sbt-test/project/auto-import/project/P.scala b/sbt-app/src/sbt-test/project1/auto-import/project/P.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/auto-import/project/P.scala
rename to sbt-app/src/sbt-test/project1/auto-import/project/P.scala
diff --git a/sbt-app/src/sbt-test/project/auto-import/test b/sbt-app/src/sbt-test/project1/auto-import/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/auto-import/test
rename to sbt-app/src/sbt-test/project1/auto-import/test
diff --git a/sbt-app/src/sbt-test/project/auto-plugins-default-requires-jvmplugin/build.sbt b/sbt-app/src/sbt-test/project1/auto-plugins-default-requires-jvmplugin/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/auto-plugins-default-requires-jvmplugin/build.sbt
rename to sbt-app/src/sbt-test/project1/auto-plugins-default-requires-jvmplugin/build.sbt
diff --git a/sbt-app/src/sbt-test/project/auto-plugins-default-requires-jvmplugin/pending b/sbt-app/src/sbt-test/project1/auto-plugins-default-requires-jvmplugin/pending
similarity index 100%
rename from sbt-app/src/sbt-test/project/auto-plugins-default-requires-jvmplugin/pending
rename to sbt-app/src/sbt-test/project1/auto-plugins-default-requires-jvmplugin/pending
diff --git a/sbt-app/src/sbt-test/project/auto-plugins-default-requires-jvmplugin/project/TestP.scala b/sbt-app/src/sbt-test/project1/auto-plugins-default-requires-jvmplugin/project/TestP.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/auto-plugins-default-requires-jvmplugin/project/TestP.scala
rename to sbt-app/src/sbt-test/project1/auto-plugins-default-requires-jvmplugin/project/TestP.scala
diff --git a/sbt-app/src/sbt-test/project/auto-plugins-ivy-disabled/build.sbt b/sbt-app/src/sbt-test/project1/auto-plugins-ivy-disabled/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/auto-plugins-ivy-disabled/build.sbt
rename to sbt-app/src/sbt-test/project1/auto-plugins-ivy-disabled/build.sbt
diff --git a/sbt-app/src/sbt-test/project/auto-plugins-ivy-disabled/test b/sbt-app/src/sbt-test/project1/auto-plugins-ivy-disabled/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/auto-plugins-ivy-disabled/test
rename to sbt-app/src/sbt-test/project1/auto-plugins-ivy-disabled/test
diff --git a/sbt-app/src/sbt-test/project/auto-plugins-nested/pending b/sbt-app/src/sbt-test/project1/auto-plugins-nested/pending
similarity index 100%
rename from sbt-app/src/sbt-test/project/auto-plugins-nested/pending
rename to sbt-app/src/sbt-test/project1/auto-plugins-nested/pending
diff --git a/sbt-app/src/sbt-test/project/auto-plugins-nested/project/Q.scala b/sbt-app/src/sbt-test/project1/auto-plugins-nested/project/Q.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/auto-plugins-nested/project/Q.scala
rename to sbt-app/src/sbt-test/project1/auto-plugins-nested/project/Q.scala
diff --git a/sbt-app/src/sbt-test/project/auto-plugins/build.sbt b/sbt-app/src/sbt-test/project1/auto-plugins/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/auto-plugins/build.sbt
rename to sbt-app/src/sbt-test/project1/auto-plugins/build.sbt
diff --git a/sbt-app/src/sbt-test/project/auto-plugins/projD/build.sbt b/sbt-app/src/sbt-test/project1/auto-plugins/projD/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/auto-plugins/projD/build.sbt
rename to sbt-app/src/sbt-test/project1/auto-plugins/projD/build.sbt
diff --git a/sbt-app/src/sbt-test/project/auto-plugins/projF/a.sbt b/sbt-app/src/sbt-test/project1/auto-plugins/projF/a.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/auto-plugins/projF/a.sbt
rename to sbt-app/src/sbt-test/project1/auto-plugins/projF/a.sbt
diff --git a/sbt-app/src/sbt-test/project/auto-plugins/projF/b.sbt b/sbt-app/src/sbt-test/project1/auto-plugins/projF/b.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/auto-plugins/projF/b.sbt
rename to sbt-app/src/sbt-test/project1/auto-plugins/projF/b.sbt
diff --git a/sbt-app/src/sbt-test/project/auto-plugins/project/A.scala b/sbt-app/src/sbt-test/project1/auto-plugins/project/A.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/auto-plugins/project/A.scala
rename to sbt-app/src/sbt-test/project1/auto-plugins/project/A.scala
diff --git a/sbt-app/src/sbt-test/project/auto-plugins/project/Q.scala b/sbt-app/src/sbt-test/project1/auto-plugins/project/Q.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/auto-plugins/project/Q.scala
rename to sbt-app/src/sbt-test/project1/auto-plugins/project/Q.scala
diff --git a/sbt-app/src/sbt-test/project/auto-plugins/test b/sbt-app/src/sbt-test/project1/auto-plugins/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/auto-plugins/test
rename to sbt-app/src/sbt-test/project1/auto-plugins/test
diff --git a/sbt-app/src/sbt-test/project/base-sources/A.scala b/sbt-app/src/sbt-test/project1/base-sources/A.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/base-sources/A.scala
rename to sbt-app/src/sbt-test/project1/base-sources/A.scala
diff --git a/sbt-app/src/sbt-test/project/base-sources/test b/sbt-app/src/sbt-test/project1/base-sources/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/base-sources/test
rename to sbt-app/src/sbt-test/project1/base-sources/test
diff --git a/sbt-app/src/sbt-test/project/binary-plugin/changes/define/A.scala b/sbt-app/src/sbt-test/project1/binary-plugin/changes/define/A.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/binary-plugin/changes/define/A.scala
rename to sbt-app/src/sbt-test/project1/binary-plugin/changes/define/A.scala
diff --git a/sbt-app/src/sbt-test/project/binary-plugin/changes/define/D.scala b/sbt-app/src/sbt-test/project1/binary-plugin/changes/define/D.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/binary-plugin/changes/define/D.scala
rename to sbt-app/src/sbt-test/project1/binary-plugin/changes/define/D.scala
diff --git a/sbt-app/src/sbt-test/project/binary-plugin/changes/define/build.sbt b/sbt-app/src/sbt-test/project1/binary-plugin/changes/define/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/binary-plugin/changes/define/build.sbt
rename to sbt-app/src/sbt-test/project1/binary-plugin/changes/define/build.sbt
diff --git a/sbt-app/src/sbt-test/project/binary-plugin/changes/use/plugins.sbt b/sbt-app/src/sbt-test/project1/binary-plugin/changes/use/plugins.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/binary-plugin/changes/use/plugins.sbt
rename to sbt-app/src/sbt-test/project1/binary-plugin/changes/use/plugins.sbt
diff --git a/sbt-app/src/sbt-test/project/binary-plugin/common.sbt b/sbt-app/src/sbt-test/project1/binary-plugin/common.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/binary-plugin/common.sbt
rename to sbt-app/src/sbt-test/project1/binary-plugin/common.sbt
diff --git a/sbt-app/src/sbt-test/project/binary-plugin/pending b/sbt-app/src/sbt-test/project1/binary-plugin/pending
similarity index 100%
rename from sbt-app/src/sbt-test/project/binary-plugin/pending
rename to sbt-app/src/sbt-test/project1/binary-plugin/pending
diff --git a/sbt-app/src/sbt-test/project/bsp-internal-dependency-configs/build.sbt b/sbt-app/src/sbt-test/project1/bsp-internal-dependency-configs/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/bsp-internal-dependency-configs/build.sbt
rename to sbt-app/src/sbt-test/project1/bsp-internal-dependency-configs/build.sbt
diff --git a/sbt-app/src/sbt-test/project/bsp-internal-dependency-configs/test b/sbt-app/src/sbt-test/project1/bsp-internal-dependency-configs/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/bsp-internal-dependency-configs/test
rename to sbt-app/src/sbt-test/project1/bsp-internal-dependency-configs/test
diff --git a/sbt-app/src/sbt-test/project/build-deps/a/A.scala b/sbt-app/src/sbt-test/project1/build-deps/a/A.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/build-deps/a/A.scala
rename to sbt-app/src/sbt-test/project1/build-deps/a/A.scala
diff --git a/sbt-app/src/sbt-test/project/build-deps/b/B.scala b/sbt-app/src/sbt-test/project1/build-deps/b/B.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/build-deps/b/B.scala
rename to sbt-app/src/sbt-test/project1/build-deps/b/B.scala
diff --git a/sbt-app/src/sbt-test/project/build-deps/build.sbt b/sbt-app/src/sbt-test/project1/build-deps/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/build-deps/build.sbt
rename to sbt-app/src/sbt-test/project1/build-deps/build.sbt
diff --git a/sbt-app/src/sbt-test/project/build-deps/changes/b.sbt b/sbt-app/src/sbt-test/project1/build-deps/changes/b.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/build-deps/changes/b.sbt
rename to sbt-app/src/sbt-test/project1/build-deps/changes/b.sbt
diff --git a/sbt-app/src/sbt-test/project/build-deps/test b/sbt-app/src/sbt-test/project1/build-deps/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/build-deps/test
rename to sbt-app/src/sbt-test/project1/build-deps/test
diff --git a/sbt-app/src/sbt-test/project/build-level-keys/test b/sbt-app/src/sbt-test/project1/build-level-keys/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/build-level-keys/test
rename to sbt-app/src/sbt-test/project1/build-level-keys/test
diff --git a/sbt-app/src/sbt-test/project/circular/B.scala b/sbt-app/src/sbt-test/project1/circular/B.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/circular/B.scala
rename to sbt-app/src/sbt-test/project1/circular/B.scala
diff --git a/sbt-app/src/sbt-test/project/circular/build.sbt b/sbt-app/src/sbt-test/project1/circular/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/circular/build.sbt
rename to sbt-app/src/sbt-test/project1/circular/build.sbt
diff --git a/sbt-app/src/sbt-test/project/circular/sub/A.scala b/sbt-app/src/sbt-test/project1/circular/sub/A.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/circular/sub/A.scala
rename to sbt-app/src/sbt-test/project1/circular/sub/A.scala
diff --git a/sbt-app/src/sbt-test/project/circular/test b/sbt-app/src/sbt-test/project1/circular/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/circular/test
rename to sbt-app/src/sbt-test/project1/circular/test
diff --git a/sbt-app/src/sbt-test/project/console/build.sbt b/sbt-app/src/sbt-test/project1/console/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/console/build.sbt
rename to sbt-app/src/sbt-test/project1/console/build.sbt
diff --git a/sbt-app/src/sbt-test/project/console/test b/sbt-app/src/sbt-test/project1/console/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/console/test
rename to sbt-app/src/sbt-test/project1/console/test
diff --git a/sbt-app/src/sbt-test/project/continuations/build.sbt b/sbt-app/src/sbt-test/project1/continuations/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/continuations/build.sbt
rename to sbt-app/src/sbt-test/project1/continuations/build.sbt
diff --git a/sbt-app/src/sbt-test/project/continuations/pending b/sbt-app/src/sbt-test/project1/continuations/pending
similarity index 100%
rename from sbt-app/src/sbt-test/project/continuations/pending
rename to sbt-app/src/sbt-test/project1/continuations/pending
diff --git a/sbt-app/src/sbt-test/project/continuations/src/main/scala/Example.scala b/sbt-app/src/sbt-test/project1/continuations/src/main/scala/Example.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/continuations/src/main/scala/Example.scala
rename to sbt-app/src/sbt-test/project1/continuations/src/main/scala/Example.scala
diff --git a/sbt-app/src/sbt-test/project/continuations/src/test/scala/ContinuationsTest.scala b/sbt-app/src/sbt-test/project1/continuations/src/test/scala/ContinuationsTest.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/continuations/src/test/scala/ContinuationsTest.scala
rename to sbt-app/src/sbt-test/project1/continuations/src/test/scala/ContinuationsTest.scala
diff --git a/sbt-app/src/sbt-test/project/cross-plugins-defaults/build.sbt b/sbt-app/src/sbt-test/project1/cross-plugins-defaults/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/cross-plugins-defaults/build.sbt
rename to sbt-app/src/sbt-test/project1/cross-plugins-defaults/build.sbt
diff --git a/sbt-app/src/sbt-test/project/cross-plugins-defaults/test b/sbt-app/src/sbt-test/project1/cross-plugins-defaults/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/cross-plugins-defaults/test
rename to sbt-app/src/sbt-test/project1/cross-plugins-defaults/test
diff --git a/sbt-app/src/sbt-test/project/cross-plugins-source/build.sbt b/sbt-app/src/sbt-test/project1/cross-plugins-source/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/cross-plugins-source/build.sbt
rename to sbt-app/src/sbt-test/project1/cross-plugins-source/build.sbt
diff --git a/sbt-app/src/sbt-test/project/cross-plugins-source/src/main/scala-sbt-0.13.x/B.scala b/sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala-sbt-0.13.x/B.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/cross-plugins-source/src/main/scala-sbt-0.13.x/B.scala
rename to sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala-sbt-0.13.x/B.scala
diff --git a/sbt-app/src/sbt-test/project/cross-plugins-source/src/main/scala-sbt-0.13/A.scala b/sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala-sbt-0.13/A.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/cross-plugins-source/src/main/scala-sbt-0.13/A.scala
rename to sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala-sbt-0.13/A.scala
diff --git a/sbt-app/src/sbt-test/project/cross-plugins-source/src/main/scala-sbt-0.13/B.scala b/sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala-sbt-0.13/B.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/cross-plugins-source/src/main/scala-sbt-0.13/B.scala
rename to sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala-sbt-0.13/B.scala
diff --git a/sbt-app/src/sbt-test/project/cross-plugins-source/src/main/scala/Test.scala b/sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala/Test.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/cross-plugins-source/src/main/scala/Test.scala
rename to sbt-app/src/sbt-test/project1/cross-plugins-source/src/main/scala/Test.scala
diff --git a/sbt-app/src/sbt-test/project/cross-plugins-source/src/test/scala/TestFile.scala b/sbt-app/src/sbt-test/project1/cross-plugins-source/src/test/scala/TestFile.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/cross-plugins-source/src/test/scala/TestFile.scala
rename to sbt-app/src/sbt-test/project1/cross-plugins-source/src/test/scala/TestFile.scala
diff --git a/sbt-app/src/sbt-test/project/cross-plugins-source/test b/sbt-app/src/sbt-test/project1/cross-plugins-source/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/cross-plugins-source/test
rename to sbt-app/src/sbt-test/project1/cross-plugins-source/test
diff --git a/sbt-app/src/sbt-test/project/cross-scala-versions-default/build.sbt b/sbt-app/src/sbt-test/project1/cross-scala-versions-default/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/cross-scala-versions-default/build.sbt
rename to sbt-app/src/sbt-test/project1/cross-scala-versions-default/build.sbt
diff --git a/sbt-app/src/sbt-test/project/cross-scala-versions-default/test b/sbt-app/src/sbt-test/project1/cross-scala-versions-default/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/cross-scala-versions-default/test
rename to sbt-app/src/sbt-test/project1/cross-scala-versions-default/test
diff --git a/sbt-app/src/sbt-test/project/cross-source/build.sbt b/sbt-app/src/sbt-test/project1/cross-source/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/cross-source/build.sbt
rename to sbt-app/src/sbt-test/project1/cross-source/build.sbt
diff --git a/sbt-app/src/sbt-test/project/cross-source/p1/src/main/scala-2.10/B.scala b/sbt-app/src/sbt-test/project1/cross-source/p1/src/main/scala-2.10/B.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/cross-source/p1/src/main/scala-2.10/B.scala
rename to sbt-app/src/sbt-test/project1/cross-source/p1/src/main/scala-2.10/B.scala
diff --git a/sbt-app/src/sbt-test/project/cross-source/p1/src/main/scala/A.scala b/sbt-app/src/sbt-test/project1/cross-source/p1/src/main/scala/A.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/cross-source/p1/src/main/scala/A.scala
rename to sbt-app/src/sbt-test/project1/cross-source/p1/src/main/scala/A.scala
diff --git a/sbt-app/src/sbt-test/project/cross-source/p2/src/main/scala-2.10/B.scala b/sbt-app/src/sbt-test/project1/cross-source/p2/src/main/scala-2.10/B.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/cross-source/p2/src/main/scala-2.10/B.scala
rename to sbt-app/src/sbt-test/project1/cross-source/p2/src/main/scala-2.10/B.scala
diff --git a/sbt-app/src/sbt-test/project/cross-source/p2/src/main/scala/A.scala b/sbt-app/src/sbt-test/project1/cross-source/p2/src/main/scala/A.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/cross-source/p2/src/main/scala/A.scala
rename to sbt-app/src/sbt-test/project1/cross-source/p2/src/main/scala/A.scala
diff --git a/sbt-app/src/sbt-test/project/cross-source/p3/src/main/scala-2.10/B.scala b/sbt-app/src/sbt-test/project1/cross-source/p3/src/main/scala-2.10/B.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/cross-source/p3/src/main/scala-2.10/B.scala
rename to sbt-app/src/sbt-test/project1/cross-source/p3/src/main/scala-2.10/B.scala
diff --git a/sbt-app/src/sbt-test/project/cross-source/p3/src/main/scala/A.scala b/sbt-app/src/sbt-test/project1/cross-source/p3/src/main/scala/A.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/cross-source/p3/src/main/scala/A.scala
rename to sbt-app/src/sbt-test/project1/cross-source/p3/src/main/scala/A.scala
diff --git a/sbt-app/src/sbt-test/project/cross-source/p4/src/main/scala-2.10/B.scala b/sbt-app/src/sbt-test/project1/cross-source/p4/src/main/scala-2.10/B.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/cross-source/p4/src/main/scala-2.10/B.scala
rename to sbt-app/src/sbt-test/project1/cross-source/p4/src/main/scala-2.10/B.scala
diff --git a/sbt-app/src/sbt-test/project/cross-source/p4/src/main/scala/A.scala b/sbt-app/src/sbt-test/project1/cross-source/p4/src/main/scala/A.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/cross-source/p4/src/main/scala/A.scala
rename to sbt-app/src/sbt-test/project1/cross-source/p4/src/main/scala/A.scala
diff --git a/sbt-app/src/sbt-test/project/cross-source/test b/sbt-app/src/sbt-test/project1/cross-source/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/cross-source/test
rename to sbt-app/src/sbt-test/project1/cross-source/test
diff --git a/sbt-app/src/sbt-test/project/default-auto-plugins/build.sbt b/sbt-app/src/sbt-test/project1/default-auto-plugins/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/default-auto-plugins/build.sbt
rename to sbt-app/src/sbt-test/project1/default-auto-plugins/build.sbt
diff --git a/sbt-app/src/sbt-test/project/default-auto-plugins/test b/sbt-app/src/sbt-test/project1/default-auto-plugins/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/default-auto-plugins/test
rename to sbt-app/src/sbt-test/project1/default-auto-plugins/test
diff --git a/sbt-app/src/sbt-test/project/default-settings/build.sbt b/sbt-app/src/sbt-test/project1/default-settings/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/default-settings/build.sbt
rename to sbt-app/src/sbt-test/project1/default-settings/build.sbt
diff --git a/sbt-app/src/sbt-test/project/default-settings/test b/sbt-app/src/sbt-test/project1/default-settings/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/default-settings/test
rename to sbt-app/src/sbt-test/project1/default-settings/test
diff --git a/sbt-app/src/sbt-test/project/defs/build.sbt b/sbt-app/src/sbt-test/project1/defs/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/defs/build.sbt
rename to sbt-app/src/sbt-test/project1/defs/build.sbt
diff --git a/sbt-app/src/sbt-test/project/defs/changes/visibility.sbt b/sbt-app/src/sbt-test/project1/defs/changes/visibility.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/defs/changes/visibility.sbt
rename to sbt-app/src/sbt-test/project1/defs/changes/visibility.sbt
diff --git a/sbt-app/src/sbt-test/project/defs/test b/sbt-app/src/sbt-test/project1/defs/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/defs/test
rename to sbt-app/src/sbt-test/project1/defs/test
diff --git a/sbt-app/src/sbt-test/project/derived/build.sbt b/sbt-app/src/sbt-test/project1/derived/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/derived/build.sbt
rename to sbt-app/src/sbt-test/project1/derived/build.sbt
diff --git a/sbt-app/src/sbt-test/project/derived/pending b/sbt-app/src/sbt-test/project1/derived/pending
similarity index 100%
rename from sbt-app/src/sbt-test/project/derived/pending
rename to sbt-app/src/sbt-test/project1/derived/pending
diff --git a/sbt-app/src/sbt-test/project/extra-projects/project/DatabasePlugin.scala b/sbt-app/src/sbt-test/project1/extra-projects/project/DatabasePlugin.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/extra-projects/project/DatabasePlugin.scala
rename to sbt-app/src/sbt-test/project1/extra-projects/project/DatabasePlugin.scala
diff --git a/sbt-app/src/sbt-test/project/extra-projects/project/ExtraProjectPluginExample.scala b/sbt-app/src/sbt-test/project1/extra-projects/project/ExtraProjectPluginExample.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/extra-projects/project/ExtraProjectPluginExample.scala
rename to sbt-app/src/sbt-test/project1/extra-projects/project/ExtraProjectPluginExample.scala
diff --git a/sbt-app/src/sbt-test/project/extra-projects/project/ExtraProjectPluginExample2.scala b/sbt-app/src/sbt-test/project1/extra-projects/project/ExtraProjectPluginExample2.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/extra-projects/project/ExtraProjectPluginExample2.scala
rename to sbt-app/src/sbt-test/project1/extra-projects/project/ExtraProjectPluginExample2.scala
diff --git a/sbt-app/src/sbt-test/project/extra-projects/test b/sbt-app/src/sbt-test/project1/extra-projects/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/extra-projects/test
rename to sbt-app/src/sbt-test/project1/extra-projects/test
diff --git a/sbt-app/src/sbt-test/project/extra/build.sbt b/sbt-app/src/sbt-test/project1/extra/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/extra/build.sbt
rename to sbt-app/src/sbt-test/project1/extra/build.sbt
diff --git a/sbt-app/src/sbt-test/project/extra/pending b/sbt-app/src/sbt-test/project1/extra/pending
similarity index 100%
rename from sbt-app/src/sbt-test/project/extra/pending
rename to sbt-app/src/sbt-test/project1/extra/pending
diff --git a/sbt-app/src/sbt-test/project/flatten/build.sbt b/sbt-app/src/sbt-test/project1/flatten/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/flatten/build.sbt
rename to sbt-app/src/sbt-test/project1/flatten/build.sbt
diff --git a/sbt-app/src/sbt-test/project/flatten/src/JavaA.java b/sbt-app/src/sbt-test/project1/flatten/src/JavaA.java
similarity index 100%
rename from sbt-app/src/sbt-test/project/flatten/src/JavaA.java
rename to sbt-app/src/sbt-test/project1/flatten/src/JavaA.java
diff --git a/sbt-app/src/sbt-test/project/flatten/src/ScalaA.scala b/sbt-app/src/sbt-test/project1/flatten/src/ScalaA.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/flatten/src/ScalaA.scala
rename to sbt-app/src/sbt-test/project1/flatten/src/ScalaA.scala
diff --git a/sbt-app/src/sbt-test/project/flatten/src/a/JavaB.java b/sbt-app/src/sbt-test/project1/flatten/src/a/JavaB.java
similarity index 100%
rename from sbt-app/src/sbt-test/project/flatten/src/a/JavaB.java
rename to sbt-app/src/sbt-test/project1/flatten/src/a/JavaB.java
diff --git a/sbt-app/src/sbt-test/project/flatten/src/a/ScalaB.scala b/sbt-app/src/sbt-test/project1/flatten/src/a/ScalaB.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/flatten/src/a/ScalaB.scala
rename to sbt-app/src/sbt-test/project1/flatten/src/a/ScalaB.scala
diff --git a/sbt-app/src/sbt-test/project/flatten/src/a/main-resource-a b/sbt-app/src/sbt-test/project1/flatten/src/a/main-resource-a
similarity index 100%
rename from sbt-app/src/sbt-test/project/flatten/src/a/main-resource-a
rename to sbt-app/src/sbt-test/project1/flatten/src/a/main-resource-a
diff --git a/sbt-app/src/sbt-test/project/flatten/src/main-resource b/sbt-app/src/sbt-test/project1/flatten/src/main-resource
similarity index 100%
rename from sbt-app/src/sbt-test/project/flatten/src/main-resource
rename to sbt-app/src/sbt-test/project1/flatten/src/main-resource
diff --git a/sbt-app/src/sbt-test/project/flatten/test b/sbt-app/src/sbt-test/project1/flatten/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/flatten/test
rename to sbt-app/src/sbt-test/project1/flatten/test
diff --git a/sbt-app/src/sbt-test/project/flatten/test-src/SimpleTest.scala b/sbt-app/src/sbt-test/project1/flatten/test-src/SimpleTest.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/flatten/test-src/SimpleTest.scala
rename to sbt-app/src/sbt-test/project1/flatten/test-src/SimpleTest.scala
diff --git a/sbt-app/src/sbt-test/project/flatten/test-src/c/ResourcesTest.scala b/sbt-app/src/sbt-test/project1/flatten/test-src/c/ResourcesTest.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/flatten/test-src/c/ResourcesTest.scala
rename to sbt-app/src/sbt-test/project1/flatten/test-src/c/ResourcesTest.scala
diff --git a/sbt-app/src/sbt-test/project/flatten/test-src/c/test-resource-c b/sbt-app/src/sbt-test/project1/flatten/test-src/c/test-resource-c
similarity index 100%
rename from sbt-app/src/sbt-test/project/flatten/test-src/c/test-resource-c
rename to sbt-app/src/sbt-test/project1/flatten/test-src/c/test-resource-c
diff --git a/sbt-app/src/sbt-test/project/flatten/test-src/test-resource b/sbt-app/src/sbt-test/project1/flatten/test-src/test-resource
similarity index 100%
rename from sbt-app/src/sbt-test/project/flatten/test-src/test-resource
rename to sbt-app/src/sbt-test/project1/flatten/test-src/test-resource
diff --git a/sbt-app/src/sbt-test/project/generated-root-no-publish/build.sbt b/sbt-app/src/sbt-test/project1/generated-root-no-publish/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/generated-root-no-publish/build.sbt
rename to sbt-app/src/sbt-test/project1/generated-root-no-publish/build.sbt
diff --git a/sbt-app/src/sbt-test/project/generated-root-no-publish/changes/bare.sbt b/sbt-app/src/sbt-test/project1/generated-root-no-publish/changes/bare.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/generated-root-no-publish/changes/bare.sbt
rename to sbt-app/src/sbt-test/project1/generated-root-no-publish/changes/bare.sbt
diff --git a/sbt-app/src/sbt-test/project/generated-root-no-publish/test b/sbt-app/src/sbt-test/project1/generated-root-no-publish/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/generated-root-no-publish/test
rename to sbt-app/src/sbt-test/project1/generated-root-no-publish/test
diff --git a/sbt-app/src/sbt-test/project/giter8-plugin/build.sbt b/sbt-app/src/sbt-test/project1/giter8-plugin/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/giter8-plugin/build.sbt
rename to sbt-app/src/sbt-test/project1/giter8-plugin/build.sbt
diff --git a/sbt-app/src/sbt-test/project/giter8-plugin/pending b/sbt-app/src/sbt-test/project1/giter8-plugin/pending
similarity index 100%
rename from sbt-app/src/sbt-test/project/giter8-plugin/pending
rename to sbt-app/src/sbt-test/project1/giter8-plugin/pending
diff --git a/sbt-app/src/sbt-test/project/giter8-plugin/project/p.sbt b/sbt-app/src/sbt-test/project1/giter8-plugin/project/p.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/giter8-plugin/project/p.sbt
rename to sbt-app/src/sbt-test/project1/giter8-plugin/project/p.sbt
diff --git a/sbt-app/src/sbt-test/project/global-plugin/changes/build.sbt b/sbt-app/src/sbt-test/project1/global-plugin/changes/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/global-plugin/changes/build.sbt
rename to sbt-app/src/sbt-test/project1/global-plugin/changes/build.sbt
diff --git a/sbt-app/src/sbt-test/project/global-plugin/changes/global-plugins.sbt b/sbt-app/src/sbt-test/project1/global-plugin/changes/global-plugins.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/global-plugin/changes/global-plugins.sbt
rename to sbt-app/src/sbt-test/project1/global-plugin/changes/global-plugins.sbt
diff --git a/sbt-app/src/sbt-test/project/global-plugin/changes/plugins.sbt b/sbt-app/src/sbt-test/project1/global-plugin/changes/plugins.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/global-plugin/changes/plugins.sbt
rename to sbt-app/src/sbt-test/project1/global-plugin/changes/plugins.sbt
diff --git a/sbt-app/src/sbt-test/project/global-plugin/global/plugins/A.scala b/sbt-app/src/sbt-test/project1/global-plugin/global/plugins/A.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/global-plugin/global/plugins/A.scala
rename to sbt-app/src/sbt-test/project1/global-plugin/global/plugins/A.scala
diff --git a/sbt-app/src/sbt-test/project/global-plugin/global/useGlobalAutoPlugin.sbt b/sbt-app/src/sbt-test/project1/global-plugin/global/useGlobalAutoPlugin.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/global-plugin/global/useGlobalAutoPlugin.sbt
rename to sbt-app/src/sbt-test/project1/global-plugin/global/useGlobalAutoPlugin.sbt
diff --git a/sbt-app/src/sbt-test/project/global-plugin/project/Test.scala b/sbt-app/src/sbt-test/project1/global-plugin/project/Test.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/global-plugin/project/Test.scala
rename to sbt-app/src/sbt-test/project1/global-plugin/project/Test.scala
diff --git a/sbt-app/src/sbt-test/project/global-plugin/test b/sbt-app/src/sbt-test/project1/global-plugin/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/global-plugin/test
rename to sbt-app/src/sbt-test/project1/global-plugin/test
diff --git a/sbt-app/src/sbt-test/project/ignore-hidden-build-files/changes/invalid-build.sbt b/sbt-app/src/sbt-test/project1/ignore-hidden-build-files/changes/invalid-build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/ignore-hidden-build-files/changes/invalid-build.sbt
rename to sbt-app/src/sbt-test/project1/ignore-hidden-build-files/changes/invalid-build.sbt
diff --git a/sbt-app/src/sbt-test/project/ignore-hidden-build-files/pending b/sbt-app/src/sbt-test/project1/ignore-hidden-build-files/pending
similarity index 100%
rename from sbt-app/src/sbt-test/project/ignore-hidden-build-files/pending
rename to sbt-app/src/sbt-test/project1/ignore-hidden-build-files/pending
diff --git a/sbt-app/src/sbt-test/project/in-this-build/build.sbt b/sbt-app/src/sbt-test/project1/in-this-build/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/in-this-build/build.sbt
rename to sbt-app/src/sbt-test/project1/in-this-build/build.sbt
diff --git a/sbt-app/src/sbt-test/project/in-this-build/test b/sbt-app/src/sbt-test/project1/in-this-build/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/in-this-build/test
rename to sbt-app/src/sbt-test/project1/in-this-build/test
diff --git a/sbt-app/src/sbt-test/project/inside-ci/build.sbt b/sbt-app/src/sbt-test/project1/inside-ci/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/inside-ci/build.sbt
rename to sbt-app/src/sbt-test/project1/inside-ci/build.sbt
diff --git a/sbt-app/src/sbt-test/project/inside-ci/test b/sbt-app/src/sbt-test/project1/inside-ci/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/inside-ci/test
rename to sbt-app/src/sbt-test/project1/inside-ci/test
diff --git a/sbt-app/src/sbt-test/project/internal-dependency-configurations/a/A.scala b/sbt-app/src/sbt-test/project1/internal-dependency-configurations/a/A.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/internal-dependency-configurations/a/A.scala
rename to sbt-app/src/sbt-test/project1/internal-dependency-configurations/a/A.scala
diff --git a/sbt-app/src/sbt-test/project/internal-dependency-configurations/b/B.scala b/sbt-app/src/sbt-test/project1/internal-dependency-configurations/b/B.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/internal-dependency-configurations/b/B.scala
rename to sbt-app/src/sbt-test/project1/internal-dependency-configurations/b/B.scala
diff --git a/sbt-app/src/sbt-test/project/internal-dependency-configurations/build.sbt b/sbt-app/src/sbt-test/project1/internal-dependency-configurations/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/internal-dependency-configurations/build.sbt
rename to sbt-app/src/sbt-test/project1/internal-dependency-configurations/build.sbt
diff --git a/sbt-app/src/sbt-test/project/internal-dependency-configurations/c/C.scala b/sbt-app/src/sbt-test/project1/internal-dependency-configurations/c/C.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/internal-dependency-configurations/c/C.scala
rename to sbt-app/src/sbt-test/project1/internal-dependency-configurations/c/C.scala
diff --git a/sbt-app/src/sbt-test/project/internal-dependency-configurations/d/D.scala b/sbt-app/src/sbt-test/project1/internal-dependency-configurations/d/D.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/internal-dependency-configurations/d/D.scala
rename to sbt-app/src/sbt-test/project1/internal-dependency-configurations/d/D.scala
diff --git a/sbt-app/src/sbt-test/project/internal-dependency-configurations/test b/sbt-app/src/sbt-test/project1/internal-dependency-configurations/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/internal-dependency-configurations/test
rename to sbt-app/src/sbt-test/project1/internal-dependency-configurations/test
diff --git a/sbt-app/src/sbt-test/project/internal-tracking/a/A.scala b/sbt-app/src/sbt-test/project1/internal-tracking/a/A.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/internal-tracking/a/A.scala
rename to sbt-app/src/sbt-test/project1/internal-tracking/a/A.scala
diff --git a/sbt-app/src/sbt-test/project/internal-tracking/b/B.scala b/sbt-app/src/sbt-test/project1/internal-tracking/b/B.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/internal-tracking/b/B.scala
rename to sbt-app/src/sbt-test/project1/internal-tracking/b/B.scala
diff --git a/sbt-app/src/sbt-test/project/internal-tracking/build.sbt b/sbt-app/src/sbt-test/project1/internal-tracking/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/internal-tracking/build.sbt
rename to sbt-app/src/sbt-test/project1/internal-tracking/build.sbt
diff --git a/sbt-app/src/sbt-test/project/internal-tracking/c/C.scala b/sbt-app/src/sbt-test/project1/internal-tracking/c/C.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/internal-tracking/c/C.scala
rename to sbt-app/src/sbt-test/project1/internal-tracking/c/C.scala
diff --git a/sbt-app/src/sbt-test/project/internal-tracking/d/D.scala b/sbt-app/src/sbt-test/project1/internal-tracking/d/D.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/internal-tracking/d/D.scala
rename to sbt-app/src/sbt-test/project1/internal-tracking/d/D.scala
diff --git a/sbt-app/src/sbt-test/project/internal-tracking/test b/sbt-app/src/sbt-test/project1/internal-tracking/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/internal-tracking/test
rename to sbt-app/src/sbt-test/project1/internal-tracking/test
diff --git a/sbt-app/src/sbt-test/project/isolated-build-definitions/build.sbt b/sbt-app/src/sbt-test/project1/isolated-build-definitions/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/isolated-build-definitions/build.sbt
rename to sbt-app/src/sbt-test/project1/isolated-build-definitions/build.sbt
diff --git a/sbt-app/src/sbt-test/project/isolated-build-definitions/generator/build.sbt b/sbt-app/src/sbt-test/project1/isolated-build-definitions/generator/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/isolated-build-definitions/generator/build.sbt
rename to sbt-app/src/sbt-test/project1/isolated-build-definitions/generator/build.sbt
diff --git a/sbt-app/src/sbt-test/project/isolated-build-definitions/test b/sbt-app/src/sbt-test/project1/isolated-build-definitions/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/isolated-build-definitions/test
rename to sbt-app/src/sbt-test/project1/isolated-build-definitions/test
diff --git a/sbt-app/src/sbt-test/project/lib/build.sbt b/sbt-app/src/sbt-test/project1/lib/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/lib/build.sbt
rename to sbt-app/src/sbt-test/project1/lib/build.sbt
diff --git a/sbt-app/src/sbt-test/project/lib/changes/build2.sbt b/sbt-app/src/sbt-test/project1/lib/changes/build2.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/lib/changes/build2.sbt
rename to sbt-app/src/sbt-test/project1/lib/changes/build2.sbt
diff --git a/sbt-app/src/sbt-test/project/lib/src/main/scala/Test.scala b/sbt-app/src/sbt-test/project1/lib/src/main/scala/Test.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/lib/src/main/scala/Test.scala
rename to sbt-app/src/sbt-test/project1/lib/src/main/scala/Test.scala
diff --git a/sbt-app/src/sbt-test/project/lib/test b/sbt-app/src/sbt-test/project1/lib/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/lib/test
rename to sbt-app/src/sbt-test/project1/lib/test
diff --git a/sbt-app/src/sbt-test/project/lint/build.sbt b/sbt-app/src/sbt-test/project1/lint/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/lint/build.sbt
rename to sbt-app/src/sbt-test/project1/lint/build.sbt
diff --git a/sbt-app/src/sbt-test/project/lint/test b/sbt-app/src/sbt-test/project1/lint/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/lint/test
rename to sbt-app/src/sbt-test/project1/lint/test
diff --git a/sbt-app/src/sbt-test/project/literal-defs/build.sbt b/sbt-app/src/sbt-test/project1/literal-defs/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/literal-defs/build.sbt
rename to sbt-app/src/sbt-test/project1/literal-defs/build.sbt
diff --git a/sbt-app/src/sbt-test/project/literal-defs/test b/sbt-app/src/sbt-test/project1/literal-defs/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/literal-defs/test
rename to sbt-app/src/sbt-test/project1/literal-defs/test
diff --git a/sbt-app/src/sbt-test/project/load-hooks/build.sbt b/sbt-app/src/sbt-test/project1/load-hooks/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/load-hooks/build.sbt
rename to sbt-app/src/sbt-test/project1/load-hooks/build.sbt
diff --git a/sbt-app/src/sbt-test/project/load-hooks/test b/sbt-app/src/sbt-test/project1/load-hooks/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/load-hooks/test
rename to sbt-app/src/sbt-test/project1/load-hooks/test
diff --git a/sbt-app/src/sbt-test/project/old-ops/changes/settingAppend1/build.sbt b/sbt-app/src/sbt-test/project1/old-ops/changes/settingAppend1/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/old-ops/changes/settingAppend1/build.sbt
rename to sbt-app/src/sbt-test/project1/old-ops/changes/settingAppend1/build.sbt
diff --git a/sbt-app/src/sbt-test/project/old-ops/changes/settingAppendN/build.sbt b/sbt-app/src/sbt-test/project1/old-ops/changes/settingAppendN/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/old-ops/changes/settingAppendN/build.sbt
rename to sbt-app/src/sbt-test/project1/old-ops/changes/settingAppendN/build.sbt
diff --git a/sbt-app/src/sbt-test/project/old-ops/changes/settingAssign/build.sbt b/sbt-app/src/sbt-test/project1/old-ops/changes/settingAssign/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/old-ops/changes/settingAssign/build.sbt
rename to sbt-app/src/sbt-test/project1/old-ops/changes/settingAssign/build.sbt
diff --git a/sbt-app/src/sbt-test/project/old-ops/changes/taskAppend1/build.sbt b/sbt-app/src/sbt-test/project1/old-ops/changes/taskAppend1/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/old-ops/changes/taskAppend1/build.sbt
rename to sbt-app/src/sbt-test/project1/old-ops/changes/taskAppend1/build.sbt
diff --git a/sbt-app/src/sbt-test/project/old-ops/changes/taskAppendN/build.sbt b/sbt-app/src/sbt-test/project1/old-ops/changes/taskAppendN/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/old-ops/changes/taskAppendN/build.sbt
rename to sbt-app/src/sbt-test/project1/old-ops/changes/taskAppendN/build.sbt
diff --git a/sbt-app/src/sbt-test/project/old-ops/changes/taskAssign/build.sbt b/sbt-app/src/sbt-test/project1/old-ops/changes/taskAssign/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/old-ops/changes/taskAssign/build.sbt
rename to sbt-app/src/sbt-test/project1/old-ops/changes/taskAssign/build.sbt
diff --git a/sbt-app/src/sbt-test/project/old-ops/test b/sbt-app/src/sbt-test/project1/old-ops/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/old-ops/test
rename to sbt-app/src/sbt-test/project1/old-ops/test
diff --git a/sbt-app/src/sbt-test/project/overlap-target/build.sbt b/sbt-app/src/sbt-test/project1/overlap-target/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/overlap-target/build.sbt
rename to sbt-app/src/sbt-test/project1/overlap-target/build.sbt
diff --git a/sbt-app/src/sbt-test/project/overlap-target/changes/xdir b/sbt-app/src/sbt-test/project1/overlap-target/changes/xdir
similarity index 100%
rename from sbt-app/src/sbt-test/project/overlap-target/changes/xdir
rename to sbt-app/src/sbt-test/project1/overlap-target/changes/xdir
diff --git a/sbt-app/src/sbt-test/project/overlap-target/test b/sbt-app/src/sbt-test/project1/overlap-target/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/overlap-target/test
rename to sbt-app/src/sbt-test/project1/overlap-target/test
diff --git a/sbt-app/src/sbt-test/project/overlap-target/ydir b/sbt-app/src/sbt-test/project1/overlap-target/ydir
similarity index 100%
rename from sbt-app/src/sbt-test/project/overlap-target/ydir
rename to sbt-app/src/sbt-test/project1/overlap-target/ydir
diff --git a/sbt-app/src/sbt-test/project/plugin-scala-compiler-dependency/project/Plugin.scala b/sbt-app/src/sbt-test/project1/plugin-scala-compiler-dependency/project/Plugin.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/plugin-scala-compiler-dependency/project/Plugin.scala
rename to sbt-app/src/sbt-test/project1/plugin-scala-compiler-dependency/project/Plugin.scala
diff --git a/sbt-app/src/sbt-test/project/plugin-scala-compiler-dependency/test b/sbt-app/src/sbt-test/project1/plugin-scala-compiler-dependency/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/plugin-scala-compiler-dependency/test
rename to sbt-app/src/sbt-test/project1/plugin-scala-compiler-dependency/test
diff --git a/sbt-app/src/sbt-test/project/plugins/build.sbt b/sbt-app/src/sbt-test/project1/plugins/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/plugins/build.sbt
rename to sbt-app/src/sbt-test/project1/plugins/build.sbt
diff --git a/sbt-app/src/sbt-test/project/plugins/project/p.sbt b/sbt-app/src/sbt-test/project1/plugins/project/p.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/plugins/project/p.sbt
rename to sbt-app/src/sbt-test/project1/plugins/project/p.sbt
diff --git a/sbt-app/src/sbt-test/project/plugins/test b/sbt-app/src/sbt-test/project1/plugins/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/plugins/test
rename to sbt-app/src/sbt-test/project1/plugins/test
diff --git a/sbt-app/src/sbt-test/project/plusequals/build.sbt b/sbt-app/src/sbt-test/project1/plusequals/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/plusequals/build.sbt
rename to sbt-app/src/sbt-test/project1/plusequals/build.sbt
diff --git a/sbt-app/src/sbt-test/project/plusequals/project/XBuildInfoPlugin.scala b/sbt-app/src/sbt-test/project1/plusequals/project/XBuildInfoPlugin.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/plusequals/project/XBuildInfoPlugin.scala
rename to sbt-app/src/sbt-test/project1/plusequals/project/XBuildInfoPlugin.scala
diff --git a/sbt-app/src/sbt-test/project/plusequals/test b/sbt-app/src/sbt-test/project1/plusequals/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/plusequals/test
rename to sbt-app/src/sbt-test/project1/plusequals/test
diff --git a/sbt-app/src/sbt-test/project/provided/build.sbt b/sbt-app/src/sbt-test/project1/provided/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/provided/build.sbt
rename to sbt-app/src/sbt-test/project1/provided/build.sbt
diff --git a/sbt-app/src/sbt-test/project/provided/sub/src/test/scala/ProvidedTest.scala b/sbt-app/src/sbt-test/project1/provided/sub/src/test/scala/ProvidedTest.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/provided/sub/src/test/scala/ProvidedTest.scala
rename to sbt-app/src/sbt-test/project1/provided/sub/src/test/scala/ProvidedTest.scala
diff --git a/sbt-app/src/sbt-test/project/provided/test b/sbt-app/src/sbt-test/project1/provided/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/provided/test
rename to sbt-app/src/sbt-test/project1/provided/test
diff --git a/sbt-app/src/sbt-test/project/remove/build.sbt b/sbt-app/src/sbt-test/project1/remove/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/remove/build.sbt
rename to sbt-app/src/sbt-test/project1/remove/build.sbt
diff --git a/sbt-app/src/sbt-test/project/remove/test b/sbt-app/src/sbt-test/project1/remove/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/remove/test
rename to sbt-app/src/sbt-test/project1/remove/test
diff --git a/sbt-app/src/sbt-test/project/sbt-composite-projects/build.sbt b/sbt-app/src/sbt-test/project1/sbt-composite-projects/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/sbt-composite-projects/build.sbt
rename to sbt-app/src/sbt-test/project1/sbt-composite-projects/build.sbt
diff --git a/sbt-app/src/sbt-test/project/sbt-composite-projects/changes/basic.sbt b/sbt-app/src/sbt-test/project1/sbt-composite-projects/changes/basic.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/sbt-composite-projects/changes/basic.sbt
rename to sbt-app/src/sbt-test/project1/sbt-composite-projects/changes/basic.sbt
diff --git a/sbt-app/src/sbt-test/project/sbt-composite-projects/changes/shadow.sbt b/sbt-app/src/sbt-test/project1/sbt-composite-projects/changes/shadow.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/sbt-composite-projects/changes/shadow.sbt
rename to sbt-app/src/sbt-test/project1/sbt-composite-projects/changes/shadow.sbt
diff --git a/sbt-app/src/sbt-test/project/sbt-composite-projects/changes/shadowLazy.sbt b/sbt-app/src/sbt-test/project1/sbt-composite-projects/changes/shadowLazy.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/sbt-composite-projects/changes/shadowLazy.sbt
rename to sbt-app/src/sbt-test/project1/sbt-composite-projects/changes/shadowLazy.sbt
diff --git a/sbt-app/src/sbt-test/project/sbt-composite-projects/js/build.sbt b/sbt-app/src/sbt-test/project1/sbt-composite-projects/js/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/sbt-composite-projects/js/build.sbt
rename to sbt-app/src/sbt-test/project1/sbt-composite-projects/js/build.sbt
diff --git a/sbt-app/src/sbt-test/project/sbt-composite-projects/jvm/A.scala b/sbt-app/src/sbt-test/project1/sbt-composite-projects/jvm/A.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/sbt-composite-projects/jvm/A.scala
rename to sbt-app/src/sbt-test/project1/sbt-composite-projects/jvm/A.scala
diff --git a/sbt-app/src/sbt-test/project/sbt-composite-projects/jvm/a.sbt b/sbt-app/src/sbt-test/project1/sbt-composite-projects/jvm/a.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/sbt-composite-projects/jvm/a.sbt
rename to sbt-app/src/sbt-test/project1/sbt-composite-projects/jvm/a.sbt
diff --git a/sbt-app/src/sbt-test/project/sbt-composite-projects/other.sbt b/sbt-app/src/sbt-test/project1/sbt-composite-projects/other.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/sbt-composite-projects/other.sbt
rename to sbt-app/src/sbt-test/project1/sbt-composite-projects/other.sbt
diff --git a/sbt-app/src/sbt-test/project/sbt-composite-projects/test b/sbt-app/src/sbt-test/project1/sbt-composite-projects/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/sbt-composite-projects/test
rename to sbt-app/src/sbt-test/project1/sbt-composite-projects/test
diff --git a/sbt-app/src/sbt-test/project/sbt-file-projects/a/A.scala b/sbt-app/src/sbt-test/project1/sbt-file-projects/a/A.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/sbt-file-projects/a/A.scala
rename to sbt-app/src/sbt-test/project1/sbt-file-projects/a/A.scala
diff --git a/sbt-app/src/sbt-test/project/sbt-file-projects/a/a.sbt b/sbt-app/src/sbt-test/project1/sbt-file-projects/a/a.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/sbt-file-projects/a/a.sbt
rename to sbt-app/src/sbt-test/project1/sbt-file-projects/a/a.sbt
diff --git a/sbt-app/src/sbt-test/project/sbt-file-projects/b/build.sbt b/sbt-app/src/sbt-test/project1/sbt-file-projects/b/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/sbt-file-projects/b/build.sbt
rename to sbt-app/src/sbt-test/project1/sbt-file-projects/b/build.sbt
diff --git a/sbt-app/src/sbt-test/project/sbt-file-projects/build.sbt b/sbt-app/src/sbt-test/project1/sbt-file-projects/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/sbt-file-projects/build.sbt
rename to sbt-app/src/sbt-test/project1/sbt-file-projects/build.sbt
diff --git a/sbt-app/src/sbt-test/project/sbt-file-projects/changes/basic.sbt b/sbt-app/src/sbt-test/project1/sbt-file-projects/changes/basic.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/sbt-file-projects/changes/basic.sbt
rename to sbt-app/src/sbt-test/project1/sbt-file-projects/changes/basic.sbt
diff --git a/sbt-app/src/sbt-test/project/sbt-file-projects/other.sbt b/sbt-app/src/sbt-test/project1/sbt-file-projects/other.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/sbt-file-projects/other.sbt
rename to sbt-app/src/sbt-test/project1/sbt-file-projects/other.sbt
diff --git a/sbt-app/src/sbt-test/project/sbt-file-projects/test b/sbt-app/src/sbt-test/project1/sbt-file-projects/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/sbt-file-projects/test
rename to sbt-app/src/sbt-test/project1/sbt-file-projects/test
diff --git a/sbt-app/src/sbt-test/project/sbt-plugin/build.sbt b/sbt-app/src/sbt-test/project1/sbt-plugin/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/sbt-plugin/build.sbt
rename to sbt-app/src/sbt-test/project1/sbt-plugin/build.sbt
diff --git a/sbt-app/src/sbt-test/project/sbt-plugin/changes/oldSbtPlugin.sbt b/sbt-app/src/sbt-test/project1/sbt-plugin/changes/oldSbtPlugin.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/sbt-plugin/changes/oldSbtPlugin.sbt
rename to sbt-app/src/sbt-test/project1/sbt-plugin/changes/oldSbtPlugin.sbt
diff --git a/sbt-app/src/sbt-test/project/sbt-plugin/src/main/scala/myplugin/MyPlugin.scala b/sbt-app/src/sbt-test/project1/sbt-plugin/src/main/scala/myplugin/MyPlugin.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/sbt-plugin/src/main/scala/myplugin/MyPlugin.scala
rename to sbt-app/src/sbt-test/project1/sbt-plugin/src/main/scala/myplugin/MyPlugin.scala
diff --git a/sbt-app/src/sbt-test/project/sbt-plugin/test b/sbt-app/src/sbt-test/project1/sbt-plugin/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/sbt-plugin/test
rename to sbt-app/src/sbt-test/project1/sbt-plugin/test
diff --git a/sbt-app/src/sbt-test/project/sbt-version-change/build.sbt b/sbt-app/src/sbt-test/project1/sbt-version-change/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/sbt-version-change/build.sbt
rename to sbt-app/src/sbt-test/project1/sbt-version-change/build.sbt
diff --git a/sbt-app/src/sbt-test/project/sbt-version-change/changes/build.properties b/sbt-app/src/sbt-test/project1/sbt-version-change/changes/build.properties
similarity index 100%
rename from sbt-app/src/sbt-test/project/sbt-version-change/changes/build.properties
rename to sbt-app/src/sbt-test/project1/sbt-version-change/changes/build.properties
diff --git a/sbt-app/src/sbt-test/project/sbt-version-change/test b/sbt-app/src/sbt-test/project1/sbt-version-change/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/sbt-version-change/test
rename to sbt-app/src/sbt-test/project1/sbt-version-change/test
diff --git a/sbt-app/src/sbt-test/project/scala-loader/build.sbt b/sbt-app/src/sbt-test/project1/scala-loader/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala-loader/build.sbt
rename to sbt-app/src/sbt-test/project1/scala-loader/build.sbt
diff --git a/sbt-app/src/sbt-test/project/scala-loader/test b/sbt-app/src/sbt-test/project1/scala-loader/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala-loader/test
rename to sbt-app/src/sbt-test/project1/scala-loader/test
diff --git a/sbt-app/src/sbt-test/project/scala3-binary-version/build.sbt b/sbt-app/src/sbt-test/project1/scala3-binary-version/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-binary-version/build.sbt
rename to sbt-app/src/sbt-test/project1/scala3-binary-version/build.sbt
diff --git a/sbt-app/src/sbt-test/project/scala3-binary-version/test b/sbt-app/src/sbt-test/project1/scala3-binary-version/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-binary-version/test
rename to sbt-app/src/sbt-test/project1/scala3-binary-version/test
diff --git a/sbt-app/src/sbt-test/project/scala3-console-project/build.sbt b/sbt-app/src/sbt-test/project1/scala3-console-project/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-console-project/build.sbt
rename to sbt-app/src/sbt-test/project1/scala3-console-project/build.sbt
diff --git a/sbt-app/src/sbt-test/project/scala3-console-project/test b/sbt-app/src/sbt-test/project1/scala3-console-project/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-console-project/test
rename to sbt-app/src/sbt-test/project1/scala3-console-project/test
diff --git a/sbt-app/src/sbt-test/project/scala3-cross-target/build.sbt b/sbt-app/src/sbt-test/project1/scala3-cross-target/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-cross-target/build.sbt
rename to sbt-app/src/sbt-test/project1/scala3-cross-target/build.sbt
diff --git a/sbt-app/src/sbt-test/project/scala3-cross-target/src/main/scala/Foo.scala b/sbt-app/src/sbt-test/project1/scala3-cross-target/src/main/scala/Foo.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-cross-target/src/main/scala/Foo.scala
rename to sbt-app/src/sbt-test/project1/scala3-cross-target/src/main/scala/Foo.scala
diff --git a/sbt-app/src/sbt-test/project/scala3-cross-target/test b/sbt-app/src/sbt-test/project1/scala3-cross-target/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-cross-target/test
rename to sbt-app/src/sbt-test/project1/scala3-cross-target/test
diff --git a/sbt-app/src/sbt-test/project/scala3-example-project/LICENSE b/sbt-app/src/sbt-test/project1/scala3-example-project/LICENSE
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-example-project/LICENSE
rename to sbt-app/src/sbt-test/project1/scala3-example-project/LICENSE
diff --git a/sbt-app/src/sbt-test/project/scala3-example-project/README.md b/sbt-app/src/sbt-test/project1/scala3-example-project/README.md
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-example-project/README.md
rename to sbt-app/src/sbt-test/project1/scala3-example-project/README.md
diff --git a/sbt-app/src/sbt-test/project/scala3-example-project/build.sbt b/sbt-app/src/sbt-test/project1/scala3-example-project/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-example-project/build.sbt
rename to sbt-app/src/sbt-test/project1/scala3-example-project/build.sbt
diff --git a/sbt-app/src/sbt-test/project/scala3-example-project/src/main/scala-3/Main.scala b/sbt-app/src/sbt-test/project1/scala3-example-project/src/main/scala-3/Main.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-example-project/src/main/scala-3/Main.scala
rename to sbt-app/src/sbt-test/project1/scala3-example-project/src/main/scala-3/Main.scala
diff --git a/sbt-app/src/sbt-test/project/scala3-example-project/src/main/scala-3/TraitParams.scala b/sbt-app/src/sbt-test/project1/scala3-example-project/src/main/scala-3/TraitParams.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-example-project/src/main/scala-3/TraitParams.scala
rename to sbt-app/src/sbt-test/project1/scala3-example-project/src/main/scala-3/TraitParams.scala
diff --git a/sbt-app/src/sbt-test/project/scala3-example-project/test b/sbt-app/src/sbt-test/project1/scala3-example-project/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-example-project/test
rename to sbt-app/src/sbt-test/project1/scala3-example-project/test
diff --git a/sbt-app/src/sbt-test/project/scala3-instance-loader/build.sbt b/sbt-app/src/sbt-test/project1/scala3-instance-loader/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-instance-loader/build.sbt
rename to sbt-app/src/sbt-test/project1/scala3-instance-loader/build.sbt
diff --git a/sbt-app/src/sbt-test/project/scala3-instance-loader/test b/sbt-app/src/sbt-test/project1/scala3-instance-loader/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-instance-loader/test
rename to sbt-app/src/sbt-test/project1/scala3-instance-loader/test
diff --git a/sbt-app/src/sbt-test/project/scala3-sandwich-sjs/app/src/main/scala/app/Main.scala b/sbt-app/src/sbt-test/project1/scala3-sandwich-sjs/app/src/main/scala/app/Main.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-sandwich-sjs/app/src/main/scala/app/Main.scala
rename to sbt-app/src/sbt-test/project1/scala3-sandwich-sjs/app/src/main/scala/app/Main.scala
diff --git a/sbt-app/src/sbt-test/project/scala3-sandwich-sjs/build.sbt b/sbt-app/src/sbt-test/project1/scala3-sandwich-sjs/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-sandwich-sjs/build.sbt
rename to sbt-app/src/sbt-test/project1/scala3-sandwich-sjs/build.sbt
diff --git a/sbt-app/src/sbt-test/project/scala3-sandwich-sjs/project/plugins.sbt b/sbt-app/src/sbt-test/project1/scala3-sandwich-sjs/project/plugins.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-sandwich-sjs/project/plugins.sbt
rename to sbt-app/src/sbt-test/project1/scala3-sandwich-sjs/project/plugins.sbt
diff --git a/sbt-app/src/sbt-test/project/scala3-sandwich-sjs/scala3code/src/main/scala/mylib/MyLib.scala b/sbt-app/src/sbt-test/project1/scala3-sandwich-sjs/scala3code/src/main/scala/mylib/MyLib.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-sandwich-sjs/scala3code/src/main/scala/mylib/MyLib.scala
rename to sbt-app/src/sbt-test/project1/scala3-sandwich-sjs/scala3code/src/main/scala/mylib/MyLib.scala
diff --git a/sbt-app/src/sbt-test/project/scala3-sandwich-sjs/test b/sbt-app/src/sbt-test/project1/scala3-sandwich-sjs/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-sandwich-sjs/test
rename to sbt-app/src/sbt-test/project1/scala3-sandwich-sjs/test
diff --git a/sbt-app/src/sbt-test/project/scala3-sandwich/bar-app/D.scala b/sbt-app/src/sbt-test/project1/scala3-sandwich/bar-app/D.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-sandwich/bar-app/D.scala
rename to sbt-app/src/sbt-test/project1/scala3-sandwich/bar-app/D.scala
diff --git a/sbt-app/src/sbt-test/project/scala3-sandwich/bar-core/C.scala b/sbt-app/src/sbt-test/project1/scala3-sandwich/bar-core/C.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-sandwich/bar-core/C.scala
rename to sbt-app/src/sbt-test/project1/scala3-sandwich/bar-core/C.scala
diff --git a/sbt-app/src/sbt-test/project/scala3-sandwich/build.sbt b/sbt-app/src/sbt-test/project1/scala3-sandwich/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-sandwich/build.sbt
rename to sbt-app/src/sbt-test/project1/scala3-sandwich/build.sbt
diff --git a/sbt-app/src/sbt-test/project/scala3-sandwich/foo-app/B.scala b/sbt-app/src/sbt-test/project1/scala3-sandwich/foo-app/B.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-sandwich/foo-app/B.scala
rename to sbt-app/src/sbt-test/project1/scala3-sandwich/foo-app/B.scala
diff --git a/sbt-app/src/sbt-test/project/scala3-sandwich/foo-core/A.scala b/sbt-app/src/sbt-test/project1/scala3-sandwich/foo-core/A.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-sandwich/foo-core/A.scala
rename to sbt-app/src/sbt-test/project1/scala3-sandwich/foo-core/A.scala
diff --git a/sbt-app/src/sbt-test/project/scala3-sandwich/test b/sbt-app/src/sbt-test/project1/scala3-sandwich/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-sandwich/test
rename to sbt-app/src/sbt-test/project1/scala3-sandwich/test
diff --git a/sbt-app/src/sbt-test/project/scala3-semanticdb/LICENSE b/sbt-app/src/sbt-test/project1/scala3-semanticdb/LICENSE
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-semanticdb/LICENSE
rename to sbt-app/src/sbt-test/project1/scala3-semanticdb/LICENSE
diff --git a/sbt-app/src/sbt-test/project/scala3-semanticdb/README.md b/sbt-app/src/sbt-test/project1/scala3-semanticdb/README.md
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-semanticdb/README.md
rename to sbt-app/src/sbt-test/project1/scala3-semanticdb/README.md
diff --git a/sbt-app/src/sbt-test/project/scala3-semanticdb/build.sbt b/sbt-app/src/sbt-test/project1/scala3-semanticdb/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-semanticdb/build.sbt
rename to sbt-app/src/sbt-test/project1/scala3-semanticdb/build.sbt
diff --git a/sbt-app/src/sbt-test/project/scala3-semanticdb/src/main/scala/Main.scala b/sbt-app/src/sbt-test/project1/scala3-semanticdb/src/main/scala/Main.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-semanticdb/src/main/scala/Main.scala
rename to sbt-app/src/sbt-test/project1/scala3-semanticdb/src/main/scala/Main.scala
diff --git a/sbt-app/src/sbt-test/project/scala3-semanticdb/src/test/scala/Test.scala b/sbt-app/src/sbt-test/project1/scala3-semanticdb/src/test/scala/Test.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-semanticdb/src/test/scala/Test.scala
rename to sbt-app/src/sbt-test/project1/scala3-semanticdb/src/test/scala/Test.scala
diff --git a/sbt-app/src/sbt-test/project/scala3-semanticdb/test b/sbt-app/src/sbt-test/project1/scala3-semanticdb/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/scala3-semanticdb/test
rename to sbt-app/src/sbt-test/project1/scala3-semanticdb/test
diff --git a/sbt-app/src/sbt-test/project/scripted-bad-def/bad.sbt.disabled b/sbt-app/src/sbt-test/project1/scripted-bad-def/bad.sbt.disabled
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted-bad-def/bad.sbt.disabled
rename to sbt-app/src/sbt-test/project1/scripted-bad-def/bad.sbt.disabled
diff --git a/sbt-app/src/sbt-test/project/scripted-bad-def/test b/sbt-app/src/sbt-test/project1/scripted-bad-def/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted-bad-def/test
rename to sbt-app/src/sbt-test/project1/scripted-bad-def/test
diff --git a/sbt-app/src/sbt-test/project/scripted-dependencies/build.sbt b/sbt-app/src/sbt-test/project1/scripted-dependencies/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted-dependencies/build.sbt
rename to sbt-app/src/sbt-test/project1/scripted-dependencies/build.sbt
diff --git a/sbt-app/src/sbt-test/project/scripted-dependencies/project/plugins.sbt b/sbt-app/src/sbt-test/project1/scripted-dependencies/project/plugins.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted-dependencies/project/plugins.sbt
rename to sbt-app/src/sbt-test/project1/scripted-dependencies/project/plugins.sbt
diff --git a/sbt-app/src/sbt-test/project/scripted-dependencies/test b/sbt-app/src/sbt-test/project1/scripted-dependencies/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted-dependencies/test
rename to sbt-app/src/sbt-test/project1/scripted-dependencies/test
diff --git a/sbt-app/src/sbt-test/project/scripted-dependencies/test-files/test b/sbt-app/src/sbt-test/project1/scripted-dependencies/test-files/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted-dependencies/test-files/test
rename to sbt-app/src/sbt-test/project1/scripted-dependencies/test-files/test
diff --git a/sbt-app/src/sbt-test/project/scripted-java-home/build.sbt b/sbt-app/src/sbt-test/project1/scripted-java-home/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted-java-home/build.sbt
rename to sbt-app/src/sbt-test/project1/scripted-java-home/build.sbt
diff --git a/sbt-app/src/sbt-test/project/scripted-java-home/changes/build.sbt b/sbt-app/src/sbt-test/project1/scripted-java-home/changes/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted-java-home/changes/build.sbt
rename to sbt-app/src/sbt-test/project1/scripted-java-home/changes/build.sbt
diff --git a/sbt-app/src/sbt-test/project/scripted-java-home/changes/test b/sbt-app/src/sbt-test/project1/scripted-java-home/changes/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted-java-home/changes/test
rename to sbt-app/src/sbt-test/project1/scripted-java-home/changes/test
diff --git a/sbt-app/src/sbt-test/project/scripted-java-home/test b/sbt-app/src/sbt-test/project1/scripted-java-home/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted-java-home/test
rename to sbt-app/src/sbt-test/project1/scripted-java-home/test
diff --git a/sbt-app/src/sbt-test/project/scripted-plugin/build.sbt b/sbt-app/src/sbt-test/project1/scripted-plugin/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted-plugin/build.sbt
rename to sbt-app/src/sbt-test/project1/scripted-plugin/build.sbt
diff --git a/sbt-app/src/sbt-test/project/scripted-plugin/changes/Fail.scala b/sbt-app/src/sbt-test/project1/scripted-plugin/changes/Fail.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted-plugin/changes/Fail.scala
rename to sbt-app/src/sbt-test/project1/scripted-plugin/changes/Fail.scala
diff --git a/sbt-app/src/sbt-test/project/scripted-plugin/changes/Success.scala b/sbt-app/src/sbt-test/project1/scripted-plugin/changes/Success.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted-plugin/changes/Success.scala
rename to sbt-app/src/sbt-test/project1/scripted-plugin/changes/Success.scala
diff --git a/sbt-app/src/sbt-test/project/scripted-plugin/changes/fail b/sbt-app/src/sbt-test/project1/scripted-plugin/changes/fail
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted-plugin/changes/fail
rename to sbt-app/src/sbt-test/project1/scripted-plugin/changes/fail
diff --git a/sbt-app/src/sbt-test/project/scripted-plugin/changes/test b/sbt-app/src/sbt-test/project1/scripted-plugin/changes/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted-plugin/changes/test
rename to sbt-app/src/sbt-test/project1/scripted-plugin/changes/test
diff --git a/sbt-app/src/sbt-test/project/scripted-plugin/project/plugins.sbt b/sbt-app/src/sbt-test/project1/scripted-plugin/project/plugins.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted-plugin/project/plugins.sbt
rename to sbt-app/src/sbt-test/project1/scripted-plugin/project/plugins.sbt
diff --git a/sbt-app/src/sbt-test/project/scripted-plugin/test b/sbt-app/src/sbt-test/project1/scripted-plugin/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted-plugin/test
rename to sbt-app/src/sbt-test/project1/scripted-plugin/test
diff --git a/sbt-app/src/sbt-test/project/scripted-skip-incompatible/build.sbt b/sbt-app/src/sbt-test/project1/scripted-skip-incompatible/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted-skip-incompatible/build.sbt
rename to sbt-app/src/sbt-test/project1/scripted-skip-incompatible/build.sbt
diff --git a/sbt-app/src/sbt-test/project/scripted-skip-incompatible/changes/Fail.scala b/sbt-app/src/sbt-test/project1/scripted-skip-incompatible/changes/Fail.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted-skip-incompatible/changes/Fail.scala
rename to sbt-app/src/sbt-test/project1/scripted-skip-incompatible/changes/Fail.scala
diff --git a/sbt-app/src/sbt-test/project/scripted-skip-incompatible/changes/build.properties b/sbt-app/src/sbt-test/project1/scripted-skip-incompatible/changes/build.properties
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted-skip-incompatible/changes/build.properties
rename to sbt-app/src/sbt-test/project1/scripted-skip-incompatible/changes/build.properties
diff --git a/sbt-app/src/sbt-test/project/scripted-skip-incompatible/changes/test b/sbt-app/src/sbt-test/project1/scripted-skip-incompatible/changes/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted-skip-incompatible/changes/test
rename to sbt-app/src/sbt-test/project1/scripted-skip-incompatible/changes/test
diff --git a/sbt-app/src/sbt-test/project/scripted-skip-incompatible/test b/sbt-app/src/sbt-test/project1/scripted-skip-incompatible/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted-skip-incompatible/test
rename to sbt-app/src/sbt-test/project1/scripted-skip-incompatible/test
diff --git a/sbt-app/src/sbt-test/project/scripted13/build.sbt b/sbt-app/src/sbt-test/project1/scripted13/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted13/build.sbt
rename to sbt-app/src/sbt-test/project1/scripted13/build.sbt
diff --git a/sbt-app/src/sbt-test/project/scripted13/changes/A.scala b/sbt-app/src/sbt-test/project1/scripted13/changes/A.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted13/changes/A.scala
rename to sbt-app/src/sbt-test/project1/scripted13/changes/A.scala
diff --git a/sbt-app/src/sbt-test/project/scripted13/changes/Fail.scala b/sbt-app/src/sbt-test/project1/scripted13/changes/Fail.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted13/changes/Fail.scala
rename to sbt-app/src/sbt-test/project1/scripted13/changes/Fail.scala
diff --git a/sbt-app/src/sbt-test/project/scripted13/project/plugins.sbt b/sbt-app/src/sbt-test/project1/scripted13/project/plugins.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted13/project/plugins.sbt
rename to sbt-app/src/sbt-test/project1/scripted13/project/plugins.sbt
diff --git a/sbt-app/src/sbt-test/project/scripted13/src/sbt-test/a/b/test b/sbt-app/src/sbt-test/project1/scripted13/src/sbt-test/a/b/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted13/src/sbt-test/a/b/test
rename to sbt-app/src/sbt-test/project1/scripted13/src/sbt-test/a/b/test
diff --git a/sbt-app/src/sbt-test/project/scripted13/test b/sbt-app/src/sbt-test/project1/scripted13/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/scripted13/test
rename to sbt-app/src/sbt-test/project1/scripted13/test
diff --git a/sbt-app/src/sbt-test/project/semanticdb-version/build.sbt b/sbt-app/src/sbt-test/project1/semanticdb-version/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/semanticdb-version/build.sbt
rename to sbt-app/src/sbt-test/project1/semanticdb-version/build.sbt
diff --git a/sbt-app/src/sbt-test/project/semanticdb-version/src/main/scala/foo/Test.scala b/sbt-app/src/sbt-test/project1/semanticdb-version/src/main/scala/foo/Test.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/semanticdb-version/src/main/scala/foo/Test.scala
rename to sbt-app/src/sbt-test/project1/semanticdb-version/src/main/scala/foo/Test.scala
diff --git a/sbt-app/src/sbt-test/project/semanticdb-version/test b/sbt-app/src/sbt-test/project1/semanticdb-version/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/semanticdb-version/test
rename to sbt-app/src/sbt-test/project1/semanticdb-version/test
diff --git a/sbt-app/src/sbt-test/project/semanticdb/build.sbt b/sbt-app/src/sbt-test/project1/semanticdb/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/semanticdb/build.sbt
rename to sbt-app/src/sbt-test/project1/semanticdb/build.sbt
diff --git a/sbt-app/src/sbt-test/project/semanticdb/src/custom/scala/foo/Custom.scala b/sbt-app/src/sbt-test/project1/semanticdb/src/custom/scala/foo/Custom.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/semanticdb/src/custom/scala/foo/Custom.scala
rename to sbt-app/src/sbt-test/project1/semanticdb/src/custom/scala/foo/Custom.scala
diff --git a/sbt-app/src/sbt-test/project/semanticdb/src/it/scala/foo/IntegrationTest.scala b/sbt-app/src/sbt-test/project1/semanticdb/src/it/scala/foo/IntegrationTest.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/semanticdb/src/it/scala/foo/IntegrationTest.scala
rename to sbt-app/src/sbt-test/project1/semanticdb/src/it/scala/foo/IntegrationTest.scala
diff --git a/sbt-app/src/sbt-test/project/semanticdb/src/main/scala/foo/Compile.scala b/sbt-app/src/sbt-test/project1/semanticdb/src/main/scala/foo/Compile.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/semanticdb/src/main/scala/foo/Compile.scala
rename to sbt-app/src/sbt-test/project1/semanticdb/src/main/scala/foo/Compile.scala
diff --git a/sbt-app/src/sbt-test/project/semanticdb/src/st/scala/foo/SystemTest.scala b/sbt-app/src/sbt-test/project1/semanticdb/src/st/scala/foo/SystemTest.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/semanticdb/src/st/scala/foo/SystemTest.scala
rename to sbt-app/src/sbt-test/project1/semanticdb/src/st/scala/foo/SystemTest.scala
diff --git a/sbt-app/src/sbt-test/project/semanticdb/src/test/scala/foo/Test.scala b/sbt-app/src/sbt-test/project1/semanticdb/src/test/scala/foo/Test.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/semanticdb/src/test/scala/foo/Test.scala
rename to sbt-app/src/sbt-test/project1/semanticdb/src/test/scala/foo/Test.scala
diff --git a/sbt-app/src/sbt-test/project/semanticdb/test b/sbt-app/src/sbt-test/project1/semanticdb/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/semanticdb/test
rename to sbt-app/src/sbt-test/project1/semanticdb/test
diff --git a/sbt-app/src/sbt-test/project/sequential/build.sbt b/sbt-app/src/sbt-test/project1/sequential/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/sequential/build.sbt
rename to sbt-app/src/sbt-test/project1/sequential/build.sbt
diff --git a/sbt-app/src/sbt-test/project/sequential/test b/sbt-app/src/sbt-test/project1/sequential/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/sequential/test
rename to sbt-app/src/sbt-test/project1/sequential/test
diff --git a/sbt-app/src/sbt-test/project/session-save/build.check.1 b/sbt-app/src/sbt-test/project1/session-save/build.check.1
similarity index 100%
rename from sbt-app/src/sbt-test/project/session-save/build.check.1
rename to sbt-app/src/sbt-test/project1/session-save/build.check.1
diff --git a/sbt-app/src/sbt-test/project/session-save/build.check.2 b/sbt-app/src/sbt-test/project1/session-save/build.check.2
similarity index 100%
rename from sbt-app/src/sbt-test/project/session-save/build.check.2
rename to sbt-app/src/sbt-test/project1/session-save/build.check.2
diff --git a/sbt-app/src/sbt-test/project/session-save/build.check.3 b/sbt-app/src/sbt-test/project1/session-save/build.check.3
similarity index 100%
rename from sbt-app/src/sbt-test/project/session-save/build.check.3
rename to sbt-app/src/sbt-test/project1/session-save/build.check.3
diff --git a/sbt-app/src/sbt-test/project/session-save/build.check.4 b/sbt-app/src/sbt-test/project1/session-save/build.check.4
similarity index 100%
rename from sbt-app/src/sbt-test/project/session-save/build.check.4
rename to sbt-app/src/sbt-test/project1/session-save/build.check.4
diff --git a/sbt-app/src/sbt-test/project/session-save/build.check.5 b/sbt-app/src/sbt-test/project1/session-save/build.check.5
similarity index 100%
rename from sbt-app/src/sbt-test/project/session-save/build.check.5
rename to sbt-app/src/sbt-test/project1/session-save/build.check.5
diff --git a/sbt-app/src/sbt-test/project/session-save/build.sbt b/sbt-app/src/sbt-test/project1/session-save/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/session-save/build.sbt
rename to sbt-app/src/sbt-test/project1/session-save/build.sbt
diff --git a/sbt-app/src/sbt-test/project/session-save/disabled b/sbt-app/src/sbt-test/project1/session-save/disabled
similarity index 100%
rename from sbt-app/src/sbt-test/project/session-save/disabled
rename to sbt-app/src/sbt-test/project1/session-save/disabled
diff --git a/sbt-app/src/sbt-test/project/session-update-from-cmd/build.check.1 b/sbt-app/src/sbt-test/project1/session-update-from-cmd/build.check.1
similarity index 100%
rename from sbt-app/src/sbt-test/project/session-update-from-cmd/build.check.1
rename to sbt-app/src/sbt-test/project1/session-update-from-cmd/build.check.1
diff --git a/sbt-app/src/sbt-test/project/session-update-from-cmd/build.check.2 b/sbt-app/src/sbt-test/project1/session-update-from-cmd/build.check.2
similarity index 100%
rename from sbt-app/src/sbt-test/project/session-update-from-cmd/build.check.2
rename to sbt-app/src/sbt-test/project1/session-update-from-cmd/build.check.2
diff --git a/sbt-app/src/sbt-test/project/session-update-from-cmd/build.sbt b/sbt-app/src/sbt-test/project1/session-update-from-cmd/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/session-update-from-cmd/build.sbt
rename to sbt-app/src/sbt-test/project1/session-update-from-cmd/build.sbt
diff --git a/sbt-app/src/sbt-test/project/session-update-from-cmd/project/Common.scala b/sbt-app/src/sbt-test/project1/session-update-from-cmd/project/Common.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/session-update-from-cmd/project/Common.scala
rename to sbt-app/src/sbt-test/project1/session-update-from-cmd/project/Common.scala
diff --git a/sbt-app/src/sbt-test/project/session-update-from-cmd/test b/sbt-app/src/sbt-test/project1/session-update-from-cmd/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/session-update-from-cmd/test
rename to sbt-app/src/sbt-test/project1/session-update-from-cmd/test
diff --git a/sbt-app/src/sbt-test/project/setting-macro/build.sbt b/sbt-app/src/sbt-test/project1/setting-macro/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/setting-macro/build.sbt
rename to sbt-app/src/sbt-test/project1/setting-macro/build.sbt
diff --git a/sbt-app/src/sbt-test/project/setting-macro/project/PureExpressionPlugin.scala b/sbt-app/src/sbt-test/project1/setting-macro/project/PureExpressionPlugin.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/setting-macro/project/PureExpressionPlugin.scala
rename to sbt-app/src/sbt-test/project1/setting-macro/project/PureExpressionPlugin.scala
diff --git a/sbt-app/src/sbt-test/project/setting-macro/project/plugins.sbt b/sbt-app/src/sbt-test/project1/setting-macro/project/plugins.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/setting-macro/project/plugins.sbt
rename to sbt-app/src/sbt-test/project1/setting-macro/project/plugins.sbt
diff --git a/sbt-app/src/sbt-test/project/setting-macro/test b/sbt-app/src/sbt-test/project1/setting-macro/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/setting-macro/test
rename to sbt-app/src/sbt-test/project1/setting-macro/test
diff --git a/sbt-app/src/sbt-test/project/setting-order/a.sbt b/sbt-app/src/sbt-test/project1/setting-order/a.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/setting-order/a.sbt
rename to sbt-app/src/sbt-test/project1/setting-order/a.sbt
diff --git a/sbt-app/src/sbt-test/project/setting-order/b.sbt b/sbt-app/src/sbt-test/project1/setting-order/b.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/setting-order/b.sbt
rename to sbt-app/src/sbt-test/project1/setting-order/b.sbt
diff --git a/sbt-app/src/sbt-test/project/setting-order/build.sbt b/sbt-app/src/sbt-test/project1/setting-order/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/setting-order/build.sbt
rename to sbt-app/src/sbt-test/project1/setting-order/build.sbt
diff --git a/sbt-app/src/sbt-test/project/setting-order/c.sbt b/sbt-app/src/sbt-test/project1/setting-order/c.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/setting-order/c.sbt
rename to sbt-app/src/sbt-test/project1/setting-order/c.sbt
diff --git a/sbt-app/src/sbt-test/project/setting-order/test b/sbt-app/src/sbt-test/project1/setting-order/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/setting-order/test
rename to sbt-app/src/sbt-test/project1/setting-order/test
diff --git a/sbt-app/src/sbt-test/project/settings-compat/build.sbt b/sbt-app/src/sbt-test/project1/settings-compat/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/settings-compat/build.sbt
rename to sbt-app/src/sbt-test/project1/settings-compat/build.sbt
diff --git a/sbt-app/src/sbt-test/project/settings-compat/test b/sbt-app/src/sbt-test/project1/settings-compat/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/settings-compat/test
rename to sbt-app/src/sbt-test/project1/settings-compat/test
diff --git a/sbt-app/src/sbt-test/project/settings-definition/build.sbt b/sbt-app/src/sbt-test/project1/settings-definition/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/settings-definition/build.sbt
rename to sbt-app/src/sbt-test/project1/settings-definition/build.sbt
diff --git a/sbt-app/src/sbt-test/project/settings-definition/test b/sbt-app/src/sbt-test/project1/settings-definition/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/settings-definition/test
rename to sbt-app/src/sbt-test/project1/settings-definition/test
diff --git a/sbt-app/src/sbt-test/project/settings/build.sbt b/sbt-app/src/sbt-test/project1/settings/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/settings/build.sbt
rename to sbt-app/src/sbt-test/project1/settings/build.sbt
diff --git a/sbt-app/src/sbt-test/project/settings/changes/Global.scala b/sbt-app/src/sbt-test/project1/settings/changes/Global.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/settings/changes/Global.scala
rename to sbt-app/src/sbt-test/project1/settings/changes/Global.scala
diff --git a/sbt-app/src/sbt-test/project/settings/changes/global.sbt b/sbt-app/src/sbt-test/project1/settings/changes/global.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/settings/changes/global.sbt
rename to sbt-app/src/sbt-test/project1/settings/changes/global.sbt
diff --git a/sbt-app/src/sbt-test/project/settings/changes/settings.sbt b/sbt-app/src/sbt-test/project1/settings/changes/settings.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/settings/changes/settings.sbt
rename to sbt-app/src/sbt-test/project1/settings/changes/settings.sbt
diff --git a/sbt-app/src/sbt-test/project/settings/test b/sbt-app/src/sbt-test/project1/settings/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/settings/test
rename to sbt-app/src/sbt-test/project1/settings/test
diff --git a/sbt-app/src/sbt-test/project/source-plugins/build.sbt b/sbt-app/src/sbt-test/project1/source-plugins/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/source-plugins/build.sbt
rename to sbt-app/src/sbt-test/project1/source-plugins/build.sbt
diff --git a/sbt-app/src/sbt-test/project/source-plugins/pending b/sbt-app/src/sbt-test/project1/source-plugins/pending
similarity index 100%
rename from sbt-app/src/sbt-test/project/source-plugins/pending
rename to sbt-app/src/sbt-test/project1/source-plugins/pending
diff --git a/sbt-app/src/sbt-test/project/source-plugins/project/plugin.sbt b/sbt-app/src/sbt-test/project1/source-plugins/project/plugin.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/source-plugins/project/plugin.sbt
rename to sbt-app/src/sbt-test/project1/source-plugins/project/plugin.sbt
diff --git a/sbt-app/src/sbt-test/project/src-plugins/plugin/JavaTest.java b/sbt-app/src/sbt-test/project1/src-plugins/plugin/JavaTest.java
similarity index 100%
rename from sbt-app/src/sbt-test/project/src-plugins/plugin/JavaTest.java
rename to sbt-app/src/sbt-test/project1/src-plugins/plugin/JavaTest.java
diff --git a/sbt-app/src/sbt-test/project/src-plugins/plugin/TestPlugin.scala b/sbt-app/src/sbt-test/project1/src-plugins/plugin/TestPlugin.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/src-plugins/plugin/TestPlugin.scala
rename to sbt-app/src/sbt-test/project1/src-plugins/plugin/TestPlugin.scala
diff --git a/sbt-app/src/sbt-test/project/src-plugins/plugin/build.sbt b/sbt-app/src/sbt-test/project1/src-plugins/plugin/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/src-plugins/plugin/build.sbt
rename to sbt-app/src/sbt-test/project1/src-plugins/plugin/build.sbt
diff --git a/sbt-app/src/sbt-test/project/src-plugins/project/p.sbt b/sbt-app/src/sbt-test/project1/src-plugins/project/p.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/src-plugins/project/p.sbt
rename to sbt-app/src/sbt-test/project1/src-plugins/project/p.sbt
diff --git a/sbt-app/src/sbt-test/project/src-plugins/test b/sbt-app/src/sbt-test/project1/src-plugins/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/src-plugins/test
rename to sbt-app/src/sbt-test/project1/src-plugins/test
diff --git a/sbt-app/src/sbt-test/project/src-scala-binary-version/b/build.sbt b/sbt-app/src/sbt-test/project1/src-scala-binary-version/b/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/src-scala-binary-version/b/build.sbt
rename to sbt-app/src/sbt-test/project1/src-scala-binary-version/b/build.sbt
diff --git a/sbt-app/src/sbt-test/project/src-scala-binary-version/build.sbt b/sbt-app/src/sbt-test/project1/src-scala-binary-version/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/src-scala-binary-version/build.sbt
rename to sbt-app/src/sbt-test/project1/src-scala-binary-version/build.sbt
diff --git a/sbt-app/src/sbt-test/project/src-scala-binary-version/test b/sbt-app/src/sbt-test/project1/src-scala-binary-version/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/src-scala-binary-version/test
rename to sbt-app/src/sbt-test/project1/src-scala-binary-version/test
diff --git a/sbt-app/src/sbt-test/project/subproject-dependson/build.sbt b/sbt-app/src/sbt-test/project1/subproject-dependson/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/subproject-dependson/build.sbt
rename to sbt-app/src/sbt-test/project1/subproject-dependson/build.sbt
diff --git a/sbt-app/src/sbt-test/project/subproject-dependson/projA/build.sbt b/sbt-app/src/sbt-test/project1/subproject-dependson/projA/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/subproject-dependson/projA/build.sbt
rename to sbt-app/src/sbt-test/project1/subproject-dependson/projA/build.sbt
diff --git a/sbt-app/src/sbt-test/project/subproject-dependson/projB/build.sbt b/sbt-app/src/sbt-test/project1/subproject-dependson/projB/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/subproject-dependson/projB/build.sbt
rename to sbt-app/src/sbt-test/project1/subproject-dependson/projB/build.sbt
diff --git a/sbt-app/src/sbt-test/project/subproject-dependson/test b/sbt-app/src/sbt-test/project1/subproject-dependson/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/subproject-dependson/test
rename to sbt-app/src/sbt-test/project1/subproject-dependson/test
diff --git a/sbt-app/src/sbt-test/project/test-script-file/build.sbt b/sbt-app/src/sbt-test/project1/test-script-file/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/test-script-file/build.sbt
rename to sbt-app/src/sbt-test/project1/test-script-file/build.sbt
diff --git a/sbt-app/src/sbt-test/project/test-script-file/test.script b/sbt-app/src/sbt-test/project1/test-script-file/test.script
similarity index 100%
rename from sbt-app/src/sbt-test/project/test-script-file/test.script
rename to sbt-app/src/sbt-test/project1/test-script-file/test.script
diff --git a/sbt-app/src/sbt-test/project/thisProject/build.sbt b/sbt-app/src/sbt-test/project1/thisProject/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/thisProject/build.sbt
rename to sbt-app/src/sbt-test/project1/thisProject/build.sbt
diff --git a/sbt-app/src/sbt-test/project/thisProject/proj2/build.sbt b/sbt-app/src/sbt-test/project1/thisProject/proj2/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/thisProject/proj2/build.sbt
rename to sbt-app/src/sbt-test/project1/thisProject/proj2/build.sbt
diff --git a/sbt-app/src/sbt-test/project/thisProject/test b/sbt-app/src/sbt-test/project1/thisProject/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/thisProject/test
rename to sbt-app/src/sbt-test/project1/thisProject/test
diff --git a/sbt-app/src/sbt-test/project/transitive-plugins/build.sbt b/sbt-app/src/sbt-test/project1/transitive-plugins/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/transitive-plugins/build.sbt
rename to sbt-app/src/sbt-test/project1/transitive-plugins/build.sbt
diff --git a/sbt-app/src/sbt-test/project/transitive-plugins/test b/sbt-app/src/sbt-test/project1/transitive-plugins/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/transitive-plugins/test
rename to sbt-app/src/sbt-test/project1/transitive-plugins/test
diff --git a/sbt-app/src/sbt-test/project/unified/build.sbt b/sbt-app/src/sbt-test/project1/unified/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/unified/build.sbt
rename to sbt-app/src/sbt-test/project1/unified/build.sbt
diff --git a/sbt-app/src/sbt-test/project/unified/src/test/scala/example/HelloTests.scala b/sbt-app/src/sbt-test/project1/unified/src/test/scala/example/HelloTests.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/unified/src/test/scala/example/HelloTests.scala
rename to sbt-app/src/sbt-test/project1/unified/src/test/scala/example/HelloTests.scala
diff --git a/sbt-app/src/sbt-test/project/unified/test b/sbt-app/src/sbt-test/project1/unified/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/unified/test
rename to sbt-app/src/sbt-test/project1/unified/test
diff --git a/sbt-app/src/sbt-test/project/unique-settings-computation/build.sbt b/sbt-app/src/sbt-test/project1/unique-settings-computation/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/unique-settings-computation/build.sbt
rename to sbt-app/src/sbt-test/project1/unique-settings-computation/build.sbt
diff --git a/sbt-app/src/sbt-test/project/unique-settings-computation/disabled b/sbt-app/src/sbt-test/project1/unique-settings-computation/disabled
similarity index 100%
rename from sbt-app/src/sbt-test/project/unique-settings-computation/disabled
rename to sbt-app/src/sbt-test/project1/unique-settings-computation/disabled
diff --git a/sbt-app/src/sbt-test/project/unique-settings-computation/project/A.scala b/sbt-app/src/sbt-test/project1/unique-settings-computation/project/A.scala
similarity index 100%
rename from sbt-app/src/sbt-test/project/unique-settings-computation/project/A.scala
rename to sbt-app/src/sbt-test/project1/unique-settings-computation/project/A.scala
diff --git a/sbt-app/src/sbt-test/project/update-classifiers/build.sbt b/sbt-app/src/sbt-test/project1/update-classifiers/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/update-classifiers/build.sbt
rename to sbt-app/src/sbt-test/project1/update-classifiers/build.sbt
diff --git a/sbt-app/src/sbt-test/project/update-classifiers/test b/sbt-app/src/sbt-test/project1/update-classifiers/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/update-classifiers/test
rename to sbt-app/src/sbt-test/project1/update-classifiers/test
diff --git a/sbt-app/src/sbt-test/project/val-order/build.sbt b/sbt-app/src/sbt-test/project1/val-order/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project/val-order/build.sbt
rename to sbt-app/src/sbt-test/project1/val-order/build.sbt
diff --git a/sbt-app/src/sbt-test/project/val-order/test b/sbt-app/src/sbt-test/project1/val-order/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/val-order/test
rename to sbt-app/src/sbt-test/project1/val-order/test