collapse boilerplate folder structure within src/ folders (#505)

* collapse boilerplate folder structure within src/ folders

* .

52 files changed, 2 insertions, 2 deletions

diff --git a/scalalib/api/src/mill/scalalib/api/ZincWorkerApi.scala b/scalalib/api/src/ZincWorkerApi.scala
index c5230ec5..c5230ec5 100644
--- a/scalalib/api/src/mill/scalalib/api/ZincWorkerApi.scala
+++ b/scalalib/api/src/ZincWorkerApi.scala
diff --git a/scalalib/backgroundwrapper/src/mill/scalalib/backgroundwrapper/BackgroundWrapper.java b/scalalib/backgroundwrapper/src/BackgroundWrapper.java
index 02ee23eb..02ee23eb 100644
--- a/scalalib/backgroundwrapper/src/mill/scalalib/backgroundwrapper/BackgroundWrapper.java
+++ b/scalalib/backgroundwrapper/src/BackgroundWrapper.java
diff --git a/scalalib/src/mill/scalalib/Dep.scala b/scalalib/src/Dep.scala
index 714fa21e..714fa21e 100644
--- a/scalalib/src/mill/scalalib/Dep.scala
+++ b/scalalib/src/Dep.scala
diff --git a/scalalib/src/mill/scalalib/Dependency.scala b/scalalib/src/Dependency.scala
index 0c589663..0c589663 100644
--- a/scalalib/src/mill/scalalib/Dependency.scala
+++ b/scalalib/src/Dependency.scala
diff --git a/scalalib/src/mill/scalalib/GenIdeaImpl.scala b/scalalib/src/GenIdeaImpl.scala
index 2d76d804..2d76d804 100644
--- a/scalalib/src/mill/scalalib/GenIdeaImpl.scala
+++ b/scalalib/src/GenIdeaImpl.scala
diff --git a/scalalib/src/mill/scalalib/JavaModule.scala b/scalalib/src/JavaModule.scala
index 78be8893..78be8893 100644
--- a/scalalib/src/mill/scalalib/JavaModule.scala
+++ b/scalalib/src/JavaModule.scala
diff --git a/scalalib/src/mill/scalalib/Lib.scala b/scalalib/src/Lib.scala
index b8b253bd..b8b253bd 100644
--- a/scalalib/src/mill/scalalib/Lib.scala
+++ b/scalalib/src/Lib.scala
diff --git a/scalalib/src/mill/scalalib/MiscModule.scala b/scalalib/src/MiscModule.scala
index c6449d6e..c6449d6e 100644
--- a/scalalib/src/mill/scalalib/MiscModule.scala
+++ b/scalalib/src/MiscModule.scala
diff --git a/scalalib/src/mill/scalalib/PublishModule.scala b/scalalib/src/PublishModule.scala
index 588781f4..588781f4 100644
--- a/scalalib/src/mill/scalalib/PublishModule.scala
+++ b/scalalib/src/PublishModule.scala
diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/ScalaModule.scala
index 9d669bf4..9d669bf4 100644
--- a/scalalib/src/mill/scalalib/ScalaModule.scala
+++ b/scalalib/src/ScalaModule.scala
diff --git a/scalalib/src/mill/scalalib/TestRunner.scala b/scalalib/src/TestRunner.scala
index 42e65d63..42e65d63 100644
--- a/scalalib/src/mill/scalalib/TestRunner.scala
+++ b/scalalib/src/TestRunner.scala
diff --git a/scalalib/src/mill/scalalib/Versions.scala b/scalalib/src/Versions.scala
index e7eaf847..e7eaf847 100644
--- a/scalalib/src/mill/scalalib/Versions.scala
+++ b/scalalib/src/Versions.scala
diff --git a/scalalib/src/mill/scalalib/ZincWorkerModule.scala b/scalalib/src/ZincWorkerModule.scala
index 5ca824ce..5ca824ce 100644
--- a/scalalib/src/mill/scalalib/ZincWorkerModule.scala
+++ b/scalalib/src/ZincWorkerModule.scala
diff --git a/scalalib/src/mill/scalalib/dependency/DependencyUpdatesImpl.scala b/scalalib/src/dependency/DependencyUpdatesImpl.scala
index 3bb94202..3bb94202 100644
--- a/scalalib/src/mill/scalalib/dependency/DependencyUpdatesImpl.scala
+++ b/scalalib/src/dependency/DependencyUpdatesImpl.scala
diff --git a/scalalib/src/mill/scalalib/dependency/metadata/MavenMetadataLoader.scala b/scalalib/src/dependency/metadata/MavenMetadataLoader.scala
index 491911bf..491911bf 100644
--- a/scalalib/src/mill/scalalib/dependency/metadata/MavenMetadataLoader.scala
+++ b/scalalib/src/dependency/metadata/MavenMetadataLoader.scala
diff --git a/scalalib/src/mill/scalalib/dependency/metadata/MetadataLoader.scala b/scalalib/src/dependency/metadata/MetadataLoader.scala
index 20271f0e..20271f0e 100644
--- a/scalalib/src/mill/scalalib/dependency/metadata/MetadataLoader.scala
+++ b/scalalib/src/dependency/metadata/MetadataLoader.scala
diff --git a/scalalib/src/mill/scalalib/dependency/metadata/MetadataLoaderFactory.scala b/scalalib/src/dependency/metadata/MetadataLoaderFactory.scala
index 4495d6b0..4495d6b0 100644
--- a/scalalib/src/mill/scalalib/dependency/metadata/MetadataLoaderFactory.scala
+++ b/scalalib/src/dependency/metadata/MetadataLoaderFactory.scala
diff --git a/scalalib/src/mill/scalalib/dependency/updates/ModuleDependenciesUpdates.scala b/scalalib/src/dependency/updates/ModuleDependenciesUpdates.scala
index a989cd31..a989cd31 100644
--- a/scalalib/src/mill/scalalib/dependency/updates/ModuleDependenciesUpdates.scala
+++ b/scalalib/src/dependency/updates/ModuleDependenciesUpdates.scala
diff --git a/scalalib/src/mill/scalalib/dependency/updates/UpdatesFinder.scala b/scalalib/src/dependency/updates/UpdatesFinder.scala
index 3430592f..3430592f 100644
--- a/scalalib/src/mill/scalalib/dependency/updates/UpdatesFinder.scala
+++ b/scalalib/src/dependency/updates/UpdatesFinder.scala
diff --git a/scalalib/src/mill/scalalib/dependency/versions/ModuleDependenciesVersions.scala b/scalalib/src/dependency/versions/ModuleDependenciesVersions.scala
index 12d57059..12d57059 100644
--- a/scalalib/src/mill/scalalib/dependency/versions/ModuleDependenciesVersions.scala
+++ b/scalalib/src/dependency/versions/ModuleDependenciesVersions.scala
diff --git a/scalalib/src/mill/scalalib/dependency/versions/Version.scala b/scalalib/src/dependency/versions/Version.scala
index a2719023..a2719023 100644
--- a/scalalib/src/mill/scalalib/dependency/versions/Version.scala
+++ b/scalalib/src/dependency/versions/Version.scala
diff --git a/scalalib/src/mill/scalalib/dependency/versions/VersionParser.scala b/scalalib/src/dependency/versions/VersionParser.scala
index 10aebd73..10aebd73 100644
--- a/scalalib/src/mill/scalalib/dependency/versions/VersionParser.scala
+++ b/scalalib/src/dependency/versions/VersionParser.scala
diff --git a/scalalib/src/mill/scalalib/dependency/versions/VersionsFinder.scala b/scalalib/src/dependency/versions/VersionsFinder.scala
index a831ffc3..a831ffc3 100644
--- a/scalalib/src/mill/scalalib/dependency/versions/VersionsFinder.scala
+++ b/scalalib/src/dependency/versions/VersionsFinder.scala
diff --git a/scalalib/src/mill/scalalib/package.scala b/scalalib/src/package.scala
index 5a282e82..5a282e82 100644
--- a/scalalib/src/mill/scalalib/package.scala
+++ b/scalalib/src/package.scala
diff --git a/scalalib/src/mill/scalalib/publish/Ivy.scala b/scalalib/src/publish/Ivy.scala
index 22e26ff6..22e26ff6 100644
--- a/scalalib/src/mill/scalalib/publish/Ivy.scala
+++ b/scalalib/src/publish/Ivy.scala
diff --git a/scalalib/src/mill/scalalib/publish/JsonFormatters.scala b/scalalib/src/publish/JsonFormatters.scala
index 8fc90632..8fc90632 100644
--- a/scalalib/src/mill/scalalib/publish/JsonFormatters.scala
+++ b/scalalib/src/publish/JsonFormatters.scala
diff --git a/scalalib/src/mill/scalalib/publish/Licence.scala b/scalalib/src/publish/Licence.scala
index 8838ef69..8838ef69 100644
--- a/scalalib/src/mill/scalalib/publish/Licence.scala
+++ b/scalalib/src/publish/Licence.scala
diff --git a/scalalib/src/mill/scalalib/publish/LocalPublisher.scala b/scalalib/src/publish/LocalPublisher.scala
index d9839831..d9839831 100644
--- a/scalalib/src/mill/scalalib/publish/LocalPublisher.scala
+++ b/scalalib/src/publish/LocalPublisher.scala
diff --git a/scalalib/src/mill/scalalib/publish/Pom.scala b/scalalib/src/publish/Pom.scala
index 57a0e196..57a0e196 100644
--- a/scalalib/src/mill/scalalib/publish/Pom.scala
+++ b/scalalib/src/publish/Pom.scala
diff --git a/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala b/scalalib/src/publish/SonatypeHttpApi.scala
index 12defa93..12defa93 100644
--- a/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala
+++ b/scalalib/src/publish/SonatypeHttpApi.scala
diff --git a/scalalib/src/mill/scalalib/publish/SonatypePublisher.scala b/scalalib/src/publish/SonatypePublisher.scala
index 1843943b..1843943b 100644
--- a/scalalib/src/mill/scalalib/publish/SonatypePublisher.scala
+++ b/scalalib/src/publish/SonatypePublisher.scala
diff --git a/scalalib/src/mill/scalalib/publish/VersionControl.scala b/scalalib/src/publish/VersionControl.scala
index aad38ac3..aad38ac3 100644
--- a/scalalib/src/mill/scalalib/publish/VersionControl.scala
+++ b/scalalib/src/publish/VersionControl.scala
diff --git a/scalalib/src/mill/scalalib/publish/package.scala b/scalalib/src/publish/package.scala
index 99eeec14..99eeec14 100644
--- a/scalalib/src/mill/scalalib/publish/package.scala
+++ b/scalalib/src/publish/package.scala
diff --git a/scalalib/src/mill/scalalib/publish/settings.scala b/scalalib/src/publish/settings.scala
index bca81cf0..bca81cf0 100644
--- a/scalalib/src/mill/scalalib/publish/settings.scala
+++ b/scalalib/src/publish/settings.scala
diff --git a/scalalib/src/mill/scalalib/scalafmt/ScalafmtModule.scala b/scalalib/src/scalafmt/ScalafmtModule.scala
index 6a81d975..6a81d975 100644
--- a/scalalib/src/mill/scalalib/scalafmt/ScalafmtModule.scala
+++ b/scalalib/src/scalafmt/ScalafmtModule.scala
diff --git a/scalalib/src/mill/scalalib/scalafmt/ScalafmtWorker.scala b/scalalib/src/scalafmt/ScalafmtWorker.scala
index 47d8375f..47d8375f 100644
--- a/scalalib/src/mill/scalalib/scalafmt/ScalafmtWorker.scala
+++ b/scalalib/src/scalafmt/ScalafmtWorker.scala
diff --git a/scalalib/test/resources/hello-java/app/src/hello/Main.java b/scalalib/test/resources/hello-java/app/src/Main.java
index 23ddd679..23ddd679 100644
--- a/scalalib/test/resources/hello-java/app/src/hello/Main.java
+++ b/scalalib/test/resources/hello-java/app/src/Main.java
diff --git a/scalalib/test/resources/hello-java/app/test/src/hello/MyAppTests.java b/scalalib/test/resources/hello-java/app/test/src/MyAppTests.java
index df0d0351..df0d0351 100644
--- a/scalalib/test/resources/hello-java/app/test/src/hello/MyAppTests.java
+++ b/scalalib/test/resources/hello-java/app/test/src/MyAppTests.java
diff --git a/scalalib/test/resources/hello-java/core/src/hello/Core.java b/scalalib/test/resources/hello-java/core/src/Core.java
index 3ecb1f61..3ecb1f61 100644
--- a/scalalib/test/resources/hello-java/core/src/hello/Core.java
+++ b/scalalib/test/resources/hello-java/core/src/Core.java
diff --git a/scalalib/test/resources/hello-java/core/test/src/hello/MyCoreTests.java b/scalalib/test/resources/hello-java/core/test/src/MyCoreTests.java
index 38bebaeb..38bebaeb 100644
--- a/scalalib/test/resources/hello-java/core/test/src/hello/MyCoreTests.java
+++ b/scalalib/test/resources/hello-java/core/test/src/MyCoreTests.java
diff --git a/scalalib/test/src/mill/scalalib/GenIdeaTests.scala b/scalalib/test/src/GenIdeaTests.scala
index 50db95c0..50db95c0 100644
--- a/scalalib/test/src/mill/scalalib/GenIdeaTests.scala
+++ b/scalalib/test/src/GenIdeaTests.scala
diff --git a/scalalib/test/src/mill/scalalib/HelloJavaTests.scala b/scalalib/test/src/HelloJavaTests.scala
index 5b7b93b2..02c2567f 100644
--- a/scalalib/test/src/mill/scalalib/HelloJavaTests.scala
+++ b/scalalib/test/src/HelloJavaTests.scala
@@ -88,8 +88,8 @@ object HelloJavaTests extends TestSuite {
     'failures - {
       val eval = init()
 
-      val mainJava = HelloJava.millSourcePath / 'app / 'src / 'hello / "Main.java"
-      val coreJava = HelloJava.millSourcePath / 'core / 'src / 'hello / "Core.java"
+      val mainJava = HelloJava.millSourcePath / 'app / 'src / "Main.java"
+      val coreJava = HelloJava.millSourcePath / 'core / 'src / "Core.java"
 
       val Right(_) = eval.apply(HelloJava.core.compile)
       val Right(_) = eval.apply(HelloJava.app.compile)
diff --git a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala b/scalalib/test/src/HelloWorldTests.scala
index da08f056..da08f056 100644
--- a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala
+++ b/scalalib/test/src/HelloWorldTests.scala
diff --git a/scalalib/test/src/mill/scalalib/ResolveDepsTests.scala b/scalalib/test/src/ResolveDepsTests.scala
index 78361625..78361625 100644
--- a/scalalib/test/src/mill/scalalib/ResolveDepsTests.scala
+++ b/scalalib/test/src/ResolveDepsTests.scala
diff --git a/scalalib/test/src/mill/scalalib/VersionControlTests.scala b/scalalib/test/src/VersionControlTests.scala
index fafdca2d..fafdca2d 100644
--- a/scalalib/test/src/mill/scalalib/VersionControlTests.scala
+++ b/scalalib/test/src/VersionControlTests.scala
diff --git a/scalalib/test/src/mill/scalalib/dependency/metadata/MetadataLoaderFactoryTests.scala b/scalalib/test/src/dependency/metadata/MetadataLoaderFactoryTests.scala
index 4c2206b8..4c2206b8 100644
--- a/scalalib/test/src/mill/scalalib/dependency/metadata/MetadataLoaderFactoryTests.scala
+++ b/scalalib/test/src/dependency/metadata/MetadataLoaderFactoryTests.scala
diff --git a/scalalib/test/src/mill/scalalib/dependency/updates/UpdatesFinderTests.scala b/scalalib/test/src/dependency/updates/UpdatesFinderTests.scala
index 7b6e6e36..7b6e6e36 100644
--- a/scalalib/test/src/mill/scalalib/dependency/updates/UpdatesFinderTests.scala
+++ b/scalalib/test/src/dependency/updates/UpdatesFinderTests.scala
diff --git a/scalalib/test/src/mill/scalalib/dependency/versions/VersionTests.scala b/scalalib/test/src/dependency/versions/VersionTests.scala
index b916c86f..b916c86f 100644
--- a/scalalib/test/src/mill/scalalib/dependency/versions/VersionTests.scala
+++ b/scalalib/test/src/dependency/versions/VersionTests.scala
diff --git a/scalalib/test/src/mill/scalalib/publish/IvyTests.scala b/scalalib/test/src/publish/IvyTests.scala
index d187f969..d187f969 100644
--- a/scalalib/test/src/mill/scalalib/publish/IvyTests.scala
+++ b/scalalib/test/src/publish/IvyTests.scala
diff --git a/scalalib/test/src/mill/scalalib/publish/PomTests.scala b/scalalib/test/src/publish/PomTests.scala
index 307ae379..307ae379 100644
--- a/scalalib/test/src/mill/scalalib/publish/PomTests.scala
+++ b/scalalib/test/src/publish/PomTests.scala
diff --git a/scalalib/test/src/mill/scalalib/scalafmt/ScalafmtTests.scala b/scalalib/test/src/scalafmt/ScalafmtTests.scala
index dcbdb769..dcbdb769 100644
--- a/scalalib/test/src/mill/scalalib/scalafmt/ScalafmtTests.scala
+++ b/scalalib/test/src/scalafmt/ScalafmtTests.scala
diff --git a/scalalib/worker/src/mill/scalalib/worker/ZincWorkerImpl.scala b/scalalib/worker/src/ZincWorkerImpl.scala
index 705d4682..705d4682 100644
--- a/scalalib/worker/src/mill/scalalib/worker/ZincWorkerImpl.scala
+++ b/scalalib/worker/src/ZincWorkerImpl.scala