diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 974bf3930..7ffc86c9e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
       fail-fast: false
       matrix:
         java: ['adopt@1.8', 'adopt@1.11']
-        scala: ['2.12.18', '2.13.12', '3.4.1']
+        scala: ['2.12.20', '2.13.15', '3.4.3']
         platform: ['JS', 'JVM', 'Native']
     steps:
       - name: Checkout current branch
diff --git a/.scalafmt.conf b/.scalafmt.conf
index 4474d18b2..c2a793724 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,5 +1,27 @@
-version = "3.7.17"
+version = "3.8.3"
 runner.dialect = scala213
+
+fileOverride {
+  "glob:**/project/**" {
+    runner.dialect = scala213
+  }
+  "glob:**/build.sbt" {
+    runner.dialect = scala213
+  }
+  "glob:**/scala-2/**" {
+    runner.dialect = scala213
+  }
+  "glob:**/scala-2.12/**" {
+    runner.dialect = scala212
+  }
+  "glob:**/scala-2.13/**" {
+    runner.dialect = scala213
+  }
+  "glob:**/scala-3/**" {
+    runner.dialect = scala3
+  }
+}
+
 maxColumn = 120
 align.preset = most
 continuationIndent.defnSite = 2
@@ -14,6 +36,6 @@ rewrite.rules = [RedundantBraces]
 project.excludeFilters = [
   "core/src/main/scala/zio/config/ProductBuilder.scala",
   "core/src/test/scala/zio/config/ProductBuilderTest.scala",
-  "core/shared/src/main/scala-3.x/*",
+  "core/shared/src/main/scala-3/*",
   "magnolia/shared/src/main/scala-dotty/*"
 ]
diff --git a/aws/shared/src/main/scala/zio/config/aws/parameterstore/ParameterStoreConfigProvider.scala b/aws/src/main/scala/zio/config/aws/parameterstore/ParameterStoreConfigProvider.scala
similarity index 100%
rename from aws/shared/src/main/scala/zio/config/aws/parameterstore/ParameterStoreConfigProvider.scala
rename to aws/src/main/scala/zio/config/aws/parameterstore/ParameterStoreConfigProvider.scala
diff --git a/aws/shared/src/main/scala/zio/config/aws/parameterstore/package.scala b/aws/src/main/scala/zio/config/aws/parameterstore/package.scala
similarity index 100%
rename from aws/shared/src/main/scala/zio/config/aws/parameterstore/package.scala
rename to aws/src/main/scala/zio/config/aws/parameterstore/package.scala
diff --git a/build.sbt b/build.sbt
index 3db4b163f..700dc2c2d 100644
--- a/build.sbt
+++ b/build.sbt
@@ -26,40 +26,43 @@ inThisBuild(
 
 addCommandAlias("fmt", "; scalafmtSbt; scalafmt; test:scalafmt")
 addCommandAlias("fix", "; all compile:scalafix test:scalafix; all scalafmtSbt scalafmtAll")
-addCommandAlias("compileAll", "; ++2.12.18; root2-12/compile; ++2.13.12!; root2-13/compile; ++3.2.2!; root3/compile;")
-addCommandAlias("testAll", "; ++2.12.18; root2-12/test; ++2.13.12!; root2-13/test; ++3.2.2!; root3/test;")
+addCommandAlias("compileAll", "; root2-12/compile; root2-13/compile; root3/compile;")
+addCommandAlias("testAll", "; root2-12/test; root2-13/test; root3/test;")
 addCommandAlias(
   "testJS",
-  ";zioConfigJS/test"
+  ";" + jsProjects.map(_.id).mkString("/test;") + "/test"
 )
 addCommandAlias(
   "testJVM212",
-  ";zioConfigJVM/test;zioConfigTypesafeJVM/test;zioConfigDerivationJVM/test;zioConfigYamlJVM/test;examplesJVM/test;zioConfigAwsJVM/test;zioConfigZioAwsJVM/test;zioConfigXmlJVM/test"
+  ";" + scala212JVMprojects.map(_.id).mkString("/test;") + "/test"
 )
 addCommandAlias(
   "testJVM213",
-  ";zioConfigJVM/test;zioConfigTypesafeJVM/test;zioConfigDerivationJVM/test;zioConfigYamlJVM/test;zioConfigRefinedJVM/test;zioConfigMagnoliaJVM/test;examplesJVM/test;zioConfigTypesafeMagnoliaTestsJVM/test;zioConfigAwsJVM/test;zioConfigZioAwsJVM/test;zioConfigXmlJVM/test"
+  ";" + scala213JVMprojects.map(_.id).mkString("/test;") + "/test"
 )
 addCommandAlias(
   "testJVM3x",
-  ";zioConfigJVM/test;zioConfigTypesafeJVM/test;zioConfigDerivationJVM/test;zioConfigYamlJVM/test;zioConfigMagnoliaJVM/test;zioConfigAwsJVM/test;zioConfigZioAwsJVM/test;zioConfigXmlJVM/test"
+  ";" + scala3JVMprojects.map(_.id).mkString("/test;") + "/test"
 )
 addCommandAlias(
   "testJVM",
-  ";testJVM212;testJVM213;testJVM3x;"
+  ";" + jvmProjects.map(_.id).mkString("/test;") + "/test"
+)
+addCommandAlias(
+  "testNative",
+  ";" + nativeProjects.map(_.id).mkString("/test;") + "/test"
 )
 
-val awsVersion        = "1.12.721"
-val zioAwsVersion     = "5.19.33.2"
-val zioVersion        = "2.0.13"
+val awsVersion        = "1.12.773"
+val zioAwsVersion     = "7.21.15.15"
+val zioVersion        = "2.1.9"
 val magnoliaVersion   = "0.17.0"
-val refinedVersion    = "0.11.1"
-val pureconfigVersion = "0.16.0"
-val shapelessVersion  = "2.4.0-M1"
+val refinedVersion    = "0.11.2"
+val pureconfigVersion = "0.17.7"
 
 lazy val magnoliaDependencies =
   libraryDependencies ++= {
-    if (scalaVersion.value == ScalaDotty) Seq.empty // Just to make IntelliJ happy
+    if (scalaVersion.value == Scala3) Seq.empty // Just to make IntelliJ happy
     else {
       Seq(
         "com.propensive" %% "magnolia"      % magnoliaVersion,
@@ -72,74 +75,69 @@ lazy val refinedDependencies =
   libraryDependencies ++= Seq("eu.timepit" %% "refined" % refinedVersion)
 
 lazy val pureconfigDependencies =
-  libraryDependencies ++= {
-    if (scalaVersion.value == ScalaDotty) Seq.empty // Just to make IntelliJ happy
-    else Seq("com.github.pureconfig" %% "pureconfig" % pureconfigVersion)
-  }
-
-lazy val scala212projects = Seq[ProjectReference](
-  zioConfigJS,
-  zioConfigJVM,
-  zioConfigAwsJVM,
-  zioConfigNative,
-  zioConfigTypesafeJVM,
-  zioConfigDerivationJVM,
-  zioConfigYamlJVM,
-  docs,
-  zioConfigEnumeratumJVM,
-  zioConfigCatsJVM,
-  zioConfigRefinedJVM,
-  zioConfigMagnoliaJVM,
-  zioConfigTypesafeMagnoliaTestsJVM,
-  zioConfigZioAwsJVM,
-  zioConfigXmlJVM,
-  examplesJVM
+  libraryDependencies +=
+    ("com.github.pureconfig" %% "pureconfig" % pureconfigVersion).cross(CrossVersion.for3Use2_13)
+
+lazy val allProjects = Seq[sbt.internal.ProjectMatrix](
+  zioConfig,
+  zioConfigAws,
+  zioConfigZioAws,
+  zioConfigRefined,
+  zioConfigPureconfig,
+  zioConfigDerivation,
+  zioConfigMagnolia,
+  zioConfigTypesafe,
+  zioConfigTypesafeMagnoliaTests,
+  zioConfigXml,
+  zioConfigYaml,
+  zioConfigScalaz,
+  zioConfigCats,
+  zioConfigEnumeratum,
+  examples,
+  docs
 )
 
-lazy val scala213projects = scala212projects ++ Seq[ProjectReference](zioConfigScalazJVM)
-
-lazy val scala3projects =
-  Seq[ProjectReference](
-    zioConfigJVM,
-    zioConfigAwsJVM,
-    zioConfigZioAwsJVM,
-    zioConfigCatsJVM,
-    zioConfigDerivationJVM,
-    zioConfigEnumeratumJVM,
-    zioConfigMagnoliaJVM,
-    zioConfigRefinedJVM,
-    zioConfigScalazJVM,
-    zioConfigTypesafeJVM,
-    zioConfigYamlJVM,
-    zioConfigXmlJVM,
-    docs
-  )
+lazy val jvmProjects    = allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.jvm)))
+lazy val jsProjects     = allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.js)))
+lazy val nativeProjects = allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.native)))
+
+lazy val scala212projects    = allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.scalaVersionAxis("2.12.20", ""))))
+lazy val scala212JVMprojects =
+  allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.jvm, VirtualAxis.scalaVersionAxis("2.12.20", ""))))
+
+lazy val scala213projects    = allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.scalaVersionAxis("2.13.15", ""))))
+lazy val scala213JVMprojects =
+  allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.jvm, VirtualAxis.scalaVersionAxis("2.13.15", ""))))
+
+lazy val scala3projects    = allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.scalaVersionAxis("3.4.3", ""))))
+lazy val scala3JVMprojects =
+  allProjects.flatMap(_.filterProjects(Seq(VirtualAxis.jvm, VirtualAxis.scalaVersionAxis("3.4.3", ""))))
 
 lazy val root =
   project
     .in(file("."))
     .settings(publish / skip := true)
-    .aggregate(scala213projects: _*)
+    .aggregate(allProjects.flatMap(_.projectRefs): _*)
 
 lazy val `root2-12` =
   project
     .in(file("2-12"))
     .settings(publish / skip := true)
-    .aggregate(scala212projects: _*)
+    .aggregate(scala212projects.map(_.project): _*)
 
 lazy val `root2-13` =
   project
     .in(file("2-13"))
     .settings(publish / skip := true)
-    .aggregate(scala213projects: _*)
+    .aggregate(scala213projects.map(_.project): _*)
 
 lazy val `root3` =
   project
     .in(file("3"))
     .settings(publish / skip := true)
-    .aggregate(scala3projects: _*)
+    .aggregate(scala3projects.map(_.project): _*)
 
-lazy val zioConfig = crossProject(JSPlatform, JVMPlatform, NativePlatform)
+lazy val zioConfig = projectMatrix
   .in(file("core"))
   .settings(stdSettings("zio-config"))
   .settings(crossProjectSettings)
@@ -148,28 +146,22 @@ lazy val zioConfig = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .settings(macroDefinitionSettings)
   .settings(
     libraryDependencies ++= Seq(
-      "dev.zio"                %% "zio"                     % zioVersion,
-      "org.scala-lang.modules" %% "scala-collection-compat" % "2.12.0",
-      "dev.zio"                %% "zio-test"                % zioVersion % Test
+      "dev.zio"                %%% "zio"                     % zioVersion,
+      "org.scala-lang.modules" %%% "scala-collection-compat" % "2.12.0",
+      "dev.zio"                %%% "zio-test"                % zioVersion % Test,
+      "dev.zio"                %%% "zio-test-sbt"            % zioVersion % Test
     ),
     testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
   )
-
-lazy val zioConfigJS = zioConfig.js
-  .settings(libraryDependencies += "dev.zio" %%% "zio-test-sbt" % zioVersion % Test)
-
-lazy val zioConfigJVM = zioConfig.jvm
-  .settings(dottySettings)
-  .settings(libraryDependencies += "dev.zio" %%% "zio-test-sbt" % zioVersion % Test)
-
-lazy val zioConfigNative = zioConfig.native
+  .jvmPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
+  .jsPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
+  .nativePlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
   .settings(nativeSettings)
 
-lazy val zioConfigAws = crossProject(JVMPlatform)
+lazy val zioConfigAws = projectMatrix
   .in(file("aws"))
   .settings(stdSettings("zio-config-aws"))
   .settings(crossProjectSettings)
-  .settings(dottySettings)
   .settings(
     libraryDependencies ++= Seq(
       "com.amazonaws" % "aws-java-sdk-ssm" % awsVersion,
@@ -180,14 +172,12 @@ lazy val zioConfigAws = crossProject(JVMPlatform)
     testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
   )
   .dependsOn(zioConfig % "compile->compile;test->test")
+  .jvmPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
 
-lazy val zioConfigAwsJVM = zioConfigAws.jvm
-
-lazy val zioConfigZioAws = crossProject(JVMPlatform)
+lazy val zioConfigZioAws = projectMatrix
   .in(file("zio-aws"))
   .settings(stdSettings("zio-config-zio-aws"))
   .settings(crossProjectSettings)
-  .settings(dottySettings)
   .settings(
     libraryDependencies ++= Seq(
       "dev.zio" %% "zio-aws-ssm"  % zioAwsVersion,
@@ -198,14 +188,14 @@ lazy val zioConfigZioAws = crossProject(JVMPlatform)
     testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
   )
   .dependsOn(zioConfig % "compile->compile;test->test")
+  .jvmPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
 
 lazy val zioConfigZioAwsJVM = zioConfigZioAws.jvm
 
-lazy val zioConfigRefined = crossProject(JVMPlatform)
+lazy val zioConfigRefined = projectMatrix
   .in(file("refined"))
   .settings(stdSettings("zio-config-refined"))
   .settings(crossProjectSettings)
-  .settings(dottySettings)
   .settings(
     refinedDependencies,
     libraryDependencies ++=
@@ -216,10 +206,9 @@ lazy val zioConfigRefined = crossProject(JVMPlatform)
     testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
   )
   .dependsOn(zioConfigMagnolia % "compile->compile;test->test")
+  .jvmPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
 
-lazy val zioConfigRefinedJVM = zioConfigRefined.jvm
-
-lazy val zioConfigPureconfig = crossProject(JVMPlatform)
+lazy val zioConfigPureconfig = projectMatrix
   .in(file("pureconfig"))
   .settings(stdSettings("zio-config-pureconfig"))
   .settings(crossProjectSettings)
@@ -233,12 +222,11 @@ lazy val zioConfigPureconfig = crossProject(JVMPlatform)
     testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
   )
   .dependsOn(zioConfig % "test->test", zioConfigTypesafe)
-
-lazy val zioConfigPureconfigJVM = zioConfigPureconfig.jvm
+  .jvmPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
 
 lazy val runAllExamples = taskKey[Unit]("Run all main classes in examples module")
 
-lazy val examples = crossProject(JVMPlatform)
+lazy val examples = projectMatrix
   .in(file("examples"))
   .settings(stdSettings("zio-config-examples"))
   .settings(crossProjectSettings)
@@ -264,31 +252,27 @@ lazy val examples = crossProject(JVMPlatform)
         .value
   )
   .dependsOn(zioConfig, zioConfigMagnolia, zioConfigRefined, zioConfigTypesafe, zioConfigYaml)
