diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/api-url/build.sbt b/sbt-app/src/sbt-test/lm-coursier/api-url/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/api-url/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/api-url/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/api-url/test b/sbt-app/src/sbt-test/lm-coursier/api-url/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/api-url/test
rename to sbt-app/src/sbt-test/lm-coursier/api-url/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/caller/build.sbt b/sbt-app/src/sbt-test/lm-coursier/caller/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/caller/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/caller/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/caller/test b/sbt-app/src/sbt-test/lm-coursier/caller/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/caller/test
rename to sbt-app/src/sbt-test/lm-coursier/caller/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/classifiers/build.sbt b/sbt-app/src/sbt-test/lm-coursier/classifiers/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/classifiers/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/classifiers/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/classifiers/src/main/scala/Main.scala b/sbt-app/src/sbt-test/lm-coursier/classifiers/src/main/scala/Main.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/classifiers/src/main/scala/Main.scala
rename to sbt-app/src/sbt-test/lm-coursier/classifiers/src/main/scala/Main.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/classifiers/test b/sbt-app/src/sbt-test/lm-coursier/classifiers/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/classifiers/test
rename to sbt-app/src/sbt-test/lm-coursier/classifiers/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/clean/build.sbt b/sbt-app/src/sbt-test/lm-coursier/clean/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/clean/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/clean/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/clean/project/Helper.scala b/sbt-app/src/sbt-test/lm-coursier/clean/project/Helper.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/clean/project/Helper.scala
rename to sbt-app/src/sbt-test/lm-coursier/clean/project/Helper.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/clean/test b/sbt-app/src/sbt-test/lm-coursier/clean/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/clean/test
rename to sbt-app/src/sbt-test/lm-coursier/clean/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/build.sbt b/sbt-app/src/sbt-test/lm-coursier/config-deps-resolution/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/config-deps-resolution/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala b/sbt-app/src/sbt-test/lm-coursier/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala
rename to sbt-app/src/sbt-test/lm-coursier/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/src/main/scala/App.scala b/sbt-app/src/sbt-test/lm-coursier/config-deps-resolution/src/main/scala/App.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/src/main/scala/App.scala
rename to sbt-app/src/sbt-test/lm-coursier/config-deps-resolution/src/main/scala/App.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/test b/sbt-app/src/sbt-test/lm-coursier/config-deps-resolution/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/test
rename to sbt-app/src/sbt-test/lm-coursier/config-deps-resolution/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-from-file/build.sbt b/sbt-app/src/sbt-test/lm-coursier/credentials-from-file/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-from-file/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/credentials-from-file/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-from-file/src/main/scala/Main.scala b/sbt-app/src/sbt-test/lm-coursier/credentials-from-file/src/main/scala/Main.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-from-file/src/main/scala/Main.scala
rename to sbt-app/src/sbt-test/lm-coursier/credentials-from-file/src/main/scala/Main.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-from-file/test b/sbt-app/src/sbt-test/lm-coursier/credentials-from-file/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-from-file/test
rename to sbt-app/src/sbt-test/lm-coursier/credentials-from-file/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-global/build.sbt b/sbt-app/src/sbt-test/lm-coursier/credentials-global/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-global/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/credentials-global/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-global/global/build.sbt b/sbt-app/src/sbt-test/lm-coursier/credentials-global/global/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-global/global/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/credentials-global/global/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-global/src/main/scala/Main.scala b/sbt-app/src/sbt-test/lm-coursier/credentials-global/src/main/scala/Main.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-global/src/main/scala/Main.scala
rename to sbt-app/src/sbt-test/lm-coursier/credentials-global/src/main/scala/Main.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-global/test b/sbt-app/src/sbt-test/lm-coursier/credentials-global/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-global/test
rename to sbt-app/src/sbt-test/lm-coursier/credentials-global/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/build.sbt b/sbt-app/src/sbt-test/lm-coursier/credentials-sbt-global/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/credentials-sbt-global/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/global/build.sbt b/sbt-app/src/sbt-test/lm-coursier/credentials-sbt-global/global/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/global/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/credentials-sbt-global/global/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/src/main/scala/Main.scala b/sbt-app/src/sbt-test/lm-coursier/credentials-sbt-global/src/main/scala/Main.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/src/main/scala/Main.scala
rename to sbt-app/src/sbt-test/lm-coursier/credentials-sbt-global/src/main/scala/Main.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/test b/sbt-app/src/sbt-test/lm-coursier/credentials-sbt-global/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/test
rename to sbt-app/src/sbt-test/lm-coursier/credentials-sbt-global/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-sbt/build.sbt b/sbt-app/src/sbt-test/lm-coursier/credentials-sbt/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-sbt/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/credentials-sbt/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-sbt/src/main/scala/Main.scala b/sbt-app/src/sbt-test/lm-coursier/credentials-sbt/src/main/scala/Main.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-sbt/src/main/scala/Main.scala
rename to sbt-app/src/sbt-test/lm-coursier/credentials-sbt/src/main/scala/Main.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-sbt/test b/sbt-app/src/sbt-test/lm-coursier/credentials-sbt/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-sbt/test
rename to sbt-app/src/sbt-test/lm-coursier/credentials-sbt/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dependency-overrides/build.sbt b/sbt-app/src/sbt-test/lm-coursier/dependency-overrides/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/dependency-overrides/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/dependency-overrides/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dependency-overrides/src/main/scala/Main.scala b/sbt-app/src/sbt-test/lm-coursier/dependency-overrides/src/main/scala/Main.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/dependency-overrides/src/main/scala/Main.scala
rename to sbt-app/src/sbt-test/lm-coursier/dependency-overrides/src/main/scala/Main.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dependency-overrides/test b/sbt-app/src/sbt-test/lm-coursier/dependency-overrides/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/dependency-overrides/test
rename to sbt-app/src/sbt-test/lm-coursier/dependency-overrides/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/evicted/build.sbt b/sbt-app/src/sbt-test/lm-coursier/evicted/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/evicted/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/evicted/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/evicted/test b/sbt-app/src/sbt-test/lm-coursier/evicted/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/evicted/test
rename to sbt-app/src/sbt-test/lm-coursier/evicted/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/from-no-head/build.sbt b/sbt-app/src/sbt-test/lm-coursier/from-no-head/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/from-no-head/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/from-no-head/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/from-no-head/src/main/scala/Main.scala b/sbt-app/src/sbt-test/lm-coursier/from-no-head/src/main/scala/Main.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/from-no-head/src/main/scala/Main.scala
rename to sbt-app/src/sbt-test/lm-coursier/from-no-head/src/main/scala/Main.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/test b/sbt-app/src/sbt-test/lm-coursier/from-no-head/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/test
rename to sbt-app/src/sbt-test/lm-coursier/from-no-head/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/build.sbt b/sbt-app/src/sbt-test/lm-coursier/from-wrong-url/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/from-wrong-url/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/src/main/scala/Main.scala b/sbt-app/src/sbt-test/lm-coursier/from-wrong-url/src/main/scala/Main.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/src/main/scala/Main.scala
rename to sbt-app/src/sbt-test/lm-coursier/from-wrong-url/src/main/scala/Main.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel/test b/sbt-app/src/sbt-test/lm-coursier/from-wrong-url/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel/test
rename to sbt-app/src/sbt-test/lm-coursier/from-wrong-url/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/from/build.sbt b/sbt-app/src/sbt-test/lm-coursier/from/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/from/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/from/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/from/src/main/scala/Main.scala b/sbt-app/src/sbt-test/lm-coursier/from/src/main/scala/Main.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/from/src/main/scala/Main.scala
rename to sbt-app/src/sbt-test/lm-coursier/from/src/main/scala/Main.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/from/test b/sbt-app/src/sbt-test/lm-coursier/from/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/from/test
rename to sbt-app/src/sbt-test/lm-coursier/from/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/a/src/main/scala/A.scala b/sbt-app/src/sbt-test/lm-coursier/inter-project-resolvers/a/src/main/scala/A.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/a/src/main/scala/A.scala
rename to sbt-app/src/sbt-test/lm-coursier/inter-project-resolvers/a/src/main/scala/A.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/b/src/main/scala/Main.scala b/sbt-app/src/sbt-test/lm-coursier/inter-project-resolvers/b/src/main/scala/Main.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/b/src/main/scala/Main.scala
rename to sbt-app/src/sbt-test/lm-coursier/inter-project-resolvers/b/src/main/scala/Main.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/build.sbt b/sbt-app/src/sbt-test/lm-coursier/inter-project-resolvers/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/inter-project-resolvers/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/test b/sbt-app/src/sbt-test/lm-coursier/inter-project-resolvers/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/test
rename to sbt-app/src/sbt-test/lm-coursier/inter-project-resolvers/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project-scala-tool/build.sbt b/sbt-app/src/sbt-test/lm-coursier/inter-project-scala-tool/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project-scala-tool/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/inter-project-scala-tool/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project-scala-tool/src/main/scala/Main.scala b/sbt-app/src/sbt-test/lm-coursier/inter-project-scala-tool/src/main/scala/Main.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project-scala-tool/src/main/scala/Main.scala
rename to sbt-app/src/sbt-test/lm-coursier/inter-project-scala-tool/src/main/scala/Main.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project-scala-tool/test b/sbt-app/src/sbt-test/lm-coursier/inter-project-scala-tool/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project-scala-tool/test
rename to sbt-app/src/sbt-test/lm-coursier/inter-project-scala-tool/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/logger/build.sbt b/sbt-app/src/sbt-test/lm-coursier/logger/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/logger/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/logger/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/logger/test b/sbt-app/src/sbt-test/lm-coursier/logger/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/logger/test
rename to sbt-app/src/sbt-test/lm-coursier/logger/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-compatible/build.sbt b/sbt-app/src/sbt-test/lm-coursier/maven-compatible/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-compatible/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/maven-compatible/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-compatible/src/main/scala/Main.scala b/sbt-app/src/sbt-test/lm-coursier/maven-compatible/src/main/scala/Main.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-compatible/src/main/scala/Main.scala
rename to sbt-app/src/sbt-test/lm-coursier/maven-compatible/src/main/scala/Main.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/from-no-head/test b/sbt-app/src/sbt-test/lm-coursier/maven-compatible/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/from-no-head/test
rename to sbt-app/src/sbt-test/lm-coursier/maven-compatible/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/build.sbt b/sbt-app/src/sbt-test/lm-coursier/maven-plugin-classpath-type/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/maven-plugin-classpath-type/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/pending b/sbt-app/src/sbt-test/lm-coursier/maven-plugin-classpath-type/pending
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/pending
rename to sbt-app/src/sbt-test/lm-coursier/maven-plugin-classpath-type/pending
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/project/plugins.sbt b/sbt-app/src/sbt-test/lm-coursier/maven-plugin-classpath-type/project/plugins.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/project/plugins.sbt
rename to sbt-app/src/sbt-test/lm-coursier/maven-plugin-classpath-type/project/plugins.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/src/main/scala/Main.scala b/sbt-app/src/sbt-test/lm-coursier/maven-plugin-classpath-type/src/main/scala/Main.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/src/main/scala/Main.scala
rename to sbt-app/src/sbt-test/lm-coursier/maven-plugin-classpath-type/src/main/scala/Main.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/build.sbt b/sbt-app/src/sbt-test/lm-coursier/neo-sbt-scalafmt/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/neo-sbt-scalafmt/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/pending b/sbt-app/src/sbt-test/lm-coursier/neo-sbt-scalafmt/pending
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/pending
rename to sbt-app/src/sbt-test/lm-coursier/neo-sbt-scalafmt/pending
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/project/plugins.sbt b/sbt-app/src/sbt-test/lm-coursier/neo-sbt-scalafmt/project/plugins.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/project/plugins.sbt
rename to sbt-app/src/sbt-test/lm-coursier/neo-sbt-scalafmt/project/plugins.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/src/main/scala/Main.scala b/sbt-app/src/sbt-test/lm-coursier/neo-sbt-scalafmt/src/main/scala/Main.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/src/main/scala/Main.scala
rename to sbt-app/src/sbt-test/lm-coursier/neo-sbt-scalafmt/src/main/scala/Main.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/per-config-resolution/build.sbt b/sbt-app/src/sbt-test/lm-coursier/per-config-resolution/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/per-config-resolution/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/per-config-resolution/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/per-config-resolution/src/main/scala/Main.scala b/sbt-app/src/sbt-test/lm-coursier/per-config-resolution/src/main/scala/Main.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/per-config-resolution/src/main/scala/Main.scala
rename to sbt-app/src/sbt-test/lm-coursier/per-config-resolution/src/main/scala/Main.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/per-config-resolution/src/test/scala/Test.scala b/sbt-app/src/sbt-test/lm-coursier/per-config-resolution/src/test/scala/Test.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/per-config-resolution/src/test/scala/Test.scala
rename to sbt-app/src/sbt-test/lm-coursier/per-config-resolution/src/test/scala/Test.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/per-config-resolution/test b/sbt-app/src/sbt-test/lm-coursier/per-config-resolution/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/per-config-resolution/test
rename to sbt-app/src/sbt-test/lm-coursier/per-config-resolution/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/README b/sbt-app/src/sbt-test/lm-coursier/publish-local-signed/README
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/README
rename to sbt-app/src/sbt-test/lm-coursier/publish-local-signed/README
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/build.sbt b/sbt-app/src/sbt-test/lm-coursier/publish-local-signed/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/publish-local-signed/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/pending b/sbt-app/src/sbt-test/lm-coursier/publish-local-signed/pending
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/pending
rename to sbt-app/src/sbt-test/lm-coursier/publish-local-signed/pending
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/project/plugins.sbt b/sbt-app/src/sbt-test/lm-coursier/publish-local-signed/project/plugins.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/project/plugins.sbt
rename to sbt-app/src/sbt-test/lm-coursier/publish-local-signed/project/plugins.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/pubring.pgp b/sbt-app/src/sbt-test/lm-coursier/publish-local-signed/pubring.pgp
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/pubring.pgp
rename to sbt-app/src/sbt-test/lm-coursier/publish-local-signed/pubring.pgp
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/secring.pgp b/sbt-app/src/sbt-test/lm-coursier/publish-local-signed/secring.pgp
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/secring.pgp
rename to sbt-app/src/sbt-test/lm-coursier/publish-local-signed/secring.pgp
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/src/main/scala/Foo.scala b/sbt-app/src/sbt-test/lm-coursier/publish-local-signed/src/main/scala/Foo.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/src/main/scala/Foo.scala
rename to sbt-app/src/sbt-test/lm-coursier/publish-local-signed/src/main/scala/Foo.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-sources-javadoc-conf/build.sbt b/sbt-app/src/sbt-test/lm-coursier/publish-local-sources-javadoc-conf/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-sources-javadoc-conf/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/publish-local-sources-javadoc-conf/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-sources-javadoc-conf/test b/sbt-app/src/sbt-test/lm-coursier/publish-local-sources-javadoc-conf/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-sources-javadoc-conf/test
rename to sbt-app/src/sbt-test/lm-coursier/publish-local-sources-javadoc-conf/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/build.sbt b/sbt-app/src/sbt-test/lm-coursier/sbt-assembly/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/sbt-assembly/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/pending b/sbt-app/src/sbt-test/lm-coursier/sbt-assembly/pending
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/pending
rename to sbt-app/src/sbt-test/lm-coursier/sbt-assembly/pending
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/project/plugins.sbt b/sbt-app/src/sbt-test/lm-coursier/sbt-assembly/project/plugins.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/project/plugins.sbt
rename to sbt-app/src/sbt-test/lm-coursier/sbt-assembly/project/plugins.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-jars/build.sbt b/sbt-app/src/sbt-test/lm-coursier/scala-jars/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-jars/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/scala-jars/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-jars/src/main/scala/Main.scala b/sbt-app/src/sbt-test/lm-coursier/scala-jars/src/main/scala/Main.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-jars/src/main/scala/Main.scala
rename to sbt-app/src/sbt-test/lm-coursier/scala-jars/src/main/scala/Main.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/test b/sbt-app/src/sbt-test/lm-coursier/scala-jars/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/test
rename to sbt-app/src/sbt-test/lm-coursier/scala-jars/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-sources-javadoc-jars/build.sbt b/sbt-app/src/sbt-test/lm-coursier/scala-sources-javadoc-jars/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-sources-javadoc-jars/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/scala-sources-javadoc-jars/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-sources-javadoc-jars/src/main/scala/Main.scala b/sbt-app/src/sbt-test/lm-coursier/scala-sources-javadoc-jars/src/main/scala/Main.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-sources-javadoc-jars/src/main/scala/Main.scala
rename to sbt-app/src/sbt-test/lm-coursier/scala-sources-javadoc-jars/src/main/scala/Main.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-sources-javadoc-jars/test b/sbt-app/src/sbt-test/lm-coursier/scala-sources-javadoc-jars/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-sources-javadoc-jars/test
rename to sbt-app/src/sbt-test/lm-coursier/scala-sources-javadoc-jars/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/semver-reconciliation/build.sbt b/sbt-app/src/sbt-test/lm-coursier/semver-reconciliation/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/semver-reconciliation/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/semver-reconciliation/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/semver-reconciliation/test b/sbt-app/src/sbt-test/lm-coursier/semver-reconciliation/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/semver-reconciliation/test
rename to sbt-app/src/sbt-test/lm-coursier/semver-reconciliation/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/simple/build.sbt b/sbt-app/src/sbt-test/lm-coursier/simple/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/simple/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/simple/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/simple/src/main/scala/Main.scala b/sbt-app/src/sbt-test/lm-coursier/simple/src/main/scala/Main.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/simple/src/main/scala/Main.scala
rename to sbt-app/src/sbt-test/lm-coursier/simple/src/main/scala/Main.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/simple/test b/sbt-app/src/sbt-test/lm-coursier/simple/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/simple/test
rename to sbt-app/src/sbt-test/lm-coursier/simple/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/strict-conflict-manager/build.sbt b/sbt-app/src/sbt-test/lm-coursier/strict-conflict-manager/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/strict-conflict-manager/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/strict-conflict-manager/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/strict-conflict-manager/test b/sbt-app/src/sbt-test/lm-coursier/strict-conflict-manager/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/strict-conflict-manager/test
rename to sbt-app/src/sbt-test/lm-coursier/strict-conflict-manager/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/tests-classifier/a/src/main/scala/a/A.scala b/sbt-app/src/sbt-test/lm-coursier/tests-classifier/a/src/main/scala/a/A.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/tests-classifier/a/src/main/scala/a/A.scala
rename to sbt-app/src/sbt-test/lm-coursier/tests-classifier/a/src/main/scala/a/A.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/tests-classifier/a/src/test/scala/a/ATest.scala b/sbt-app/src/sbt-test/lm-coursier/tests-classifier/a/src/test/scala/a/ATest.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/tests-classifier/a/src/test/scala/a/ATest.scala
rename to sbt-app/src/sbt-test/lm-coursier/tests-classifier/a/src/test/scala/a/ATest.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/tests-classifier/b/src/main/scala/b/B.scala b/sbt-app/src/sbt-test/lm-coursier/tests-classifier/b/src/main/scala/b/B.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/tests-classifier/b/src/main/scala/b/B.scala
rename to sbt-app/src/sbt-test/lm-coursier/tests-classifier/b/src/main/scala/b/B.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/tests-classifier/b/src/test/scala/b/BTest.scala b/sbt-app/src/sbt-test/lm-coursier/tests-classifier/b/src/test/scala/b/BTest.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/tests-classifier/b/src/test/scala/b/BTest.scala
rename to sbt-app/src/sbt-test/lm-coursier/tests-classifier/b/src/test/scala/b/BTest.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/tests-classifier/build.sbt b/sbt-app/src/sbt-test/lm-coursier/tests-classifier/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/tests-classifier/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/tests-classifier/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/tests-classifier/test b/sbt-app/src/sbt-test/lm-coursier/tests-classifier/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/tests-classifier/test
rename to sbt-app/src/sbt-test/lm-coursier/tests-classifier/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/build.sbt b/sbt-app/src/sbt-test/lm-coursier/typelevel-force-version-stdlib/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/typelevel-force-version-stdlib/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/src/main/scala/Main.scala b/sbt-app/src/sbt-test/lm-coursier/typelevel-force-version-stdlib/src/main/scala/Main.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/src/main/scala/Main.scala
rename to sbt-app/src/sbt-test/lm-coursier/typelevel-force-version-stdlib/src/main/scala/Main.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-compatible/test b/sbt-app/src/sbt-test/lm-coursier/typelevel-force-version-stdlib/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-compatible/test
rename to sbt-app/src/sbt-test/lm-coursier/typelevel-force-version-stdlib/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/build.sbt b/sbt-app/src/sbt-test/lm-coursier/typelevel-with-dependencies/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/typelevel-with-dependencies/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/src/main/scala/Foo.scala b/sbt-app/src/sbt-test/lm-coursier/typelevel-with-dependencies/src/main/scala/Foo.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/src/main/scala/Foo.scala
rename to sbt-app/src/sbt-test/lm-coursier/typelevel-with-dependencies/src/main/scala/Foo.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/test b/sbt-app/src/sbt-test/lm-coursier/typelevel-with-dependencies/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/test
rename to sbt-app/src/sbt-test/lm-coursier/typelevel-with-dependencies/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel/build.sbt b/sbt-app/src/sbt-test/lm-coursier/typelevel/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/typelevel/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel/src/main/scala/Main.scala b/sbt-app/src/sbt-test/lm-coursier/typelevel/src/main/scala/Main.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel/src/main/scala/Main.scala
rename to sbt-app/src/sbt-test/lm-coursier/typelevel/src/main/scala/Main.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-jars/test b/sbt-app/src/sbt-test/lm-coursier/typelevel/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-jars/test
rename to sbt-app/src/sbt-test/lm-coursier/typelevel/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/update-sbt-classifiers-2/build.sbt b/sbt-app/src/sbt-test/lm-coursier/update-sbt-classifiers-2/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/update-sbt-classifiers-2/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/update-sbt-classifiers-2/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/update-sbt-classifiers-2/test b/sbt-app/src/sbt-test/lm-coursier/update-sbt-classifiers-2/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/update-sbt-classifiers-2/test
rename to sbt-app/src/sbt-test/lm-coursier/update-sbt-classifiers-2/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/update-sbt-classifiers/build.sbt b/sbt-app/src/sbt-test/lm-coursier/update-sbt-classifiers/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/update-sbt-classifiers/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/update-sbt-classifiers/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/update-sbt-classifiers/test b/sbt-app/src/sbt-test/lm-coursier/update-sbt-classifiers/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/update-sbt-classifiers/test
rename to sbt-app/src/sbt-test/lm-coursier/update-sbt-classifiers/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/version-reconciliation/build.sbt b/sbt-app/src/sbt-test/lm-coursier/version-reconciliation/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/version-reconciliation/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/version-reconciliation/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/version-reconciliation/test b/sbt-app/src/sbt-test/lm-coursier/version-reconciliation/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/version-reconciliation/test
rename to sbt-app/src/sbt-test/lm-coursier/version-reconciliation/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/whitespace-resolver/build.sbt b/sbt-app/src/sbt-test/lm-coursier/whitespace-resolver/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/whitespace-resolver/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/whitespace-resolver/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/whitespace-resolver/test b/sbt-app/src/sbt-test/lm-coursier/whitespace-resolver/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/whitespace-resolver/test
rename to sbt-app/src/sbt-test/lm-coursier/whitespace-resolver/test
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/zookeeper/build.sbt b/sbt-app/src/sbt-test/lm-coursier/zookeeper/build.sbt
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/zookeeper/build.sbt
rename to sbt-app/src/sbt-test/lm-coursier/zookeeper/build.sbt
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/zookeeper/src/main/scala/Main.scala b/sbt-app/src/sbt-test/lm-coursier/zookeeper/src/main/scala/Main.scala
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/zookeeper/src/main/scala/Main.scala
rename to sbt-app/src/sbt-test/lm-coursier/zookeeper/src/main/scala/Main.scala
diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/zookeeper/test b/sbt-app/src/sbt-test/lm-coursier/zookeeper/test
similarity index 100%
rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/zookeeper/test
rename to sbt-app/src/sbt-test/lm-coursier/zookeeper/test