+  .jvmPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
 
-lazy val examplesJVM = examples.jvm
-
-lazy val zioConfigDerivation = crossProject(JVMPlatform)
+lazy val zioConfigDerivation = projectMatrix
   .in(file("derivation"))
   .settings(stdSettings("zio-config-derivation"))
   .settings(crossProjectSettings)
-  .settings(dottySettings)
   .dependsOn(zioConfig)
+  .jvmPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
 
-lazy val zioConfigDerivationJVM = zioConfigDerivation.jvm
-
-lazy val zioConfigMagnolia = crossProject(JVMPlatform)
+// FIXME: annotations for Scala 3 are not implemented, tests in zioConfigTypesafeMagnoliaTests fail
+lazy val zioConfigMagnolia = projectMatrix
   .in(file("magnolia"))
   .settings(stdSettings("zio-config-magnolia"))
   .settings(crossProjectSettings)
-  .settings(dottySettings)
   .settings(
     magnoliaDependencies,
     scalacOptions ++= {
-      if (scalaVersion.value == ScalaDotty) {
-        Seq("-Xmax-inlines", "64")
-      } else {
+      if (scalaVersion.value == Scala3)
+        Seq.empty
+      else
         Seq("-language:experimental.macros")
-      }
     },
     libraryDependencies ++= Seq(
       "dev.zio" %% "zio-test"     % zioVersion % Test,
@@ -297,14 +281,12 @@ lazy val zioConfigMagnolia = crossProject(JVMPlatform)
     testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
   )
   .dependsOn(zioConfig % "compile->compile;test->test", zioConfigDerivation)
+  .jvmPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
 
-lazy val zioConfigMagnoliaJVM = zioConfigMagnolia.jvm
-
-lazy val zioConfigTypesafe = crossProject(JVMPlatform)
+lazy val zioConfigTypesafe = projectMatrix
   .in(file("typesafe"))
   .settings(stdSettings("zio-config-typesafe"))
   .settings(crossProjectSettings)
-  .settings(dottySettings)
   .settings(
     libraryDependencies ++= Seq(
       "com.typesafe" % "config"       % "1.4.3",
@@ -314,95 +296,95 @@ lazy val zioConfigTypesafe = crossProject(JVMPlatform)
     testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
   )
   .dependsOn(zioConfig % "compile->compile;test->test")
+  .jvmPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
 
-lazy val zioConfigTypesafeJVM = zioConfigTypesafe.jvm
-
-lazy val zioConfigYaml = crossProject(JVMPlatform)
+lazy val zioConfigYaml = projectMatrix
   .in(file("yaml"))
   .settings(stdSettings("zio-config-yaml"))
   .settings(crossProjectSettings)
   .settings(
     libraryDependencies ++= Seq(
-      "org.snakeyaml" % "snakeyaml-engine" % "2.6",
+      "org.snakeyaml" % "snakeyaml-engine" % "2.8",
       "dev.zio"      %% "zio-test"         % zioVersion % Test,
       "dev.zio"      %% "zio-test-sbt"     % zioVersion % Test
     ),
     testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
   )
   .dependsOn(zioConfig % "compile->compile;test->test")
+  .jvmPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
 
-lazy val zioConfigYamlJVM = zioConfigYaml.jvm
-  .settings(dottySettings)
-
-lazy val zioConfigXml = crossProject(JVMPlatform)
+lazy val zioConfigXml = projectMatrix
   .in(file("xml"))
   .settings(stdSettings("zio-config-xml"))
   .settings(crossProjectSettings)
   .settings(
     libraryDependencies ++= Seq(
-      "dev.zio" %% "zio-parser"   % "0.1.9",
+      "dev.zio" %% "zio-parser"   % "0.1.10",
       "dev.zio" %% "zio-test"     % zioVersion % Test,
       "dev.zio" %% "zio-test-sbt" % zioVersion % Test
     ),
     testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
   )
   .dependsOn(zioConfig % "compile->compile;test->test")
+  .jvmPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
 
-lazy val zioConfigXmlJVM = zioConfigXml.jvm
-  .settings(dottySettings)
-
-lazy val zioConfigScalaz = crossProject(JSPlatform, JVMPlatform, NativePlatform)
+lazy val zioConfigScalaz = projectMatrix
   .in(file("scalaz"))
   .settings(stdSettings("zio-config-scalaz"))
   .settings(crossProjectSettings)
   .settings(
-    crossScalaVersions --= Seq(Scala212),
     libraryDependencies ++= Seq(
-      "org.scalaz" %% "scalaz-core"  % "7.4.0-M13",
-      "dev.zio"    %% "zio-test"     % zioVersion % Test,
-      "dev.zio"    %% "zio-test-sbt" % zioVersion % Test
+      "org.scalaz" %%% "scalaz-core"  % "7.4.0-M15",
+      "dev.zio"    %%% "zio-test"     % zioVersion % Test,
+      "dev.zio"    %%% "zio-test-sbt" % zioVersion % Test
     ),
     testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
   )
   .dependsOn(zioConfig % "compile->compile;test->test")
+  .jvmPlatform(scalaVersions = Seq(Scala213, Scala3))
+  .jsPlatform(scalaVersions = Seq(Scala213, Scala3))
+  .nativePlatform(scalaVersions = Seq(Scala213, Scala3))
+  .settings(nativeSettings)
 
-lazy val zioConfigScalazJVM = zioConfigScalaz.jvm
-  .settings(dottySettings)
-
-lazy val zioConfigCats = crossProject(JSPlatform, JVMPlatform, NativePlatform)
+lazy val zioConfigCats = projectMatrix
   .in(file("cats"))
   .settings(stdSettings("zio-config-cats"))
   .settings(crossProjectSettings)
   .settings(
     libraryDependencies ++= Seq(
-      "org.typelevel" %% "cats-core"    % "2.9.0",
-      "dev.zio"       %% "zio-test"     % zioVersion % Test,
-      "dev.zio"       %% "zio-test-sbt" % zioVersion % Test
+      "org.typelevel" %%% "cats-core"    % "2.12.0",
+      "dev.zio"       %%% "zio-test"     % zioVersion % Test,
+      "dev.zio"       %%% "zio-test-sbt" % zioVersion % Test
     ),
     testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
   )
   .dependsOn(zioConfig % "compile->compile;test->test")
+  .jvmPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
+  .jsPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
+  .nativePlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
+  .settings(nativeSettings)
 
-lazy val zioConfigCatsJVM = zioConfigCats.jvm
-  .settings(dottySettings)
-
-lazy val zioConfigEnumeratum = crossProject(JSPlatform, JVMPlatform, NativePlatform)
+lazy val zioConfigEnumeratum = projectMatrix
   .in(file("enumeratum"))
   .settings(stdSettings("zio-config-enumeratum"))
   .settings(crossProjectSettings)
   .settings(
     libraryDependencies ++= Seq(
-      "com.beachape" %% "enumeratum"   % "1.7.2",
-      "dev.zio"      %% "zio-test"     % zioVersion % Test,
-      "dev.zio"      %% "zio-test-sbt" % zioVersion % Test
+      "com.beachape" %%% "enumeratum"   % "1.7.5",
+      "dev.zio"      %%% "zio-test"     % zioVersion % Test,
+      "dev.zio"      %%% "zio-test-sbt" % zioVersion % Test
     ),
     testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
   )
   .dependsOn(zioConfig % "compile->compile;test->test")
+  .jvmPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
+  .jsPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
+  .nativePlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))
+  .settings(nativeSettings)
 
 lazy val zioConfigEnumeratumJVM = zioConfigEnumeratum.jvm
 
-lazy val zioConfigTypesafeMagnoliaTests    = crossProject(JVMPlatform)
+lazy val zioConfigTypesafeMagnoliaTests = projectMatrix
   .in(file("typesafe-magnolia-tests"))
   .settings(stdSettings("zio-config-typesafe-magnolia-tests"))
   .settings(crossProjectSettings)
@@ -416,9 +398,11 @@ lazy val zioConfigTypesafeMagnoliaTests    = crossProject(JVMPlatform)
     testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
   )
   .dependsOn(zioConfig % "compile->compile;test->test", zioConfigTypesafe, zioConfigMagnolia, zioConfigDerivation)
-lazy val zioConfigTypesafeMagnoliaTestsJVM = zioConfigTypesafeMagnoliaTests.jvm
+  .jvmPlatform(scalaVersions =
+    Seq(Scala212, Scala213 /*, Scala3*/ )
+  ) // FIXME: annotations for Scala 3 are not implemented, tests fail
 
-lazy val docs = project
+lazy val docs = projectMatrix
   .in(file("zio-config-docs"))
   .settings(
     moduleName                                 := "zio-config-docs",
@@ -426,27 +410,27 @@ lazy val docs = project
     scalacOptions -= "-Xfatal-warnings",
     magnoliaDependencies,
     refinedDependencies,
-    crossScalaVersions                         := (zioConfigJVM / crossScalaVersions).value,
     projectName                                := "ZIO Config",
-    mainModuleName                             := (zioConfigJVM / moduleName).value,
+    mainModuleName                             := (zioConfig.jvm(Scala3) / moduleName).value,
     projectStage                               := ProjectStage.ProductionReady,
     ScalaUnidoc / unidoc / unidocProjectFilter :=
       inProjects(
-        zioConfigJVM,
-        zioConfigTypesafeJVM,
-        zioConfigDerivationJVM,
-        zioConfigYamlJVM,
-        zioConfigRefinedJVM,
-        zioConfigMagnoliaJVM
+        zioConfig.jvm(Scala3),
+        zioConfigTypesafe.jvm(Scala3),
+        zioConfigDerivation.jvm(Scala3),
+        zioConfigYaml.jvm(Scala3),
+        zioConfigRefined.jvm(Scala3),
+        zioConfigMagnolia.jvm(Scala3)
       )
   )
   .settings(macroDefinitionSettings)
+  .jvmPlatform(scalaVersions = Seq(Scala213))
   .dependsOn(
-    zioConfigJVM,
-    zioConfigTypesafeJVM,
-    zioConfigDerivationJVM,
-    zioConfigYamlJVM,
-    zioConfigRefinedJVM,
-    zioConfigMagnoliaJVM
+    zioConfig,
+    zioConfigTypesafe,
+    zioConfigDerivation,
+    zioConfigYaml,
+    zioConfigRefined,
+    zioConfigMagnolia
   )
   .enablePlugins(WebsitePlugin)
diff --git a/cats/shared/src/main/scala/zio/config/cats/instances/package.scala b/cats/src/main/scala/zio/config/cats/instances/package.scala
similarity index 100%
rename from cats/shared/src/main/scala/zio/config/cats/instances/package.scala
rename to cats/src/main/scala/zio/config/cats/instances/package.scala
diff --git a/cats/shared/src/main/scala/zio/config/cats/package.scala b/cats/src/main/scala/zio/config/cats/package.scala
similarity index 100%
rename from cats/shared/src/main/scala/zio/config/cats/package.scala
rename to cats/src/main/scala/zio/config/cats/package.scala
diff --git a/core/shared/src/main/scala-3.x/zio/config/TupleConversion.scala b/core/shared/src/main/scala-3.x/zio/config/TupleConversion.scala
deleted file mode 100644
index b0838cd91..000000000
--- a/core/shared/src/main/scala-3.x/zio/config/TupleConversion.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-package zio.config
-
-import scala.deriving._
-
-trait TupleConversion[A, B] {
-  def to(a: A): B
-  def from(b: B): A
-}
-
-object TupleConversion extends ImplicitTupleConversion 
-
-trait ImplicitTupleConversion {
-    inline given autoTupleConversion[Prod <: Product](using m: Mirror.ProductOf[Prod]): TupleConversion[Prod, m.MirroredElemTypes] = 
-        new TupleConversion[Prod, m.MirroredElemTypes] {
-            def to(a: Prod): m.MirroredElemTypes = Tuple.fromProductTyped(a)
-            def from(b: m.MirroredElemTypes): Prod = m.fromProduct(b)
-        }
-
-    inline given autoTupleConversion1[Prod <: Product, A](using c: TupleConversion[Prod, Tuple1[A]]): TupleConversion[Prod, A] =
-        new TupleConversion[Prod, A] {
-            def to(a: Prod): A = {
-                val Tuple1(v) = c.to(a)
-                v
-            }
-            def from(b: A): Prod = c.from(Tuple1(b))
-        }
-}
diff --git a/core/shared/src/main/scala/zio/config/project/build.properties b/core/shared/src/main/scala/zio/config/project/build.properties
deleted file mode 100644
index 7de0a9382..000000000
--- a/core/shared/src/main/scala/zio/config/project/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-sbt.version=1.4.4
diff --git a/core/shared/src/main/scala-2.12/zio/config/VersionSpecificSupport.scala b/core/src/main/scala-2.12/zio/config/VersionSpecificSupport.scala
similarity index 100%
rename from core/shared/src/main/scala-2.12/zio/config/VersionSpecificSupport.scala
rename to core/src/main/scala-2.12/zio/config/VersionSpecificSupport.scala
diff --git a/core/shared/src/main/scala-2.13/zio/config/VersionSpecificSupport.scala b/core/src/main/scala-2.13/zio/config/VersionSpecificSupport.scala
similarity index 100%
rename from core/shared/src/main/scala-2.13/zio/config/VersionSpecificSupport.scala
rename to core/src/main/scala-2.13/zio/config/VersionSpecificSupport.scala
diff --git a/core/shared/src/main/scala-2.x/zio/config/TupleConversion.scala b/core/src/main/scala-2/zio/config/TupleConversion.scala
similarity index 100%
rename from core/shared/src/main/scala-2.x/zio/config/TupleConversion.scala
rename to core/src/main/scala-2/zio/config/TupleConversion.scala
diff --git a/core/src/main/scala-3/zio/config/TupleConversion.scala b/core/src/main/scala-3/zio/config/TupleConversion.scala
new file mode 100644
index 000000000..f442b2a07
--- /dev/null
+++ b/core/src/main/scala-3/zio/config/TupleConversion.scala
@@ -0,0 +1,31 @@
+package zio.config
+
+import scala.deriving._
+
+trait TupleConversion[A, B] {
+  def to(a: A): B
+  def from(b: B): A
+}
+
+object TupleConversion extends ImplicitTupleConversion
+
+trait ImplicitTupleConversion {
+  inline given autoTupleConversion[Prod <: Product](using
+    m: Mirror.ProductOf[Prod]
+  ): TupleConversion[Prod, m.MirroredElemTypes] =
+    new TupleConversion[Prod, m.MirroredElemTypes] {
+      def to(a: Prod): m.MirroredElemTypes   = Tuple.fromProductTyped(a)
+      def from(b: m.MirroredElemTypes): Prod = m.fromProduct(b)
+    }
+
+  inline given autoTupleConversion1[Prod <: Product, A](using
+    c: TupleConversion[Prod, Tuple1[A]]
+  ): TupleConversion[Prod, A] =
+    new TupleConversion[Prod, A] {
+      def to(a: Prod): A   = {
+        val Tuple1(v) = c.to(a)
+        v
+      }
+      def from(b: A): Prod = c.from(Tuple1(b))
+    }
+}
diff --git a/core/shared/src/main/scala-3.x/zio/config/VersionSpecificSupport.scala b/core/src/main/scala-3/zio/config/VersionSpecificSupport.scala
similarity index 100%
rename from core/shared/src/main/scala-3.x/zio/config/VersionSpecificSupport.scala
rename to core/src/main/scala-3/zio/config/VersionSpecificSupport.scala
diff --git a/core/shared/src/main/scala/zio/config/ConfigDocsModule.scala b/core/src/main/scala/zio/config/ConfigDocsModule.scala
similarity index 100%
rename from core/shared/src/main/scala/zio/config/ConfigDocsModule.scala
rename to core/src/main/scala/zio/config/ConfigDocsModule.scala
diff --git a/core/shared/src/main/scala/zio/config/IndexedFlat.scala b/core/src/main/scala/zio/config/IndexedFlat.scala
similarity index 100%
rename from core/shared/src/main/scala/zio/config/IndexedFlat.scala
rename to core/src/main/scala/zio/config/IndexedFlat.scala
diff --git a/core/shared/src/main/scala/zio/config/KeyConversionFunctions.scala b/core/src/main/scala/zio/config/KeyConversionFunctions.scala
similarity index 100%
rename from core/shared/src/main/scala/zio/config/KeyConversionFunctions.scala
rename to core/src/main/scala/zio/config/KeyConversionFunctions.scala
diff --git a/core/shared/src/main/scala/zio/config/package.scala b/core/src/main/scala/zio/config/package.scala
similarity index 100%
rename from core/shared/src/main/scala/zio/config/package.scala
rename to core/src/main/scala/zio/config/package.scala
diff --git a/core/shared/src/main/scala/zio/config/syntax/ConfigSyntax.scala b/core/src/main/scala/zio/config/syntax/ConfigSyntax.scala
similarity index 100%
rename from core/shared/src/main/scala/zio/config/syntax/ConfigSyntax.scala
rename to core/src/main/scala/zio/config/syntax/ConfigSyntax.scala
diff --git a/core/shared/src/main/scala/zio/config/syntax/IndexKey.scala b/core/src/main/scala/zio/config/syntax/IndexKey.scala
similarity index 100%
rename from core/shared/src/main/scala/zio/config/syntax/IndexKey.scala
rename to core/src/main/scala/zio/config/syntax/IndexKey.scala
diff --git a/core/shared/src/test/scala/zio/config/BaseSpec.scala b/core/src/test/scala/zio/config/BaseSpec.scala
similarity index 100%
rename from core/shared/src/test/scala/zio/config/BaseSpec.scala
rename to core/src/test/scala/zio/config/BaseSpec.scala
diff --git a/core/shared/src/test/scala/zio/config/GenerateDocsTest.scala b/core/src/test/scala/zio/config/GenerateDocsTest.scala
similarity index 100%
rename from core/shared/src/test/scala/zio/config/GenerateDocsTest.scala
rename to core/src/test/scala/zio/config/GenerateDocsTest.scala
diff --git a/core/shared/src/test/scala/zio/config/IndexedFlatSpec.scala b/core/src/test/scala/zio/config/IndexedFlatSpec.scala
similarity index 100%
rename from core/shared/src/test/scala/zio/config/IndexedFlatSpec.scala
rename to core/src/test/scala/zio/config/IndexedFlatSpec.scala
diff --git a/derivation/shared/src/main/scala-2.12/zio/config/derivation/NeedsDerive.scala b/derivation/src/main/scala-2.12/zio/config/derivation/NeedsDerive.scala
similarity index 100%
rename from derivation/shared/src/main/scala-2.12/zio/config/derivation/NeedsDerive.scala
rename to derivation/src/main/scala-2.12/zio/config/derivation/NeedsDerive.scala
diff --git a/derivation/shared/src/main/scala-2.13/zio/config/derivation/NeedsDerive.scala b/derivation/src/main/scala-2.13/zio/config/derivation/NeedsDerive.scala
similarity index 100%
rename from derivation/shared/src/main/scala-2.13/zio/config/derivation/NeedsDerive.scala
rename to derivation/src/main/scala-2.13/zio/config/derivation/NeedsDerive.scala
diff --git a/derivation/shared/src/main/scala/zio/config/derivation/annotations.scala b/derivation/src/main/scala/zio/config/derivation/annotations.scala
similarity index 100%
rename from derivation/shared/src/main/scala/zio/config/derivation/annotations.scala
rename to derivation/src/main/scala/zio/config/derivation/annotations.scala
diff --git a/enumeratum/shared/src/main/scala/zio/config/enumeratum/package.scala b/enumeratum/src/main/scala/zio/config/enumeratum/package.scala
similarity index 100%
rename from enumeratum/shared/src/main/scala/zio/config/enumeratum/package.scala
rename to enumeratum/src/main/scala/zio/config/enumeratum/package.scala
diff --git a/examples/shared/src/main/resources/application.conf b/examples/src/main/resources/application.conf
similarity index 100%
rename from examples/shared/src/main/resources/application.conf
rename to examples/src/main/resources/application.conf
diff --git a/examples/shared/src/main/resources/application.yml b/examples/src/main/resources/application.yml
similarity index 100%
rename from examples/shared/src/main/resources/application.yml
rename to examples/src/main/resources/application.yml
diff --git a/examples/shared/src/main/scala/zio/config/examples/CollectAllExample.scala b/examples/src/main/scala/zio/config/examples/CollectAllExample.scala
similarity index 100%
rename from examples/shared/src/main/scala/zio/config/examples/CollectAllExample.scala
rename to examples/src/main/scala/zio/config/examples/CollectAllExample.scala
diff --git a/examples/shared/src/main/scala/zio/config/examples/ConfigSourceOrElseExample.scala b/examples/src/main/scala/zio/config/examples/ConfigSourceOrElseExample.scala
similarity index 96%
rename from examples/shared/src/main/scala/zio/config/examples/ConfigSourceOrElseExample.scala
rename to examples/src/main/scala/zio/config/examples/ConfigSourceOrElseExample.scala
index 445478e8c..62f24c5ba 100644
--- a/examples/shared/src/main/scala/zio/config/examples/ConfigSourceOrElseExample.scala
+++ b/examples/src/main/scala/zio/config/examples/ConfigSourceOrElseExample.scala
@@ -88,7 +88,7 @@ object ConfigSourceOrElseExample extends App {
 object Hi extends App {
   val runner =
     ConfigProvider
-      .fromMap(Map("afsal.thaj" -> "damn", "afsal.thaj.hi" -> "sd", "afsal.thaj.bi" -> "sd2"))
+      .fromMap(Map("afsal.thaj" -> "damn"))
       .load(Config.table("afsal.thaj", Config.string))
 
   println(Unsafe.unsafe { implicit u =>
diff --git a/examples/shared/src/main/scala/zio/config/examples/DefaultValueExample.scala b/examples/src/main/scala/zio/config/examples/DefaultValueExample.scala
similarity index 100%
rename from examples/shared/src/main/scala/zio/config/examples/DefaultValueExample.scala
rename to examples/src/main/scala/zio/config/examples/DefaultValueExample.scala
diff --git a/examples/shared/src/main/scala/zio/config/examples/DocsExampleConfluenceFlavoured.scala b/examples/src/main/scala/zio/config/examples/DocsExampleConfluenceFlavoured.scala
similarity index 100%
rename from examples/shared/src/main/scala/zio/config/examples/DocsExampleConfluenceFlavoured.scala
rename to examples/src/main/scala/zio/config/examples/DocsExampleConfluenceFlavoured.scala
diff --git a/examples/shared/src/main/scala/zio/config/examples/DocsExampleGithubFlavoured.scala b/examples/src/main/scala/zio/config/examples/DocsExampleGithubFlavoured.scala
similarity index 100%
rename from examples/shared/src/main/scala/zio/config/examples/DocsExampleGithubFlavoured.scala
rename to examples/src/main/scala/zio/config/examples/DocsExampleGithubFlavoured.scala
diff --git a/examples/shared/src/main/scala/zio/config/examples/SealedTraitManualDerivation.scala b/examples/src/main/scala/zio/config/examples/SealedTraitManualDerivation.scala
similarity index 100%
rename from examples/shared/src/main/scala/zio/config/examples/SealedTraitManualDerivation.scala
rename to examples/src/main/scala/zio/config/examples/SealedTraitManualDerivation.scala
diff --git a/examples/shared/src/main/scala/zio/config/examples/SimpleReadConfigExample.scala b/examples/src/main/scala/zio/config/examples/SimpleReadConfigExample.scala
similarity index 100%
rename from examples/shared/src/main/scala/zio/config/examples/SimpleReadConfigExample.scala
rename to examples/src/main/scala/zio/config/examples/SimpleReadConfigExample.scala
diff --git a/examples/shared/src/main/scala/zio/config/examples/StandardPattern.scala b/examples/src/main/scala/zio/config/examples/StandardPattern.scala
similarity index 100%
rename from examples/shared/src/main/scala/zio/config/examples/StandardPattern.scala
rename to examples/src/main/scala/zio/config/examples/StandardPattern.scala
diff --git a/examples/shared/src/main/scala/zio/config/examples/TupleExample.scala b/examples/src/main/scala/zio/config/examples/TupleExample.scala
similarity index 100%
rename from examples/shared/src/main/scala/zio/config/examples/TupleExample.scala
rename to examples/src/main/scala/zio/config/examples/TupleExample.scala
diff --git a/examples/shared/src/main/scala/zio/config/examples/ZioSupport.scala b/examples/src/main/scala/zio/config/examples/ZioSupport.scala
similarity index 100%
rename from examples/shared/src/main/scala/zio/config/examples/ZioSupport.scala
rename to examples/src/main/scala/zio/config/examples/ZioSupport.scala
diff --git a/examples/shared/src/main/scala/zio/config/examples/autoderivation/AutoDerivationCustomKeys.scala b/examples/src/main/scala/zio/config/examples/autoderivation/AutoDerivationCustomKeys.scala
similarity index 100%
rename from examples/shared/src/main/scala/zio/config/examples/autoderivation/AutoDerivationCustomKeys.scala
rename to examples/src/main/scala/zio/config/examples/autoderivation/AutoDerivationCustomKeys.scala
diff --git a/examples/shared/src/main/scala/zio/config/examples/autoderivation/AutoDerivationPureConfig.scala b/examples/src/main/scala/zio/config/examples/autoderivation/AutoDerivationPureConfig.scala
similarity index 90%
rename from examples/shared/src/main/scala/zio/config/examples/autoderivation/AutoDerivationPureConfig.scala
rename to examples/src/main/scala/zio/config/examples/autoderivation/AutoDerivationPureConfig.scala
index e5ca5acd3..b341869cd 100644
--- a/examples/shared/src/main/scala/zio/config/examples/autoderivation/AutoDerivationPureConfig.scala
+++ b/examples/src/main/scala/zio/config/examples/autoderivation/AutoDerivationPureConfig.scala
@@ -78,19 +78,19 @@ object AutoDerivationSealedTraitPureConfig extends App with EitherImpureOps {
       AppConfig(AwsConfig(Trait1SubClass1("b", RandomCaseClass("hi"))), "l")
   )
 
-  val s2: String =
-    """
-      |field = SubObject1
-      |""".stripMargin
+  // val s2: String =
+  //   """
+  //     |field = SubObject1
+  //     |""".stripMargin
 
-  assert(read(deriveConfig[AwsConfig] from TypesafeConfigProvider.fromHoconString(s2)) equalM AwsConfig(SubObject1))
+  // assert(read(deriveConfig[AwsConfig] from TypesafeConfigProvider.fromHoconString(s2)) equalM AwsConfig(SubObject1))
 
-  val s3: String =
-    """
-      |field = randomcustomname
-      |""".stripMargin
+  // val s3: String =
+  //   """
+  //     |field = randomcustomname
+  //     |""".stripMargin
 
-  assert(read(deriveConfig[AwsConfig] from TypesafeConfigProvider.fromHoconString(s3)) equalM AwsConfig(SubObject2))
+  // assert(read(deriveConfig[AwsConfig] from TypesafeConfigProvider.fromHoconString(s3)) equalM AwsConfig(SubObject2))
 
   val s4: String =
     """
diff --git a/examples/shared/src/main/scala/zio/config/examples/autoderivation/AutoDerivationSealedTrait.scala b/examples/src/main/scala/zio/config/examples/autoderivation/AutoDerivationSealedTrait.scala
similarity index 100%
rename from examples/shared/src/main/scala/zio/config/examples/autoderivation/AutoDerivationSealedTrait.scala
rename to examples/src/main/scala/zio/config/examples/autoderivation/AutoDerivationSealedTrait.scala
diff --git a/examples/shared/src/main/scala/zio/config/examples/autoderivation/AutoDerivationSealedTraitCustom.scala b/examples/src/main/scala/zio/config/examples/autoderivation/AutoDerivationSealedTraitCustom.scala
similarity index 100%
rename from examples/shared/src/main/scala/zio/config/examples/autoderivation/AutoDerivationSealedTraitCustom.scala
rename to examples/src/main/scala/zio/config/examples/autoderivation/AutoDerivationSealedTraitCustom.scala
diff --git a/examples/shared/src/main/scala/zio/config/examples/autoderivation/AutoDerivationSimple.scala b/examples/src/main/scala/zio/config/examples/autoderivation/AutoDerivationSimple.scala
similarity index 93%
rename from examples/shared/src/main/scala/zio/config/examples/autoderivation/AutoDerivationSimple.scala
rename to examples/src/main/scala/zio/config/examples/autoderivation/AutoDerivationSimple.scala
index 2376413f4..958b3be90 100644
--- a/examples/shared/src/main/scala/zio/config/examples/autoderivation/AutoDerivationSimple.scala
+++ b/examples/src/main/scala/zio/config/examples/autoderivation/AutoDerivationSimple.scala
@@ -29,7 +29,7 @@ object MyConfig {
   case class Aud(dollars: Double) extends Price
 
   final case class Aws(region: String, credentials: Credentials)
-  final case class DbUrl(value: String) extends AnyVal
+  final case class DbUrl(value: String)
 }
 
 object AutomaticConfig extends App {
@@ -42,7 +42,7 @@ object AutomaticConfig extends App {
         "aws.credentials.Token.value" -> "token",
         "port"                        -> "10",
         "default"                     -> "12",
-        "dburl"                       -> "some url",
+        "dburl.value"                 -> "some url",
         "amount"                      -> "3.14",
         "quanity"                     -> "30.0",
         "price.Inr.value"             -> "1000",
diff --git a/examples/shared/src/main/scala/zio/config/examples/package.scala b/examples/src/main/scala/zio/config/examples/package.scala
similarity index 100%
rename from examples/shared/src/main/scala/zio/config/examples/package.scala
rename to examples/src/main/scala/zio/config/examples/package.scala
diff --git a/examples/shared/src/main/scala/zio/config/examples/refined/RefinedReadConfig.scala b/examples/src/main/scala/zio/config/examples/refined/RefinedReadConfig.scala
similarity index 100%
rename from examples/shared/src/main/scala/zio/config/examples/refined/RefinedReadConfig.scala
rename to examples/src/main/scala/zio/config/examples/refined/RefinedReadConfig.scala
diff --git a/examples/shared/src/main/scala/zio/config/examples/typesafe/EitherImpureOps.scala b/examples/src/main/scala/zio/config/examples/typesafe/EitherImpureOps.scala
similarity index 100%
rename from examples/shared/src/main/scala/zio/config/examples/typesafe/EitherImpureOps.scala
rename to examples/src/main/scala/zio/config/examples/typesafe/EitherImpureOps.scala
diff --git a/examples/shared/src/main/scala/zio/config/examples/typesafe/HoconSimple.scala b/examples/src/main/scala/zio/config/examples/typesafe/HoconSimple.scala
similarity index 100%
rename from examples/shared/src/main/scala/zio/config/examples/typesafe/HoconSimple.scala
rename to examples/src/main/scala/zio/config/examples/typesafe/HoconSimple.scala
diff --git a/examples/shared/src/main/scala/zio/config/examples/typesafe/PureConfigInterop.scala b/examples/src/main/scala/zio/config/examples/typesafe/PureConfigInterop.scala
similarity index 97%
rename from examples/shared/src/main/scala/zio/config/examples/typesafe/PureConfigInterop.scala
rename to examples/src/main/scala/zio/config/examples/typesafe/PureConfigInterop.scala
index 45e7e6d7d..f048fe6ce 100644
--- a/examples/shared/src/main/scala/zio/config/examples/typesafe/PureConfigInterop.scala
+++ b/examples/src/main/scala/zio/config/examples/typesafe/PureConfigInterop.scala
@@ -1,4 +1,5 @@
-package zio.config.examples.typesafe
+package zio.config.examples
+package typesafe
 
 import zio.ConfigProvider
 import zio.config._
diff --git a/examples/shared/src/main/scala/zio/config/examples/typesafe/SealedTraitListExample.scala b/examples/src/main/scala/zio/config/examples/typesafe/SealedTraitListExample.scala
similarity index 95%
rename from examples/shared/src/main/scala/zio/config/examples/typesafe/SealedTraitListExample.scala
rename to examples/src/main/scala/zio/config/examples/typesafe/SealedTraitListExample.scala
index a7a60fc9d..9fd3b26bb 100644
--- a/examples/shared/src/main/scala/zio/config/examples/typesafe/SealedTraitListExample.scala
+++ b/examples/src/main/scala/zio/config/examples/typesafe/SealedTraitListExample.scala
@@ -1,4 +1,5 @@
-package zio.config.examples.typesafe
+package zio.config.examples
+package typesafe
 
 import zio.ConfigProvider
 import zio.config.derivation.discriminator
diff --git a/examples/shared/src/main/scala/zio/config/examples/typesafe/SubConfigExample.scala b/examples/src/main/scala/zio/config/examples/typesafe/SubConfigExample.scala
similarity index 94%
rename from examples/shared/src/main/scala/zio/config/examples/typesafe/SubConfigExample.scala
rename to examples/src/main/scala/zio/config/examples/typesafe/SubConfigExample.scala
index 0124c2e3e..61b66eccd 100644
--- a/examples/shared/src/main/scala/zio/config/examples/typesafe/SubConfigExample.scala
+++ b/examples/src/main/scala/zio/config/examples/typesafe/SubConfigExample.scala
@@ -1,4 +1,5 @@
-package zio.config.examples.typesafe
+package zio.config.examples
+package typesafe
 
 import zio.ConfigProvider
 import zio.config._
diff --git a/examples/shared/src/main/scala/zio/config/examples/typesafe/TypesafeConfigErrors.scala b/examples/src/main/scala/zio/config/examples/typesafe/TypesafeConfigErrors.scala
similarity index 100%
rename from examples/shared/src/main/scala/zio/config/examples/typesafe/TypesafeConfigErrors.scala
rename to examples/src/main/scala/zio/config/examples/typesafe/TypesafeConfigErrors.scala
diff --git a/examples/shared/src/main/scala/zio/config/examples/typesafe/TypesafeConfigList.scala b/examples/src/main/scala/zio/config/examples/typesafe/TypesafeConfigList.scala
similarity index 100%
rename from examples/shared/src/main/scala/zio/config/examples/typesafe/TypesafeConfigList.scala
rename to examples/src/main/scala/zio/config/examples/typesafe/TypesafeConfigList.scala
diff --git a/examples/shared/src/main/scala/zio/config/examples/typesafe/TypesafeConfigMap.scala b/examples/src/main/scala/zio/config/examples/typesafe/TypesafeConfigMap.scala
similarity index 100%
rename from examples/shared/src/main/scala/zio/config/examples/typesafe/TypesafeConfigMap.scala
rename to examples/src/main/scala/zio/config/examples/typesafe/TypesafeConfigMap.scala
diff --git a/examples/shared/src/main/scala/zio/config/examples/typesafe/TypesafeConfigSealedTrait.scala b/examples/src/main/scala/zio/config/examples/typesafe/TypesafeConfigSealedTrait.scala
similarity index 100%
rename from examples/shared/src/main/scala/zio/config/examples/typesafe/TypesafeConfigSealedTrait.scala
rename to examples/src/main/scala/zio/config/examples/typesafe/TypesafeConfigSealedTrait.scala
diff --git a/examples/shared/src/main/scala/zio/config/examples/typesafe/TypesafeConfigSimple.scala b/examples/src/main/scala/zio/config/examples/typesafe/TypesafeConfigSimple.scala
similarity index 100%
rename from examples/shared/src/main/scala/zio/config/examples/typesafe/TypesafeConfigSimple.scala
rename to examples/src/main/scala/zio/config/examples/typesafe/TypesafeConfigSimple.scala
diff --git a/magnolia/shared/src/main/scala-dotty/zio/config/magnolia/Macros.scala b/magnolia/shared/src/main/scala-dotty/zio/config/magnolia/Macros.scala
deleted file mode 100644
index 78fd53eb3..000000000
--- a/magnolia/shared/src/main/scala-dotty/zio/config/magnolia/Macros.scala
+++ /dev/null
@@ -1,58 +0,0 @@
-package zio.config.magnolia
-
-import scala.quoted.*
-import zio.config.derivation._
-
-object Macros:
-  inline def nameOf[T]: List[name] = ${anns[T, name]("zio.config.derivation.name")}
-  inline def discriminator[T]: List[discriminator] = ${anns[T, discriminator]("zio.config.derivation.discriminator")}
-  inline def documentationOf[T]: List[describe] = ${anns[T, describe]("zio.config.derivation.describe")}
-  inline def fieldNameOf[T]: List[(String, List[name])] = ${fieldAnns[T, name]("zio.config.derivation.name")}
-  inline def fieldDocumentationOf[T]: List[(String, List[describe])] = ${fieldAnns[T, describe]("zio.config.derivation.describe")}
-  inline def defaultValuesOf[T]: List[(String, Any)] = ${defaultValues[T]}
-
-  def defaultValues[T : Type](using Quotes): Expr[List[(String, Any)]] =
-    import quotes.reflect.*
-    val tpe = TypeRepr.of[T]
-
-    val sym = tpe.typeSymbol
-
-    val namesOfFieldsWithDefaultValues =
-      sym.caseFields.filter(s => s.flags.is(Flags.HasDefault)).map(_.name)
-
-    val companionClas =
-      sym.companionClass
-
-    val defaultRefs =
-      companionClas.declarations.filter(_.name.startsWith("$lessinit$greater$default"))
-       .map(Ref(_))
-
-    Expr.ofList(namesOfFieldsWithDefaultValues.zip(defaultRefs).map {
-      case (n, ref) => Expr.ofTuple(Expr(n), ref.asExpr)
-    })
-
-  def anns[T: Type, A: Type](ownerName: String)(using Quotes): Expr[List[A]] = {
-    import quotes.reflect.*
-
-    val tpe = TypeRepr.of[T]
-
-    Expr.ofList {
-      tpe.typeSymbol.annotations.filter { a => {
-         a.tpe.typeSymbol.fullName == ownerName
-      }}.map(_.asExpr.asInstanceOf[Expr[A]])
-    }
-  }
-
-  def fieldAnns[T: Type, A: Type](ownerName: String)(using Quotes): Expr[List[(String, List[A])]] =
-    import quotes.reflect.*
-
-    val tpe = TypeRepr.of[T]
-
-    Expr.ofList {
-      tpe.typeSymbol.primaryConstructor.paramSymss.flatten.map { field =>
-        Expr(field.name) -> field.annotations.filter { a =>
-          a.tpe.typeSymbol.fullName == ownerName
-        }.map(_.asExpr.asInstanceOf[Expr[A]])
-      }.filter(_._2.nonEmpty).map { (name, anns) => Expr.ofTuple(name, Expr.ofList(anns)) }
-    }
-end Macros
diff --git a/magnolia/shared/src/main/scala-dotty/zio/config/magnolia/package.scala b/magnolia/shared/src/main/scala-dotty/zio/config/magnolia/package.scala
deleted file mode 100644
index d8871b189..000000000
--- a/magnolia/shared/src/main/scala-dotty/zio/config/magnolia/package.scala
+++ /dev/null
@@ -1,29 +0,0 @@
-package zio.config
-
-import zio.ConfigProvider
-
-import zio.Config
-import zio.IO
-
-package object magnolia {
-  def deriveConfig[A](implicit ev: DeriveConfig[A]) =
-    ev.desc
-
-  type describe = derivation.describe
-  val describe: derivation.describe.type = derivation.describe
-
-  type name = derivation.name
-  val name: derivation.name.type = derivation.name
-
-  type discriminator = derivation.discriminator
-  val discriminator: derivation.discriminator.type = derivation.discriminator
-
-  // If you happen to define a Config directly as an implicit, then automatically DeriveConfig will be available
-  implicit def deriveConfigFromConfig[A](implicit ev: Config[A]): DeriveConfig[A] =
-    DeriveConfig(ev, None)
-
-  implicit class ConfigProviderOps[A](configProvider: ConfigProvider) {
-    def autoLoad[A: DeriveConfig]: IO[Config.Error, A] =
-      configProvider.load(DeriveConfig[A].desc)
-  }
-}
diff --git a/magnolia/shared/src/main/scala-2.12-2.13/zio/config/magnolia/DeriveConfig.scala b/magnolia/src/main/scala-2/zio/config/magnolia/DeriveConfig.scala
similarity index 98%
rename from magnolia/shared/src/main/scala-2.12-2.13/zio/config/magnolia/DeriveConfig.scala
rename to magnolia/src/main/scala-2/zio/config/magnolia/DeriveConfig.scala
index 6e7c63915..7947c163f 100644
--- a/magnolia/shared/src/main/scala-2.12-2.13/zio/config/magnolia/DeriveConfig.scala
+++ b/magnolia/src/main/scala-2/zio/config/magnolia/DeriveConfig.scala
@@ -213,7 +213,7 @@ object DeriveConfig {
         .toMap
 
     val keyNameIfPureConfig: Option[String] =
-      sealedTrait.annotations.collectFirst { case discriminator: discriminator => discriminator.keyName }
+      sealedTrait.annotations.collectFirst { case d: discriminator => d.keyName }
 
     val desc =
       keyNameIfPureConfig match {
diff --git a/magnolia/shared/src/main/scala-2.12-2.13/zio/config/magnolia/package.scala b/magnolia/src/main/scala-2/zio/config/magnolia/package.scala
similarity index 100%
rename from magnolia/shared/src/main/scala-2.12-2.13/zio/config/magnolia/package.scala
rename to magnolia/src/main/scala-2/zio/config/magnolia/package.scala
diff --git a/magnolia/shared/src/main/scala-dotty/zio/config/magnolia/DeriveConfig.scala b/magnolia/src/main/scala-3/zio/config/magnolia/DeriveConfig.scala
similarity index 67%
rename from magnolia/shared/src/main/scala-dotty/zio/config/magnolia/DeriveConfig.scala
rename to magnolia/src/main/scala-3/zio/config/magnolia/DeriveConfig.scala
index d54a467ac..c612da81e 100644
--- a/magnolia/shared/src/main/scala-dotty/zio/config/magnolia/DeriveConfig.scala
+++ b/magnolia/src/main/scala-3/zio/config/magnolia/DeriveConfig.scala
@@ -44,47 +44,52 @@ object DeriveConfig {
 
   sealed trait Metadata {
     def originalName: String = this match {
-      case Metadata.Object(name, _) => name.originalName
-      case Metadata.Product(name, _) => name.originalName
+      case Metadata.Object(name, _)    => name.originalName
+      case Metadata.Product(name, _)   => name.originalName
       case Metadata.Coproduct(name, _) => name.originalName
     }
 
     def alternativeNames: List[String] = this match {
-      case Metadata.Object(_, _) => Nil
-      case Metadata.Product(name, _) => name.alternativeNames
+      case Metadata.Object(_, _)       => Nil
+      case Metadata.Product(name, _)   => name.alternativeNames
       case Metadata.Coproduct(name, _) => name.alternativeNames
     }
   }
 
   object Metadata {
-    final case class Object[T](name: ProductName, constValue: T) extends Metadata
-    final case class Product(name: ProductName, fields: List[FieldName]) extends Metadata
+    final case class Object[T](name: ProductName, constValue: T)              extends Metadata
+    final case class Product(name: ProductName, fields: List[FieldName])      extends Metadata
     final case class Coproduct(name: CoproductName, metadata: List[Metadata]) extends Metadata
   }
 
   final case class FieldName(originalName: String, alternativeNames: List[String], descriptions: List[String])
   final case class ProductName(originalName: String, alternativeNames: List[String], descriptions: List[String])
-  final case class CoproductName(originalName: String, alternativeNames: List[String], descriptions: List[String], typeDiscriminator: Option[String])
+  final case class CoproductName(
+    originalName: String,
+    alternativeNames: List[String],
+    descriptions: List[String],
+    typeDiscriminator: Option[String]
+  )
 
-  lazy given DeriveConfig[Secret] = DeriveConfig.from(secret)
+  lazy given DeriveConfig[Secret]         = DeriveConfig.from(secret)
   lazy given DeriveConfig[OffsetDateTime] = DeriveConfig.from(offsetDateTime)
-  lazy given DeriveConfig[LogLevel] = DeriveConfig.from(logLevel)
-  lazy given DeriveConfig[String] = DeriveConfig.from(string)
-  lazy given DeriveConfig[Boolean] = DeriveConfig.from(boolean)
-  lazy given DeriveConfig[Int] = DeriveConfig.from(int)
-  lazy given DeriveConfig[BigInt] = DeriveConfig.from(bigInt)
-  lazy given DeriveConfig[Float] = DeriveConfig.from(float)
-  lazy given DeriveConfig[Double] = DeriveConfig.from(double)
-  lazy given DeriveConfig[BigDecimal] = DeriveConfig.from(bigDecimal)
-  lazy given DeriveConfig[URI] = DeriveConfig.from(uri)
-  lazy given DeriveConfig[zio.Duration] = DeriveConfig.from(duration)
-  lazy given DeriveConfig[LocalDate] = DeriveConfig.from(localDate)
-  lazy given DeriveConfig[LocalTime] = DeriveConfig.from(localTime)
-  lazy given DeriveConfig[LocalDateTime] = DeriveConfig.from(localDateTime)
-  lazy given DeriveConfig[Byte] = DeriveConfig(Config.byte)
-  lazy given DeriveConfig[Short] = DeriveConfig(Config.short)
-  lazy given DeriveConfig[UUID] = DeriveConfig(Config.uuid)
-  lazy given DeriveConfig[Long] = DeriveConfig(Config.long)
+  lazy given DeriveConfig[LogLevel]       = DeriveConfig.from(logLevel)
+  lazy given DeriveConfig[String]         = DeriveConfig.from(string)
+  lazy given DeriveConfig[Boolean]        = DeriveConfig.from(boolean)
+  lazy given DeriveConfig[Int]            = DeriveConfig.from(int)
+  lazy given DeriveConfig[BigInt]         = DeriveConfig.from(bigInt)
+  lazy given DeriveConfig[Float]          = DeriveConfig.from(float)
+  lazy given DeriveConfig[Double]         = DeriveConfig.from(double)
+  lazy given DeriveConfig[BigDecimal]     = DeriveConfig.from(bigDecimal)
+  lazy given DeriveConfig[URI]            = DeriveConfig.from(uri)
+  lazy given DeriveConfig[zio.Duration]   = DeriveConfig.from(duration)
+  lazy given DeriveConfig[LocalDate]      = DeriveConfig.from(localDate)
+  lazy given DeriveConfig[LocalTime]      = DeriveConfig.from(localTime)
+  lazy given DeriveConfig[LocalDateTime]  = DeriveConfig.from(localDateTime)
+  lazy given DeriveConfig[Byte]           = DeriveConfig(Config.byte)
+  lazy given DeriveConfig[Short]          = DeriveConfig(Config.short)
+  lazy given DeriveConfig[UUID]           = DeriveConfig(Config.uuid)
+  lazy given DeriveConfig[Long]           = DeriveConfig(Config.long)
 
   given optDesc[A](using ev: DeriveConfig[A]): DeriveConfig[Option[A]] =
     DeriveConfig.from(ev.desc.optional)
@@ -113,28 +118,29 @@ object DeriveConfig {
   inline def summonDeriveConfigForCoProduct[T <: Tuple]: List[DeriveConfig[Any]] =
     inline erasedValue[T] match
       case _: EmptyTuple => Nil
-      case _: (t *: ts) =>
+      case _: (t *: ts)  =>
         val desc = summonInline[DeriveConfig[t]]
         DeriveConfig[Any](
-          desc.desc, desc.metadata
+          desc.desc,
+          desc.metadata
         ) :: summonDeriveConfigForCoProduct[ts]
 
   inline def summonDeriveConfigAll[T <: Tuple]: List[DeriveConfig[_]] =
     inline erasedValue[T] match
-      case _ : EmptyTuple => Nil
-      case _: (t *: ts) =>
+      case _: EmptyTuple => Nil
+      case _: (t *: ts)  =>
         summonInline[DeriveConfig[t]] :: summonDeriveConfigAll[ts]
 
   inline def labelsOf[T <: Tuple]: List[String] =
     inline erasedValue[T] match
       case _: EmptyTuple => Nil
-      case _ : ( t *: ts) => constValue[t].toString :: labelsOf[ts]
+      case _: (t *: ts)  => constValue[t].toString :: labelsOf[ts]
 
   inline def customNamesOf[T]: List[String] =
     Macros.nameOf[T].map(_.name)
 
   inline def customFieldNamesOf[T]: Map[String, name] =
-    Macros.fieldNameOf[T].flatMap({ case(str, nmes) => nmes.map(name => (str, name)) }).toMap
+    Macros.fieldNameOf[T].flatMap { case (str, nmes) => nmes.map(name => (str, name)) }.toMap
 
   inline given derived[T](using m: Mirror.Of[T]): DeriveConfig[T] =
     inline m match
@@ -176,11 +182,11 @@ object DeriveConfig {
           Macros.defaultValuesOf[T].toMap
 
         lazy val fieldNames =
-          originalFieldNamesList.foldRight(Nil: List[FieldName])((str, list) => {
+          originalFieldNamesList.foldRight(Nil: List[FieldName]) { (str, list) =>
             val alternativeNames = customFieldNameMap.get(str).map(v => List(v.name)).getOrElse(Nil)
-            val descriptions = documentations.get(str).map(_.map(_.describe)).getOrElse(Nil)
+            val descriptions     = documentations.get(str).map(_.map(_.describe)).getOrElse(Nil)
             FieldName(str, alternativeNames.toList, descriptions) :: list
-          })
+          }
 
         lazy val fieldConfigs =
           summonDeriveConfigAll[m.MirroredElemTypes].asInstanceOf[List[DeriveConfig[Any]]]
@@ -209,13 +215,15 @@ object DeriveConfig {
               desc.metadata match {
                 case Some(Metadata.Product(productName, fields)) if (fields.nonEmpty) =>
                   tryAllKeys(desc.desc, Some(productName.originalName), productName.alternativeNames)
-                case Some(_) => desc.desc
-                case None => desc.desc
+                case Some(_)                                                          => desc.desc
+                case None                                                             => desc.desc
               }
-            ).reduce(_ orElse _)
+            )
+            .reduce(_ orElse _)
 
         case Some(keyName) =>
-          Config.string(keyName)
+          Config
+            .string(keyName)
             .switch(
               allDescs.flatMap { desc =>
                 desc.metadata match {
@@ -237,52 +245,50 @@ object DeriveConfig {
     defaultValues: Map[String, Any],
     fieldNames: List[String],
     descriptors: List[DeriveConfig[Any]]
-  ): List[DeriveConfig[_]] = {
-    descriptors.zip(fieldNames).map({ case (desc, fieldName) =>
+  ): List[DeriveConfig[_]] =
+    descriptors.zip(fieldNames).map { case (desc, fieldName) =>
       defaultValues.get(fieldName) match {
         case Some(any) => DeriveConfig(desc.desc.withDefault(any), desc.metadata)
-        case None => desc
-    }})
-  }
+        case None      => desc
+      }
+    }
 
   def mergeAllFields[T](
     allDescs: => List[DeriveConfig[_]],
     productName: ProductName,
     fieldNames: => List[FieldName],
     f: List[Any] => T,
-    g: T => List[Any],
-   ): DeriveConfig[T] =
-       if fieldNames.isEmpty then // if there are no fields in the product then the value is the name of the product itself
-         val tryAllPaths =
-           (productName.originalName :: productName.alternativeNames)
-             .map(n => zio.Config.constant(n)).reduce(_ orElse _)
-
-         DeriveConfig(
-           tryAllPaths.map[T](
-             _ => f(Nil)
-           ),
-           Some(Metadata.Object[T](productName, f(Nil))) // We propogate the info that product was actually an object
-         )
-
-       else
-         val listOfDesc =
-           fieldNames.zip(allDescs).map({ case (fieldName, desc) => {
-             val fieldDesc = tryAllKeys(desc.desc, Some(fieldName.originalName), fieldName.alternativeNames)
-             fieldName.descriptions.foldRight(fieldDesc)((doc, desc) => desc ?? doc)
-           }})
-
-         val descOfList =
-           Config.collectAll(listOfDesc.head, listOfDesc.tail: _*)
-
-         DeriveConfig(descOfList.map(f), Some(Metadata.Product(productName, fieldNames)))
+    g: T => List[Any]
+  ): DeriveConfig[T] =
+    if fieldNames.isEmpty then // if there are no fields in the product then the value is the name of the product itself
+      val tryAllPaths =
+        (productName.originalName :: productName.alternativeNames)
+          .map(n => zio.Config.constant(n))
+          .reduce(_ orElse _)
+
+      DeriveConfig(
+        tryAllPaths.map[T](_ => f(Nil)),
+        Some(Metadata.Object[T](productName, f(Nil))) // We propogate the info that product was actually an object
+      )
+    else
+      val listOfDesc =
+        fieldNames.zip(allDescs).map { case (fieldName, desc) =>
+          val fieldDesc = tryAllKeys(desc.desc, Some(fieldName.originalName), fieldName.alternativeNames)
+          fieldName.descriptions.foldRight(fieldDesc)((doc, desc) => desc ?? doc)
+        }
+
+      val descOfList =
+        Config.collectAll(listOfDesc.head, listOfDesc.tail: _*)
+
+      DeriveConfig(descOfList.map(f), Some(Metadata.Product(productName, fieldNames)))
 
   def tryAllKeys[A](
     desc: Config[A],
     originalKey: Option[String],
-    alternativeKeys: List[String],
+    alternativeKeys: List[String]
   ): Config[A] =
     alternativeKeys match {
-      case Nil => originalKey.fold(desc)(desc.nested(_))
+      case Nil  => originalKey.fold(desc)(desc.nested(_))
       case keys => keys.view.map(desc.nested(_)).reduce(_ orElse _)
     }
 
diff --git a/magnolia/src/main/scala-3/zio/config/magnolia/Macros.scala b/magnolia/src/main/scala-3/zio/config/magnolia/Macros.scala
new file mode 100644
index 000000000..a176338d8
--- /dev/null
+++ b/magnolia/src/main/scala-3/zio/config/magnolia/Macros.scala
@@ -0,0 +1,61 @@
+package zio.config.magnolia
+
+import scala.quoted.*
+import zio.config.derivation._
+
+object Macros:
+  inline def nameOf[T]: List[name]                                   = ${ anns[T, name]("zio.config.derivation.name") }
+  inline def discriminator[T]: List[discriminator]                   = ${ anns[T, discriminator]("zio.config.derivation.discriminator") }
+  inline def documentationOf[T]: List[describe]                      = ${ anns[T, describe]("zio.config.derivation.describe") }
+  inline def fieldNameOf[T]: List[(String, List[name])]              = ${ fieldAnns[T, name]("zio.config.derivation.name") }
+  inline def fieldDocumentationOf[T]: List[(String, List[describe])] = ${
+    fieldAnns[T, describe]("zio.config.derivation.describe")
+  }
+  inline def defaultValuesOf[T]: List[(String, Any)]                 = ${ defaultValues[T] }
+
+  def defaultValues[T: Type](using Quotes): Expr[List[(String, Any)]] =
+    import quotes.reflect.*
+    val tpe = TypeRepr.of[T]
+
+    val sym = tpe.typeSymbol
+
+    val namesOfFieldsWithDefaultValues =
+      sym.caseFields.filter(s => s.flags.is(Flags.HasDefault)).map(_.name)
+
+    val companionClas =
+      sym.companionClass
+
+    val defaultRefs =
+      companionClas.declarations
+        .filter(_.name.startsWith("$lessinit$greater$default"))
+        .map(Ref(_))
+
+    Expr.ofList(namesOfFieldsWithDefaultValues.zip(defaultRefs).map { case (n, ref) =>
+      Expr.ofTuple(Expr(n), ref.asExpr)
+    })
+
+  def anns[T: Type, A: Type](ownerName: String)(using Quotes): Expr[List[A]] = {
+    import quotes.reflect.*
+
+    val tpe = TypeRepr.of[T]
+
+    Expr.ofList {
+      tpe.typeSymbol.annotations.filter { a =>
+        a.tpe.typeSymbol.fullName == ownerName
+      }.map(_.asExpr.asInstanceOf[Expr[A]])
+    }
+  }
+
+  def fieldAnns[T: Type, A: Type](ownerName: String)(using Quotes): Expr[List[(String, List[A])]] =
+    import quotes.reflect.*
+
+    val tpe = TypeRepr.of[T]
+
+    Expr.ofList {
+      tpe.typeSymbol.primaryConstructor.paramSymss.flatten.map { field =>
+        Expr(field.name) -> field.annotations.filter { a =>
+          a.tpe.typeSymbol.fullName == ownerName
+        }.map(_.asExpr.asInstanceOf[Expr[A]])
+      }.filter(_._2.nonEmpty).map((name, anns) => Expr.ofTuple(name, Expr.ofList(anns)))
+    }
+end Macros
diff --git a/magnolia/shared/src/main/scala-dotty/zio/config/magnolia/examples/AutoDerivationSimple.scala b/magnolia/src/main/scala-3/zio/config/magnolia/examples/AutoDerivationSimple.scala
similarity index 59%
rename from magnolia/shared/src/main/scala-dotty/zio/config/magnolia/examples/AutoDerivationSimple.scala
rename to magnolia/src/main/scala-3/zio/config/magnolia/examples/AutoDerivationSimple.scala
index c876d3ae5..2adb61bd0 100644
--- a/magnolia/shared/src/main/scala-dotty/zio/config/magnolia/examples/AutoDerivationSimple.scala
+++ b/magnolia/src/main/scala-3/zio/config/magnolia/examples/AutoDerivationSimple.scala
@@ -8,29 +8,29 @@ import zio.Unsafe
 import zio.IO
 import zio.config.syntax._
 
-object AutoDerivationSimple extends App :
+object AutoDerivationSimple extends App:
   // Use of Either is almost prohibited by the looks of it
   val sourceMap =
     Map(
-      "a.b-c" -> "v1",
-      "a.c-d" -> "C",
-      "a.d" -> "C,C",
+      "a.b-c"       -> "v1",
+      "a.c-d"       -> "C",
+      "a.d"         -> "C,C",
       "a.f.g.value" -> "v2",
-      "a.g" -> "F",
+      "a.g"         -> "F",
       "a.h.g.value" -> "GValue",
-      "a.i.p" -> "Q",
-      "a.j.p.t.u" -> "v3",
-      "a.z.type" ->  "AbcDef",
-      "a.z.name" -> "hello",
-      "a.y" -> "HmmAbc"
+      "a.i.p"       -> "Q",
+      "a.j.p.t.u"   -> "v3",
+      "a.z.type"    -> "AbcDef",
+      "a.z.name"    -> "hello",
+      "a.y"         -> "HmmAbc"
     )
 
   val source =
     ConfigProvider.fromMap(
-    sourceMap,
-    pathDelim = ".",
-    seqDelim = ","
-  )
+      sourceMap,
+      pathDelim = ".",
+      seqDelim = ","
+    )
 
   val io: IO[String, A] =
     source.load(deriveConfig[A].toKebabCase).mapError(_.prettyPrint())
@@ -40,5 +40,5 @@ object AutoDerivationSimple extends App :
   }
 
   println(readResult)
- // A(B(v1,C(),List(C(), C()),None,G(v2),F,G(GValue),Q,T(v3),Abc(hello)))
+// A(B(v1,C(),List(C(), C()),None,G(v2),F,G(GValue),Q,T(v3),Abc(hello)))
 end AutoDerivationSimple
diff --git a/magnolia/shared/src/main/scala-dotty/zio/config/magnolia/examples/SampleConfig.scala b/magnolia/src/main/scala-3/zio/config/magnolia/examples/SampleConfig.scala
similarity index 100%
rename from magnolia/shared/src/main/scala-dotty/zio/config/magnolia/examples/SampleConfig.scala
rename to magnolia/src/main/scala-3/zio/config/magnolia/examples/SampleConfig.scala
diff --git a/magnolia/src/main/scala-3/zio/config/magnolia/package.scala b/magnolia/src/main/scala-3/zio/config/magnolia/package.scala
new file mode 100644
index 000000000..397c23542
--- /dev/null
+++ b/magnolia/src/main/scala-3/zio/config/magnolia/package.scala
@@ -0,0 +1,40 @@
+package zio.config
+package magnolia
+
+import zio.ConfigProvider
+
+import zio.Config
+import zio.IO
+
+def deriveConfig[A](using ev: DeriveConfig[A]) =
+  ev.desc
+
+type describe = derivation.describe
+val describe: derivation.describe.type = derivation.describe
+
+type name = derivation.name
+val name: derivation.name.type = derivation.name
+
+type discriminator = derivation.discriminator
+val discriminator: derivation.discriminator.type = derivation.discriminator
+
+type kebabCase = derivation.kebabCase
+val kebabCase: derivation.kebabCase.type = derivation.kebabCase
+
+type snakeCase = derivation.snakeCase
+val snakeCase: derivation.snakeCase.type = derivation.snakeCase
+
+type prefix = derivation.prefix
+val prefix: derivation.prefix.type = derivation.prefix
+
+type postfix = derivation.postfix
+val postfix: derivation.postfix.type = derivation.postfix
+
+// If you happen to define a Config directly as an implicit, then automatically DeriveConfig will be available
+given deriveConfigFromConfig[A](using ev: Config[A]): DeriveConfig[A] =
+  DeriveConfig(ev, None)
+
+extension (configProvider: ConfigProvider) {
+  def autoLoad[A: DeriveConfig]: IO[Config.Error, A] =
+    configProvider.load(DeriveConfig[A].desc)
+}
diff --git a/magnolia/shared/src/test/scala-2.12-2.13/zio/config/magnolia/AutomaticConfigSpec.scala b/magnolia/src/test/scala-2/zio/config/magnolia/AutomaticConfigSpec.scala
similarity index 100%
rename from magnolia/shared/src/test/scala-2.12-2.13/zio/config/magnolia/AutomaticConfigSpec.scala
rename to magnolia/src/test/scala-2/zio/config/magnolia/AutomaticConfigSpec.scala
diff --git a/magnolia/shared/src/test/scala-dotty/zio/config/magnolia/AutomaticConfigSpec.scala b/magnolia/src/test/scala-3/zio/config/magnolia/AutomaticConfigSpec.scala
similarity index 100%
rename from magnolia/shared/src/test/scala-dotty/zio/config/magnolia/AutomaticConfigSpec.scala
rename to magnolia/src/test/scala-3/zio/config/magnolia/AutomaticConfigSpec.scala
diff --git a/magnolia/shared/src/test/scala-dotty/zio/config/magnolia/DefaultValueSpec.scala b/magnolia/src/test/scala-3/zio/config/magnolia/DefaultValueSpec.scala
similarity index 100%
rename from magnolia/shared/src/test/scala-dotty/zio/config/magnolia/DefaultValueSpec.scala
rename to magnolia/src/test/scala-3/zio/config/magnolia/DefaultValueSpec.scala
diff --git a/magnolia/shared/src/test/scala-dotty/zio/config/magnolia/MarkdownSpec.scala b/magnolia/src/test/scala-3/zio/config/magnolia/MarkdownSpec.scala
similarity index 100%
rename from magnolia/shared/src/test/scala-dotty/zio/config/magnolia/MarkdownSpec.scala
rename to magnolia/src/test/scala-3/zio/config/magnolia/MarkdownSpec.scala
diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala
index b308b4c79..224722ebe 100644
--- a/project/BuildHelper.scala
+++ b/project/BuildHelper.scala
@@ -4,8 +4,8 @@ import sbt.Keys._
 import sbt._
 import sbtbuildinfo.BuildInfoKeys._
 import sbtbuildinfo._
-import sbtcrossproject.CrossPlugin.autoImport._
 import scalafix.sbt.ScalafixPlugin.autoImport._
+import sbtprojectmatrix.ProjectMatrixKeys.virtualAxes
 
 object BuildHelper {
   private val versions: String => String = {
@@ -24,7 +24,7 @@ object BuildHelper {
   }
   val Scala212: String                   = versions("2.12")
   val Scala213: String                   = versions("2.13")
-  val ScalaDotty: String                 = versions("3")
+  val Scala3: String                     = versions("3.4")
 
   private val stdOptions = Seq(
     "-deprecation",
@@ -59,36 +59,29 @@ object BuildHelper {
       buildInfoPackage := packageName
     )
 
-  val dottySettings = Seq(
-    crossScalaVersions += ScalaDotty,
+  val scala3Settings = Seq(
     scalacOptions --= {
-      if (scalaVersion.value == ScalaDotty)
+      if (scalaVersion.value == Scala3)
         Seq("-Xfatal-warnings")
       else
         Seq("-Xprint:typer")
     },
-    Compile / doc / sources  := {
+    scalacOptions ++= {
+      if (scalaVersion.value == Scala3)
+        Seq("-Xmax-inlines", "64")
+      else
+        Seq.empty
+    },
+    Compile / doc / sources := {
       val old = (Compile / doc / sources).value
-      if (scalaVersion.value == ScalaDotty) {
+      if (scalaVersion.value == Scala3) {
         Nil
       } else {
         old
       }
-    },
-    Test / parallelExecution := {
-      val old = (Test / parallelExecution).value
-      if (scalaVersion.value == ScalaDotty) {
-        false
-      } else {
-        old
-      }
     }
   )
 
-  val scalaReflectSettings = Seq(
-    libraryDependencies ++= Seq("dev.zio" %%% "izumi-reflect" % "1.0.0-M10")
-  )
-
   // Keep this consistent with the version in .core-tests/shared/src/test/scala/REPLSpec.scala
   val replSettings = makeReplSettings {
     """|import zio._
@@ -167,40 +160,16 @@ object BuildHelper {
     if result.exists
   } yield result
 
-  def crossPlatformSources(scalaVer: String, platform: String, conf: String, baseDir: File) = {
-    val versions = CrossVersion.partialVersion(scalaVer) match {
-      case Some((2, 12)) =>
-        List("2.12", "2.12+", "2.12-2.13", "2.x")
-      case Some((2, 13)) =>
-        List("2.13", "2.12+", "2.13+", "2.12-2.13", "2.x")
-      case Some((3, _))  =>
-        List("dotty", "2.12+", "2.13+", "3.x")
-      case _             =>
-        List()
-    }
-    platformSpecificSources(platform, conf, baseDir)(versions: _*)
-  }
-
   lazy val crossProjectSettings = Seq(
     resolvers +=
       "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
-    Compile / unmanagedSourceDirectories ++= {
-      crossPlatformSources(
-        scalaVersion.value,
-        crossProjectPlatform.value.identifier,
-        "main",
-        baseDirectory.value
-      )
-    },
-    Test / unmanagedSourceDirectories ++= {
-      crossPlatformSources(
-        scalaVersion.value,
-        crossProjectPlatform.value.identifier,
-        "test",
-        baseDirectory.value
-      )
+    scalacOptions --= {
+      if (scalaVersion.value == Scala3)
+        Seq("-Xfatal-warnings")
+      else
+        Seq.empty
     }
-  )
+  ) ++ scala3Settings
 
   def stdSettings(prjName: String) = Seq(
     resolvers +=
@@ -208,18 +177,18 @@ object BuildHelper {
     name                                   := s"$prjName",
     crossScalaVersions                     := Seq(Scala212, Scala213),
     ThisBuild / scalaVersion               := Scala213,
-    scalacOptions                          := stdOptions ++ extraOptions(scalaVersion.value, optimize = !isSnapshot.value),
+    scalacOptions ++= stdOptions ++ extraOptions(scalaVersion.value, optimize = !isSnapshot.value),
     libraryDependencies ++= {
-      if (scalaVersion.value == ScalaDotty)
+      if (scalaVersion.value == Scala3)
         Seq.empty
       else
         Seq(
-          compilerPlugin("org.typelevel" %% "kind-projector" % "0.13.2" cross CrossVersion.full)
+          compilerPlugin("org.typelevel" %% "kind-projector" % "0.13.3" cross CrossVersion.full)
         )
     },
-    semanticdbEnabled                      := scalaVersion.value != ScalaDotty, // enable SemanticDB
+    semanticdbEnabled                      := scalaVersion.value != Scala3, // enable SemanticDB
     semanticdbOptions += "-P:semanticdb:synthetics:on",
-    semanticdbVersion                      := scalafixSemanticdb.revision,      // use Scalafix compatible version
+    semanticdbVersion                      := scalafixSemanticdb.revision,  // use Scalafix compatible version
     ThisBuild / scalafixScalaBinaryVersion := CrossVersion.binaryScalaVersion(scalaVersion.value),
     ThisBuild / scalafixDependencies ++= List(
       "com.github.liancheng" %% "organize-imports" % "0.6.0",
@@ -250,7 +219,7 @@ object BuildHelper {
   def macroDefinitionSettings = Seq(
     scalacOptions += "-language:experimental.macros",
     libraryDependencies ++= {
-      if (scalaVersion.value == ScalaDotty) Seq()
+      if (scalaVersion.value == Scala3) Seq()
       else
         Seq(
           "org.scala-lang" % "scala-reflect"  % scalaVersion.value % "provided",
@@ -260,20 +229,21 @@ object BuildHelper {
   )
 
   def jsSettings = Seq(
-    libraryDependencies += "io.github.cquiroz" %%% "scala-java-time"      % "2.2.2",
-    libraryDependencies += "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.2.2"
+    libraryDependencies += "io.github.cquiroz" %%% "scala-java-time"      % "2.6.0",
+    libraryDependencies += "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.6.0"
   )
 
   def nativeSettings = Seq(
-    Test / skip             := true,
-    doc / skip              := true,
-    Compile / doc / sources := Seq.empty
+    Test / skip             := (if (virtualAxes.value.contains(VirtualAxis.native)) true else false),
+    doc / skip              := (if (virtualAxes.value.contains(VirtualAxis.native)) true else false),
+    Compile / doc / sources := (if (virtualAxes.value.contains(VirtualAxis.native)) Seq.empty
+                                else (Compile / doc / sources).value)
   )
 
   val scalaReflectTestSettings: List[Setting[_]] = List(
     libraryDependencies ++= {
-      if (scalaVersion.value == ScalaDotty)
-        Seq("org.scala-lang" % "scala-reflect" % Scala213           % Test)
+      if (scalaVersion.value == Scala3)
+        Seq()
       else
         Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value % Test)
     }
diff --git a/project/build.properties b/project/build.properties
index 0aa5c39b8..23f7d9793 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.9.8
+sbt.version = 1.10.2
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 7550bf7f3..c51fd678b 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,22 +1,20 @@
-addSbtPlugin("ch.epfl.scala"                     % "sbt-bloop"                     % "1.5.17")
-addSbtPlugin("ch.epfl.scala"                     % "sbt-scalafix"                  % "0.12.1")
-addSbtPlugin("com.eed3si9n"                      % "sbt-buildinfo"                 % "0.12.0")
-addSbtPlugin("com.eed3si9n"                      % "sbt-unidoc"                    % "0.4.3")
-addSbtPlugin("com.github.sbt"                    % "sbt-ci-release"                % "1.5.10")
-addSbtPlugin("com.github.cb372"                  % "sbt-explicit-dependencies"     % "0.2.16")
-addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings"              % "3.0.2")
-addSbtPlugin("com.typesafe"                      % "sbt-mima-plugin"               % "1.1.0")
-addSbtPlugin("de.heikoseeberger"                 % "sbt-header"                    % "5.7.0")
-addSbtPlugin("org.portable-scala"                % "sbt-scala-native-crossproject" % "1.2.0")
-addSbtPlugin("org.portable-scala"                % "sbt-scalajs-crossproject"      % "1.2.0")
-addSbtPlugin("org.scala-js"                      % "sbt-scalajs"                   % "1.16.0")
-addSbtPlugin("org.scala-native"                  % "sbt-scala-native"              % "0.4.16")
-addSbtPlugin("org.scalameta"                     % "sbt-mdoc"                      % "2.3.7")
-addSbtPlugin("org.scalameta"                     % "sbt-scalafmt"                  % "2.4.6")
-addSbtPlugin("pl.project13.scala"                % "sbt-jcstress"                  % "0.2.0")
-addSbtPlugin("pl.project13.scala"                % "sbt-jmh"                       % "0.4.4")
-addSbtPlugin("dev.zio"                           % "zio-sbt-website"               % "0.3.1")
+addSbtPlugin("ch.epfl.scala"                     % "sbt-scalafix"              % "0.13.0")
+addSbtPlugin("com.eed3si9n"                      % "sbt-buildinfo"             % "0.12.0")
+addSbtPlugin("com.github.sbt"                    % "sbt-unidoc"                % "0.5.0")
+addSbtPlugin("com.github.sbt"                    % "sbt-ci-release"            % "1.6.1")
+addSbtPlugin("com.github.cb372"                  % "sbt-explicit-dependencies" % "0.3.1")
+addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings"          % "3.0.2")
+addSbtPlugin("com.typesafe"                      % "sbt-mima-plugin"           % "1.1.4")
+addSbtPlugin("de.heikoseeberger"                 % "sbt-header"                % "5.10.0")
+addSbtPlugin("org.scala-js"                      % "sbt-scalajs"               % "1.17.0")
+addSbtPlugin("org.scala-native"                  % "sbt-scala-native"          % "0.5.5")
+addSbtPlugin("org.scalameta"                     % "sbt-mdoc"                  % "2.6.1")
+addSbtPlugin("org.scalameta"                     % "sbt-scalafmt"              % "2.5.2")
+addSbtPlugin("pl.project13.scala"                % "sbt-jcstress"              % "0.2.0")
+addSbtPlugin("pl.project13.scala"                % "sbt-jmh"                   % "0.4.7")
+addSbtPlugin("dev.zio"                           % "zio-sbt-website"           % "0.3.10")
+addSbtPlugin("com.eed3si9n"                      % "sbt-projectmatrix"         % "0.10.0")
 
-libraryDependencies += "org.snakeyaml" % "snakeyaml-engine" % "2.6"
+libraryDependencies += "org.snakeyaml" % "snakeyaml-engine" % "2.8"
 
 resolvers ++= Resolver.sonatypeOssRepos("public")
diff --git a/pureconfig/shared/src/main/scala/zio/config/pureconfig/package.scala b/pureconfig/src/main/scala/zio/config/pureconfig/package.scala
similarity index 100%
rename from pureconfig/shared/src/main/scala/zio/config/pureconfig/package.scala
rename to pureconfig/src/main/scala/zio/config/pureconfig/package.scala
diff --git a/pureconfig/shared/src/test/scala/zio/config/pureconfig/PureconfigTest.scala b/pureconfig/src/test/scala/zio/config/pureconfig/PureconfigTest.scala
similarity index 100%
rename from pureconfig/shared/src/test/scala/zio/config/pureconfig/PureconfigTest.scala
rename to pureconfig/src/test/scala/zio/config/pureconfig/PureconfigTest.scala
diff --git a/refined/shared/src/main/scala/zio/config/refined/PartialRefined.scala b/refined/src/main/scala/zio/config/refined/PartialRefined.scala
similarity index 100%
rename from refined/shared/src/main/scala/zio/config/refined/PartialRefined.scala
rename to refined/src/main/scala/zio/config/refined/PartialRefined.scala
diff --git a/refined/shared/src/main/scala/zio/config/refined/PartialRefinedPath.scala b/refined/src/main/scala/zio/config/refined/PartialRefinedPath.scala
similarity index 100%
rename from refined/shared/src/main/scala/zio/config/refined/PartialRefinedPath.scala
rename to refined/src/main/scala/zio/config/refined/PartialRefinedPath.scala
diff --git a/refined/shared/src/main/scala/zio/config/refined/package.scala b/refined/src/main/scala/zio/config/refined/package.scala
similarity index 100%
rename from refined/shared/src/main/scala/zio/config/refined/package.scala
rename to refined/src/main/scala/zio/config/refined/package.scala
diff --git a/refined/shared/src/test/scala-2.12/zio/config/refined/NumericTestTypes.scala b/refined/src/test/scala-2.12/zio/config/refined/NumericTestTypes.scala
similarity index 100%
rename from refined/shared/src/test/scala-2.12/zio/config/refined/NumericTestTypes.scala
rename to refined/src/test/scala-2.12/zio/config/refined/NumericTestTypes.scala
diff --git a/refined/shared/src/test/scala-2.13/zio/config/refined/NumericTestTypes.scala b/refined/src/test/scala-2.13/zio/config/refined/NumericTestTypes.scala
similarity index 62%
rename from refined/shared/src/test/scala-2.13/zio/config/refined/NumericTestTypes.scala
rename to refined/src/test/scala-2.13/zio/config/refined/NumericTestTypes.scala
index b16395f4a..73507ea7d 100644
--- a/refined/shared/src/test/scala-2.13/zio/config/refined/NumericTestTypes.scala
+++ b/refined/src/test/scala-2.13/zio/config/refined/NumericTestTypes.scala
@@ -3,10 +3,10 @@ package zio.config.refined
 import eu.timepit.refined.numeric.{Divisible, Greater, GreaterEqual, Less, LessEqual, NonDivisible}
 
 private[refined] trait NumericTestTypes {
-  type Less10 = Less[10]
-  type Greater10 = Greater[10]
+  type Less10           = Less[10]
+  type Greater10        = Greater[10]
   type GreaterOrEqual10 = GreaterEqual[10]
-  type LessOrEqual10 = LessEqual[10]
-  type DivisibleBy10 = Divisible[10]
+  type LessOrEqual10    = LessEqual[10]
+  type DivisibleBy10    = Divisible[10]
   type NonDivisibleBy10 = NonDivisible[10]
 }
diff --git a/refined/shared/src/test/scala-3/zio/config/refined/NumericTestTypes.scala b/refined/src/test/scala-3/zio/config/refined/NumericTestTypes.scala
similarity index 62%
rename from refined/shared/src/test/scala-3/zio/config/refined/NumericTestTypes.scala
rename to refined/src/test/scala-3/zio/config/refined/NumericTestTypes.scala
index b16395f4a..73507ea7d 100644
--- a/refined/shared/src/test/scala-3/zio/config/refined/NumericTestTypes.scala
+++ b/refined/src/test/scala-3/zio/config/refined/NumericTestTypes.scala
@@ -3,10 +3,10 @@ package zio.config.refined
 import eu.timepit.refined.numeric.{Divisible, Greater, GreaterEqual, Less, LessEqual, NonDivisible}
 
 private[refined] trait NumericTestTypes {
-  type Less10 = Less[10]
-  type Greater10 = Greater[10]
+  type Less10           = Less[10]
+  type Greater10        = Greater[10]
   type GreaterOrEqual10 = GreaterEqual[10]
-  type LessOrEqual10 = LessEqual[10]
-  type DivisibleBy10 = Divisible[10]
+  type LessOrEqual10    = LessEqual[10]
+  type DivisibleBy10    = Divisible[10]
   type NonDivisibleBy10 = NonDivisible[10]
 }
diff --git a/refined/shared/src/test/scala/zio/config/refined/NumericSupportTest.scala b/refined/src/test/scala/zio/config/refined/NumericSupportTest.scala
similarity index 100%
rename from refined/shared/src/test/scala/zio/config/refined/NumericSupportTest.scala
rename to refined/src/test/scala/zio/config/refined/NumericSupportTest.scala
diff --git a/refined/shared/src/test/scala/zio/config/refined/RefinedSpec.scala b/refined/src/test/scala/zio/config/refined/RefinedSpec.scala
similarity index 100%
rename from refined/shared/src/test/scala/zio/config/refined/RefinedSpec.scala
rename to refined/src/test/scala/zio/config/refined/RefinedSpec.scala
diff --git a/refined/shared/src/test/scala/zio/config/refined/RequiredNumericTypes.scala b/refined/src/test/scala/zio/config/refined/RequiredNumericTypes.scala
similarity index 100%
rename from refined/shared/src/test/scala/zio/config/refined/RequiredNumericTypes.scala
rename to refined/src/test/scala/zio/config/refined/RequiredNumericTypes.scala
diff --git a/scalaz/shared/src/main/scala/zio/config/scalaz/instances/package.scala b/scalaz/src/main/scala/zio/config/scalaz/instances/package.scala
similarity index 100%
rename from scalaz/shared/src/main/scala/zio/config/scalaz/instances/package.scala
rename to scalaz/src/main/scala/zio/config/scalaz/instances/package.scala
diff --git a/scalaz/shared/src/main/scala/zio/config/scalaz/package.scala b/scalaz/src/main/scala/zio/config/scalaz/package.scala
similarity index 100%
rename from scalaz/shared/src/main/scala/zio/config/scalaz/package.scala
rename to scalaz/src/main/scala/zio/config/scalaz/package.scala
diff --git a/typesafe-magnolia-tests/shared/src/test/scala/zio/config/magnolia/AnnotationsTest.scala b/typesafe-magnolia-tests/src/test/scala/zio/config/magnolia/AnnotationsTest.scala
similarity index 98%
rename from typesafe-magnolia-tests/shared/src/test/scala/zio/config/magnolia/AnnotationsTest.scala
rename to typesafe-magnolia-tests/src/test/scala/zio/config/magnolia/AnnotationsTest.scala
index d7509a051..7f49e3549 100644
--- a/typesafe-magnolia-tests/shared/src/test/scala/zio/config/magnolia/AnnotationsTest.scala
+++ b/typesafe-magnolia-tests/src/test/scala/zio/config/magnolia/AnnotationsTest.scala
@@ -1,6 +1,6 @@
-package zio.config.magnolia
+package zio.config
+package magnolia
 
-import zio.config.read
 import zio.config.typesafe.TypesafeConfigProvider
 import zio.test.Assertion.equalTo
 import zio.test.{Spec, ZIOSpecDefault, assertZIO}
diff --git a/typesafe-magnolia-tests/shared/src/test/scala/zio/config/magnolia/CoproductSealedTraitSpec.scala b/typesafe-magnolia-tests/src/test/scala/zio/config/magnolia/CoproductSealedTraitSpec.scala
similarity index 97%
rename from typesafe-magnolia-tests/shared/src/test/scala/zio/config/magnolia/CoproductSealedTraitSpec.scala
rename to typesafe-magnolia-tests/src/test/scala/zio/config/magnolia/CoproductSealedTraitSpec.scala
index ee82e1a8b..6b9313f1e 100644
--- a/typesafe-magnolia-tests/shared/src/test/scala/zio/config/magnolia/CoproductSealedTraitSpec.scala
+++ b/typesafe-magnolia-tests/src/test/scala/zio/config/magnolia/CoproductSealedTraitSpec.scala
@@ -2,7 +2,7 @@ package zio.config.magnolia
 
 import zio.ConfigProvider
 import zio.config._
-import zio.config.derivation.{ name => derivedName }
+import zio.config.derivation.{name => derivedName}
 import zio.test.Assertion._
 import zio.test.{ZIOSpecDefault, _}
 
diff --git a/typesafe-magnolia-tests/shared/src/test/scala/zio/config/typesafe/EitherSupport.scala b/typesafe-magnolia-tests/src/test/scala/zio/config/typesafe/EitherSupport.scala
similarity index 100%
rename from typesafe-magnolia-tests/shared/src/test/scala/zio/config/typesafe/EitherSupport.scala
rename to typesafe-magnolia-tests/src/test/scala/zio/config/typesafe/EitherSupport.scala
diff --git a/typesafe-magnolia-tests/shared/src/test/scala/zio/config/typesafe/TypesafeConfigErrorsSpec.scala b/typesafe-magnolia-tests/src/test/scala/zio/config/typesafe/TypesafeConfigErrorsSpec.scala
similarity index 100%
rename from typesafe-magnolia-tests/shared/src/test/scala/zio/config/typesafe/TypesafeConfigErrorsSpec.scala
rename to typesafe-magnolia-tests/src/test/scala/zio/config/typesafe/TypesafeConfigErrorsSpec.scala
diff --git a/typesafe-magnolia-tests/shared/src/test/scala/zio/config/typesafe/TypesafeConfigListTest.scala b/typesafe-magnolia-tests/src/test/scala/zio/config/typesafe/TypesafeConfigListTest.scala
similarity index 100%
rename from typesafe-magnolia-tests/shared/src/test/scala/zio/config/typesafe/TypesafeConfigListTest.scala
rename to typesafe-magnolia-tests/src/test/scala/zio/config/typesafe/TypesafeConfigListTest.scala
diff --git a/typesafe-magnolia-tests/shared/src/test/scala/zio/config/typesafe/TypesafeConfigMapTest.scala b/typesafe-magnolia-tests/src/test/scala/zio/config/typesafe/TypesafeConfigMapTest.scala
similarity index 100%
rename from typesafe-magnolia-tests/shared/src/test/scala/zio/config/typesafe/TypesafeConfigMapTest.scala
rename to typesafe-magnolia-tests/src/test/scala/zio/config/typesafe/TypesafeConfigMapTest.scala
diff --git a/typesafe-magnolia-tests/shared/src/test/scala/zio/config/typesafe/TypesafeConfigProviderZIOTest.scala b/typesafe-magnolia-tests/src/test/scala/zio/config/typesafe/TypesafeConfigProviderZIOTest.scala
similarity index 93%
rename from typesafe-magnolia-tests/shared/src/test/scala/zio/config/typesafe/TypesafeConfigProviderZIOTest.scala
rename to typesafe-magnolia-tests/src/test/scala/zio/config/typesafe/TypesafeConfigProviderZIOTest.scala
index d4416d93c..7fc3de970 100644
--- a/typesafe-magnolia-tests/shared/src/test/scala/zio/config/typesafe/TypesafeConfigProviderZIOTest.scala
+++ b/typesafe-magnolia-tests/src/test/scala/zio/config/typesafe/TypesafeConfigProviderZIOTest.scala
@@ -1,8 +1,8 @@
-package zio.config.typesafe
+package zio.config
+package typesafe
 
 import zio.Config
 import zio.config.magnolia.deriveConfig
-import zio.config.read
 import zio.test.Assertion.equalTo
 import zio.test.{Spec, ZIOSpecDefault, assertZIO}
 
diff --git a/typesafe-magnolia-tests/shared/src/test/scala/zio/config/typesafe/TypesafeConfigSimpleSpec.scala b/typesafe-magnolia-tests/src/test/scala/zio/config/typesafe/TypesafeConfigSimpleSpec.scala
similarity index 100%
rename from typesafe-magnolia-tests/shared/src/test/scala/zio/config/typesafe/TypesafeConfigSimpleSpec.scala
rename to typesafe-magnolia-tests/src/test/scala/zio/config/typesafe/TypesafeConfigSimpleSpec.scala
diff --git a/typesafe-magnolia-tests/shared/src/test/scala/zio/config/typesafe/TypesafeConfigTestSupport.scala b/typesafe-magnolia-tests/src/test/scala/zio/config/typesafe/TypesafeConfigTestSupport.scala
similarity index 99%
rename from typesafe-magnolia-tests/shared/src/test/scala/zio/config/typesafe/TypesafeConfigTestSupport.scala
rename to typesafe-magnolia-tests/src/test/scala/zio/config/typesafe/TypesafeConfigTestSupport.scala
index d87e58c84..4554c0fa8 100644
--- a/typesafe-magnolia-tests/shared/src/test/scala/zio/config/typesafe/TypesafeConfigTestSupport.scala
+++ b/typesafe-magnolia-tests/src/test/scala/zio/config/typesafe/TypesafeConfigTestSupport.scala
@@ -1,7 +1,7 @@
-package zio.config.typesafe
+package zio.config
+package typesafe
 
 import zio.config.magnolia.deriveConfig
-import zio.config.read
 import zio.{Config, ConfigProvider, IO}
 
 object TypesafeConfigTestSupport extends EitherSupport {
diff --git a/typesafe-magnolia-tests/shared/src/test/scala/zio/config/typesafe/TypesafeRecursiveConfigTest.scala b/typesafe-magnolia-tests/src/test/scala/zio/config/typesafe/TypesafeRecursiveConfigTest.scala
similarity index 100%
rename from typesafe-magnolia-tests/shared/src/test/scala/zio/config/typesafe/TypesafeRecursiveConfigTest.scala
rename to typesafe-magnolia-tests/src/test/scala/zio/config/typesafe/TypesafeRecursiveConfigTest.scala
diff --git a/typesafe/shared/src/main/scala/zio/config/typesafe/TypesafeConfigProvider.scala b/typesafe/src/main/scala/zio/config/typesafe/TypesafeConfigProvider.scala
similarity index 100%
rename from typesafe/shared/src/main/scala/zio/config/typesafe/TypesafeConfigProvider.scala
rename to typesafe/src/main/scala/zio/config/typesafe/TypesafeConfigProvider.scala
diff --git a/typesafe/shared/src/main/scala/zio/config/typesafe/package.scala b/typesafe/src/main/scala/zio/config/typesafe/package.scala
similarity index 100%
rename from typesafe/shared/src/main/scala/zio/config/typesafe/package.scala
rename to typesafe/src/main/scala/zio/config/typesafe/package.scala
diff --git a/typesafe/shared/src/test/scala/zio/config/typesafe/TypesafeConfigSpec.scala b/typesafe/src/test/scala/zio/config/typesafe/TypesafeConfigSpec.scala
similarity index 100%
rename from typesafe/shared/src/test/scala/zio/config/typesafe/TypesafeConfigSpec.scala
rename to typesafe/src/test/scala/zio/config/typesafe/TypesafeConfigSpec.scala
diff --git a/xml/shared/src/main/scala/zio/config/xml/experimental/Parsers.scala b/xml/src/main/scala/zio/config/xml/experimental/Parsers.scala
similarity index 100%
rename from xml/shared/src/main/scala/zio/config/xml/experimental/Parsers.scala
rename to xml/src/main/scala/zio/config/xml/experimental/Parsers.scala
diff --git a/xml/shared/src/main/scala/zio/config/xml/experimental/XmlConfigProvider.scala b/xml/src/main/scala/zio/config/xml/experimental/XmlConfigProvider.scala
similarity index 100%
rename from xml/shared/src/main/scala/zio/config/xml/experimental/XmlConfigProvider.scala
rename to xml/src/main/scala/zio/config/xml/experimental/XmlConfigProvider.scala
diff --git a/xml/shared/src/main/scala/zio/config/xml/experimental/XmlObject.scala b/xml/src/main/scala/zio/config/xml/experimental/XmlObject.scala
similarity index 100%
rename from xml/shared/src/main/scala/zio/config/xml/experimental/XmlObject.scala
rename to xml/src/main/scala/zio/config/xml/experimental/XmlObject.scala
diff --git a/xml/shared/src/main/scala/zio/config/xml/experimental/XmlParser.scala b/xml/src/main/scala/zio/config/xml/experimental/XmlParser.scala
similarity index 89%
rename from xml/shared/src/main/scala/zio/config/xml/experimental/XmlParser.scala
rename to xml/src/main/scala/zio/config/xml/experimental/XmlParser.scala
index 7f2fc9796..e2df2930f 100644
--- a/xml/shared/src/main/scala/zio/config/xml/experimental/XmlParser.scala
+++ b/xml/src/main/scala/zio/config/xml/experimental/XmlParser.scala
@@ -4,6 +4,7 @@ import zio.Chunk
 import Parsers._
 import XmlObject.TagElement
 import zio.parser.Parser
+import zio.parser.StringParserError
 
 object XmlParser {
 
@@ -44,7 +45,7 @@ object XmlParser {
         }
       }
 
-  private[config] def parse(string: String): Either[Parser.ParserError[String], XmlObject] =
+  private[config] def parse(string: String): Either[StringParserError[String], XmlObject] =
     xmlParser.parseString(string)
 
 }
diff --git a/xml/shared/src/main/scala/zio/config/xml/experimental/package.scala b/xml/src/main/scala/zio/config/xml/experimental/package.scala
similarity index 100%
rename from xml/shared/src/main/scala/zio/config/xml/experimental/package.scala
rename to xml/src/main/scala/zio/config/xml/experimental/package.scala
diff --git a/xml/shared/src/test/scala/zio/config/yaml/XmlParserSpec.scala b/xml/src/test/scala/zio/config/yaml/XmlParserSpec.scala
similarity index 100%
rename from xml/shared/src/test/scala/zio/config/yaml/XmlParserSpec.scala
rename to xml/src/test/scala/zio/config/yaml/XmlParserSpec.scala
diff --git a/xml/shared/src/test/scala/zio/config/yaml/XmlProviderSpec.scala b/xml/src/test/scala/zio/config/yaml/XmlProviderSpec.scala
similarity index 100%
rename from xml/shared/src/test/scala/zio/config/yaml/XmlProviderSpec.scala
rename to xml/src/test/scala/zio/config/yaml/XmlProviderSpec.scala
diff --git a/xml/shared/src/test/scala/zio/config/yaml/generators/InvalidTextCharacters.scala b/xml/src/test/scala/zio/config/yaml/generators/InvalidTextCharacters.scala
similarity index 100%
rename from xml/shared/src/test/scala/zio/config/yaml/generators/InvalidTextCharacters.scala
rename to xml/src/test/scala/zio/config/yaml/generators/InvalidTextCharacters.scala
diff --git a/xml/shared/src/test/scala/zio/config/yaml/generators/Printer.scala b/xml/src/test/scala/zio/config/yaml/generators/Printer.scala
similarity index 100%
rename from xml/shared/src/test/scala/zio/config/yaml/generators/Printer.scala
rename to xml/src/test/scala/zio/config/yaml/generators/Printer.scala
diff --git a/xml/shared/src/test/scala/zio/config/yaml/generators/Space.scala b/xml/src/test/scala/zio/config/yaml/generators/Space.scala
similarity index 100%
rename from xml/shared/src/test/scala/zio/config/yaml/generators/Space.scala
rename to xml/src/test/scala/zio/config/yaml/generators/Space.scala
diff --git a/xml/shared/src/test/scala/zio/config/yaml/generators/WhiteSpacedAttributes.scala b/xml/src/test/scala/zio/config/yaml/generators/WhiteSpacedAttributes.scala
similarity index 100%
rename from xml/shared/src/test/scala/zio/config/yaml/generators/WhiteSpacedAttributes.scala
rename to xml/src/test/scala/zio/config/yaml/generators/WhiteSpacedAttributes.scala
diff --git a/xml/shared/src/test/scala/zio/config/yaml/generators/WhiteSpacedBracket.scala b/xml/src/test/scala/zio/config/yaml/generators/WhiteSpacedBracket.scala
similarity index 100%
rename from xml/shared/src/test/scala/zio/config/yaml/generators/WhiteSpacedBracket.scala
rename to xml/src/test/scala/zio/config/yaml/generators/WhiteSpacedBracket.scala
diff --git a/xml/shared/src/test/scala/zio/config/yaml/generators/WhiteSpacedClosingTag.scala b/xml/src/test/scala/zio/config/yaml/generators/WhiteSpacedClosingTag.scala
similarity index 100%
rename from xml/shared/src/test/scala/zio/config/yaml/generators/WhiteSpacedClosingTag.scala
rename to xml/src/test/scala/zio/config/yaml/generators/WhiteSpacedClosingTag.scala
diff --git a/xml/shared/src/test/scala/zio/config/yaml/generators/WhiteSpacedOpenTag.scala b/xml/src/test/scala/zio/config/yaml/generators/WhiteSpacedOpenTag.scala
similarity index 100%
rename from xml/shared/src/test/scala/zio/config/yaml/generators/WhiteSpacedOpenTag.scala
rename to xml/src/test/scala/zio/config/yaml/generators/WhiteSpacedOpenTag.scala
diff --git a/xml/shared/src/test/scala/zio/config/yaml/generators/WhiteSpacedText.scala b/xml/src/test/scala/zio/config/yaml/generators/WhiteSpacedText.scala
similarity index 100%
rename from xml/shared/src/test/scala/zio/config/yaml/generators/WhiteSpacedText.scala
rename to xml/src/test/scala/zio/config/yaml/generators/WhiteSpacedText.scala
diff --git a/xml/shared/src/test/scala/zio/config/yaml/generators/WhiteSpacedXml.scala b/xml/src/test/scala/zio/config/yaml/generators/WhiteSpacedXml.scala
similarity index 100%
rename from xml/shared/src/test/scala/zio/config/yaml/generators/WhiteSpacedXml.scala
rename to xml/src/test/scala/zio/config/yaml/generators/WhiteSpacedXml.scala
diff --git a/yaml/shared/src/main/scala/zio/config/yaml/EnvConfigImpl.scala b/yaml/src/main/scala/zio/config/yaml/EnvConfigImpl.scala
similarity index 100%
rename from yaml/shared/src/main/scala/zio/config/yaml/EnvConfigImpl.scala
rename to yaml/src/main/scala/zio/config/yaml/EnvConfigImpl.scala
diff --git a/yaml/shared/src/main/scala/zio/config/yaml/YamlConfigProvider.scala b/yaml/src/main/scala/zio/config/yaml/YamlConfigProvider.scala
similarity index 100%
rename from yaml/shared/src/main/scala/zio/config/yaml/YamlConfigProvider.scala
rename to yaml/src/main/scala/zio/config/yaml/YamlConfigProvider.scala
diff --git a/yaml/shared/src/main/scala/zio/config/yaml/package.scala b/yaml/src/main/scala/zio/config/yaml/package.scala
similarity index 100%
rename from yaml/shared/src/main/scala/zio/config/yaml/package.scala
rename to yaml/src/main/scala/zio/config/yaml/package.scala
diff --git a/yaml/shared/src/test/scala/zio/config/yaml/YamlConfigSpec.scala b/yaml/src/test/scala/zio/config/yaml/YamlConfigSpec.scala
similarity index 92%
rename from yaml/shared/src/test/scala/zio/config/yaml/YamlConfigSpec.scala
rename to yaml/src/test/scala/zio/config/yaml/YamlConfigSpec.scala
index fb2ddfaaa..b32cf92c1 100644
--- a/yaml/shared/src/test/scala/zio/config/yaml/YamlConfigSpec.scala
+++ b/yaml/src/test/scala/zio/config/yaml/YamlConfigSpec.scala
@@ -61,8 +61,8 @@ object YamlConfigSpec extends ZIOSpecDefault {
       val configDataBaseConfig: Config[DataBaseConfig] = Config.string("url").to[DataBaseConfig]
 
       val yamlConfig: String = s"""url: "some_url""""
-      val result  = read(configDataBaseConfig from ConfigProvider.fromYamlStringZIO(yamlConfig))
-      val expected = DataBaseConfig("some_url")
+      val result             = read(configDataBaseConfig from ConfigProvider.fromYamlStringZIO(yamlConfig))
+      val expected           = DataBaseConfig("some_url")
       assertZIO(result)(equalTo(expected))
     }
   )
diff --git a/zio-aws/shared/src/main/scala/zio/config/aws/parameterstore/ParameterStoreConfigProvider.scala b/zio-aws/src/main/scala/zio/config/aws/parameterstore/ParameterStoreConfigProvider.scala
similarity index 100%
rename from zio-aws/shared/src/main/scala/zio/config/aws/parameterstore/ParameterStoreConfigProvider.scala
rename to zio-aws/src/main/scala/zio/config/aws/parameterstore/ParameterStoreConfigProvider.scala
diff --git a/zio-aws/shared/src/main/scala/zio/config/aws/parameterstore/package.scala b/zio-aws/src/main/scala/zio/config/aws/parameterstore/package.scala
similarity index 100%
rename from zio-aws/shared/src/main/scala/zio/config/aws/parameterstore/package.scala
rename to zio-aws/src/main/scala/zio/config/aws/parameterstore/package.scala