diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6db45b2ab..947998527 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,8 +1,8 @@
 name: CI
 
 env:
-  JDK_JAVA_OPTIONS: -XX:+PrintCommandLineFlags -XX:+UseG1GC -Xmx4g -Xms4g
-  JVM_OPTS: -XX:+PrintCommandLineFlags -XX:+UseG1GC -Xmx4g -Xms4g
+  JDK_JAVA_OPTIONS: -XX:+PrintCommandLineFlags -XX:+UseG1GC -Xmx4g -Xss4M
+  JVM_OPTS: -XX:+PrintCommandLineFlags -XX:+UseG1GC -Xmx4g -Xss4M
   
 on:
   pull_request:
@@ -19,34 +19,45 @@ jobs:
       fail-fast: false
     steps:
       - name: Checkout current branch
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3.3.0
+      - name: Setup Java
+        uses: actions/setup-java@v3.10.0
         with:
-          fetch-depth: 0
-      - name: Setup Scala and Java
-        uses: olafurpg/setup-scala@v10
-      - name: Cache scala dependencies
-        uses: coursier/cache-action@v5
+          distribution: temurin
+          java-version: 17
+          cache: 'sbt'
       - name: Lint code
         run: sbt check
 
+  publishLocal:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout current branch
+        uses: actions/checkout@v3.3.0
+      - name: Setup Java
+        uses: actions/setup-java@v3.10.0
+        with:
+          distribution: temurin
+          java-version: 8 # ensure it works on 8 because we publish for 8
+          cache: 'sbt'
+      - name: Check that building packages works
+        run: ./sbt +publishLocal
+
   test:
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
-        java: ['adopt@1.8', 'adopt@1.11']
-        scala: ['2.12.17', '2.13.10']
+        scala: ['2.12.*', '2.13.*']
     steps:
       - name: Checkout current branch
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3.3.0
+      - name: Setup Java
+        uses: actions/setup-java@v3.10.0
         with:
-          fetch-depth: 0
-      - name: Setup Scala and Java
-        uses: olafurpg/setup-scala@v10
-        with:
-          java-version: ${{ matrix.java }}
-      - name: Cache scala dependencies
-        uses: coursier/cache-action@v5
+          distribution: temurin
+          java-version: 17
+          cache: 'sbt'
       - name: Run tests
         run: sbt ++${{ matrix.scala }} test
 
@@ -55,27 +66,36 @@ jobs:
     timeout-minutes: 60
     steps:
       - name: Checkout current branch
-        uses: actions/checkout@v3.1.0
-      - name: Setup Scala and Java
-        uses: olafurpg/setup-scala@v13
-      - name: Cache scala dependencies
-        uses: coursier/cache-action@v6
+        uses: actions/checkout@v3.3.0
+      - name: Setup Java
+        uses: actions/setup-java@v3.10.0
+        with:
+          distribution: temurin
+          java-version: 17
+          cache: 'sbt'
       - name: Check Document Generation
         run: sbt docs/compileDocs
 
+  ci:
+    runs-on: ubuntu-20.04
+    needs: [ lint, publishLocal, test, website ]
+    steps:
+      - name: Aggregate of lint, and all tests
+        run: echo "ci passed"
+
   publish:
     runs-on: ubuntu-20.04
-    needs: [lint, test, website]
+    needs: [ ci ]
     if: github.event_name != 'pull_request'
     steps:
       - name: Checkout current branch
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3.3.0
+      - name: Setup Java
+        uses: actions/setup-java@v3.10.0
         with:
-          fetch-depth: 0
-      - name: Setup Scala and Java 
-        uses: olafurpg/setup-scala@v10
-      - name: Cache scala dependencies
-        uses: coursier/cache-action@v5
+          distribution: temurin
+          java-version: 8 # ensure it works on 8 because we publish for 8
+          cache: 'sbt'
       - name: Release artifacts
         run: sbt ci-release
         env:
diff --git a/README.md b/README.md
index 4704b7654..af4e86b85 100644
--- a/README.md
+++ b/README.md
@@ -224,7 +224,9 @@ Learn more on the [ZIO SQL homepage](https://zio.dev/zio-sql/)!
 
 ## Contributing
 
-For the general guidelines, see ZIO [contributor's guide](https://zio.dev/about/contributing).### TL;DR
+For the general guidelines, see ZIO [contributor's guide](https://zio.dev/about/contributing).
+
+### TL;DR
 Prerequisites (installed):
 
 | Technology | Version |  
diff --git a/build.sbt b/build.sbt
index 181702c5b..c988bc372 100644
--- a/build.sbt
+++ b/build.sbt
@@ -4,27 +4,25 @@ import sbtcrossproject.CrossPlugin.autoImport.crossProject
 
 inThisBuild(
   List(
-    organization  := "dev.zio",
-    homepage      := Some(url("https://zio.dev/zio-sql/")),
-    licenses      := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
-    developers    := List(
+    organization := "dev.zio",
+    homepage     := Some(url("https://zio.dev/zio-sql/")),
+    licenses     := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
+    developers   := List(
       Developer("jdegoes", "John De Goes", "john@degoes.net", url("http://degoes.net"))
-    ),
-    pgpPassphrase := sys.env.get("PGP_PASSWORD").map(_.toArray),
-    pgpPublicRing := file("/tmp/public.asc"),
-    pgpSecretRing := file("/tmp/secret.asc"),
-    scmInfo       := Some(
-      ScmInfo(url("https://github.com/zio/zio-sql/"), "scm:git:git@github.com:zio/zio-sql.git")
     )
   )
 )
 
 addCommandAlias("fmtOnce", "all scalafmtSbt scalafmt test:scalafmt")
 addCommandAlias("fmt", "fmtOnce;fmtOnce")
-addCommandAlias("check", "all scalafmtSbtCheck scalafmtCheck test:scalafmtCheck")
+addCommandAlias("fix", "all scalafmtSbt scalafmtAll")
+addCommandAlias(
+  "check",
+  "; scalafmtSbtCheck; scalafmtCheckAll; Test/compile"
+)
 
-val zioVersion                 = "2.0.6"
-val zioSchemaVersion           = "0.4.2"
+val zioVersion                 = "2.0.9"
+val zioSchemaVersion           = "0.4.8"
 val testcontainersVersion      = "1.17.6"
 val testcontainersScalaVersion = "0.40.11"
 val logbackVersion             = "1.2.11"
@@ -36,8 +34,8 @@ lazy val root = project
     unusedCompileDependenciesFilter -= moduleFilter("org.scala-js", "scalajs-library")
   )
   .aggregate(
-    coreJVM,
-    coreJS,
+    core.js,
+    core.jvm,
     driver,
     examples,
     jdbc,
@@ -46,48 +44,50 @@ lazy val root = project
     postgres,
     sqlserver,
     jdbc_hikaricp,
-    macros,
+    macros.js,
+    macros.jvm,
     docs
   )
 
 lazy val core = crossProject(JSPlatform, JVMPlatform)
   .in(file("core"))
+  .dependsOn(macros)
   .settings(stdSettings("zio-sql"))
   .settings(crossProjectSettings)
   .settings(buildInfoSettings("zio.sql"))
   .settings(
     libraryDependencies ++= Seq(
-      "dev.zio" %% "zio"                   % zioVersion,
-      "dev.zio" %% "zio-streams"           % zioVersion,
-      "dev.zio" %% "zio-schema"            % zioSchemaVersion,
-      "dev.zio" %% "zio-schema-derivation" % zioSchemaVersion,
-      "dev.zio" %% "zio-test"              % zioVersion % Test,
-      "dev.zio" %% "zio-test-sbt"          % zioVersion % Test
-    ),
-    dependencyOverrides += "dev.zio" %% "zio" % zioVersion,
-    resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+      "dev.zio" %%% "zio-streams"           % zioVersion,
+      "dev.zio" %%% "zio-schema"            % zioSchemaVersion,
+      "dev.zio" %%% "zio-schema-derivation" % zioSchemaVersion,
+      "dev.zio" %%% "zio-test"              % zioVersion % Test,
+      "dev.zio" %%% "zio-test-sbt"          % zioVersion % Test
+    )
   )
   .settings(testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"))
+  .jsSettings(
+    scalaJSUseMainModuleInitializer := true
+  )
+  .enablePlugins(BuildInfoPlugin)
 
-lazy val coreJS = core.js
-  .settings(scalaJSUseMainModuleInitializer := true)
-
-lazy val coreJVM = core.jvm.dependsOn(macros)
-
-lazy val macros = project
+lazy val macros = crossProject(JSPlatform, JVMPlatform)
   .in(file("macros"))
   .settings(stdSettings("zio-sql-macros"))
+  .settings(buildInfoSettings("zio.sql.macros"))
   .settings(
+    libraryDependencies ++= Seq(
+      "dev.zio" %%% "zio" % zioVersion
+    ),
     libraryDependencies ++= {
       if (scalaVersion.value == ScalaDotty) {
         Seq()
       } else
         Seq(
-          "org.scala-lang" % "scala-reflect" % scalaVersion.value,
-          "dev.zio"       %% "zio"           % zioVersion
+          "org.scala-lang" % "scala-reflect" % scalaVersion.value
         )
     }
   )
+  .enablePlugins(BuildInfoPlugin)
 
 lazy val docs = project
   .in(file("zio-sql-docs"))
@@ -97,12 +97,14 @@ lazy val docs = project
     scalacOptions -= "-Xfatal-warnings",
     crossScalaVersions                         := Seq(Scala213, Scala212, ScalaDotty),
     projectName                                := "ZIO SQL",
-    mainModuleName                             := (coreJVM / moduleName).value,
+    mainModuleName                             := (core.jvm / moduleName).value,
     projectStage                               := ProjectStage.ProductionReady,
     ScalaUnidoc / unidoc / unidocProjectFilter := inProjects(),
     docsPublishBranch                          := "master",
     readmeContribution                         := readmeContribution.value +
-      """|### TL;DR
+      """|
+         |
+         |### TL;DR
          |Prerequisites (installed):
          |
          || Technology | Version |  
@@ -140,11 +142,10 @@ lazy val driver = project
       "dev.zio" %% "zio-schema-derivation" % zioSchemaVersion,
       "dev.zio" %% "zio-test"              % zioVersion % Test,
       "dev.zio" %% "zio-test-sbt"          % zioVersion % Test
-    ),
-    dependencyOverrides += "dev.zio" %% "zio" % zioVersion,
-    resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+    )
   )
   .settings(testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"))
+  .enablePlugins(BuildInfoPlugin)
 
 lazy val jdbc = project
   .in(file("jdbc"))
@@ -167,11 +168,12 @@ lazy val jdbc = project
   )
   .settings(testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"))
   .dependsOn(core.jvm)
+  .enablePlugins(BuildInfoPlugin)
 
 lazy val jdbc_hikaricp = project
   .in(file("jdbc-hikaricp"))
   .settings(stdSettings("zio-sql-jdbc-hickaricp"))
-  .settings(buildInfoSettings("zio.sql.jdbc-hickaricp"))
+  .settings(buildInfoSettings("zio.sql.jdbc.hickaricp"))
   .settings(
     libraryDependencies ++= Seq(
       "com.zaxxer"         % "HikariCP"                   % "4.0.3", // 5.x doesn't support Java 1.8
@@ -184,6 +186,7 @@ lazy val jdbc_hikaricp = project
   )
   .settings(testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"))
   .dependsOn(jdbc)
+  .enablePlugins(BuildInfoPlugin)
 
 lazy val mysql = project
   .in(file("mysql"))
@@ -203,6 +206,7 @@ lazy val mysql = project
     )
   )
   .settings(testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"))
+  .enablePlugins(BuildInfoPlugin)
 
 lazy val oracle = project
   .in(file("oracle"))
@@ -222,6 +226,7 @@ lazy val oracle = project
     )
   )
   .settings(testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"))
+  .enablePlugins(BuildInfoPlugin)
 
 lazy val postgres = project
   .in(file("postgres"))
@@ -241,6 +246,7 @@ lazy val postgres = project
     )
   )
   .settings(testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"))
+  .enablePlugins(BuildInfoPlugin)
 
 lazy val sqlserver = project
   .in(file("sqlserver"))
@@ -260,3 +266,4 @@ lazy val sqlserver = project
     )
   )
   .settings(testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"))
+  .enablePlugins(BuildInfoPlugin)
diff --git a/core/jvm/src/main/scala/zio/sql/Sql.scala b/core/shared/src/main/scala/zio/sql/Sql.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/Sql.scala
rename to core/shared/src/main/scala/zio/sql/Sql.scala
diff --git a/core/jvm/src/main/scala/zio/sql/delete/Delete.scala b/core/shared/src/main/scala/zio/sql/delete/Delete.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/delete/Delete.scala
rename to core/shared/src/main/scala/zio/sql/delete/Delete.scala
diff --git a/core/jvm/src/main/scala/zio/sql/expr/AggregationDef.scala b/core/shared/src/main/scala/zio/sql/expr/AggregationDef.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/expr/AggregationDef.scala
rename to core/shared/src/main/scala/zio/sql/expr/AggregationDef.scala
diff --git a/core/jvm/src/main/scala/zio/sql/expr/ComparableTypes.scala b/core/shared/src/main/scala/zio/sql/expr/ComparableTypes.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/expr/ComparableTypes.scala
rename to core/shared/src/main/scala/zio/sql/expr/ComparableTypes.scala
diff --git a/core/jvm/src/main/scala/zio/sql/expr/Expr.scala b/core/shared/src/main/scala/zio/sql/expr/Expr.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/expr/Expr.scala
rename to core/shared/src/main/scala/zio/sql/expr/Expr.scala
diff --git a/core/jvm/src/main/scala/zio/sql/expr/FunctionDef.scala b/core/shared/src/main/scala/zio/sql/expr/FunctionDef.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/expr/FunctionDef.scala
rename to core/shared/src/main/scala/zio/sql/expr/FunctionDef.scala
diff --git a/core/jvm/src/main/scala/zio/sql/expr/FunctionName.scala b/core/shared/src/main/scala/zio/sql/expr/FunctionName.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/expr/FunctionName.scala
rename to core/shared/src/main/scala/zio/sql/expr/FunctionName.scala
diff --git a/core/jvm/src/main/scala/zio/sql/expr/Set.scala b/core/shared/src/main/scala/zio/sql/expr/Set.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/expr/Set.scala
rename to core/shared/src/main/scala/zio/sql/expr/Set.scala
diff --git a/core/jvm/src/main/scala/zio/sql/insert/Insert.scala b/core/shared/src/main/scala/zio/sql/insert/Insert.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/insert/Insert.scala
rename to core/shared/src/main/scala/zio/sql/insert/Insert.scala
diff --git a/core/jvm/src/main/scala/zio/sql/insert/InsertBuilder.scala b/core/shared/src/main/scala/zio/sql/insert/InsertBuilder.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/insert/InsertBuilder.scala
rename to core/shared/src/main/scala/zio/sql/insert/InsertBuilder.scala
diff --git a/core/jvm/src/main/scala/zio/sql/insert/InsertByCommaBuilder.scala b/core/shared/src/main/scala/zio/sql/insert/InsertByCommaBuilder.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/insert/InsertByCommaBuilder.scala
rename to core/shared/src/main/scala/zio/sql/insert/InsertByCommaBuilder.scala
diff --git a/core/jvm/src/main/scala/zio/sql/ops/Operator.scala b/core/shared/src/main/scala/zio/sql/ops/Operator.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/ops/Operator.scala
rename to core/shared/src/main/scala/zio/sql/ops/Operator.scala
diff --git a/core/jvm/src/main/scala/zio/sql/package.scala b/core/shared/src/main/scala/zio/sql/package.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/package.scala
rename to core/shared/src/main/scala/zio/sql/package.scala
diff --git a/core/jvm/src/main/scala/zio/sql/select/ColumnSelection.scala b/core/shared/src/main/scala/zio/sql/select/ColumnSelection.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/select/ColumnSelection.scala
rename to core/shared/src/main/scala/zio/sql/select/ColumnSelection.scala
diff --git a/core/jvm/src/main/scala/zio/sql/select/DecodingError.scala b/core/shared/src/main/scala/zio/sql/select/DecodingError.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/select/DecodingError.scala
rename to core/shared/src/main/scala/zio/sql/select/DecodingError.scala
diff --git a/core/jvm/src/main/scala/zio/sql/select/Ordering.scala b/core/shared/src/main/scala/zio/sql/select/Ordering.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/select/Ordering.scala
rename to core/shared/src/main/scala/zio/sql/select/Ordering.scala
diff --git a/core/jvm/src/main/scala/zio/sql/select/Read.scala b/core/shared/src/main/scala/zio/sql/select/Read.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/select/Read.scala
rename to core/shared/src/main/scala/zio/sql/select/Read.scala
diff --git a/core/jvm/src/main/scala/zio/sql/select/SelectAll.scala b/core/shared/src/main/scala/zio/sql/select/SelectAll.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/select/SelectAll.scala
rename to core/shared/src/main/scala/zio/sql/select/SelectAll.scala
diff --git a/core/jvm/src/main/scala/zio/sql/select/SelectAllHelper.scala b/core/shared/src/main/scala/zio/sql/select/SelectAllHelper.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/select/SelectAllHelper.scala
rename to core/shared/src/main/scala/zio/sql/select/SelectAllHelper.scala
diff --git a/core/jvm/src/main/scala/zio/sql/select/SelectBuilder.scala b/core/shared/src/main/scala/zio/sql/select/SelectBuilder.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/select/SelectBuilder.scala
rename to core/shared/src/main/scala/zio/sql/select/SelectBuilder.scala
diff --git a/core/jvm/src/main/scala/zio/sql/select/SelectByCommaBuilder.scala b/core/shared/src/main/scala/zio/sql/select/SelectByCommaBuilder.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/select/SelectByCommaBuilder.scala
rename to core/shared/src/main/scala/zio/sql/select/SelectByCommaBuilder.scala
diff --git a/core/jvm/src/main/scala/zio/sql/select/Selection.scala b/core/shared/src/main/scala/zio/sql/select/Selection.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/select/Selection.scala
rename to core/shared/src/main/scala/zio/sql/select/Selection.scala
diff --git a/core/jvm/src/main/scala/zio/sql/select/SelectionSet.scala b/core/shared/src/main/scala/zio/sql/select/SelectionSet.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/select/SelectionSet.scala
rename to core/shared/src/main/scala/zio/sql/select/SelectionSet.scala
diff --git a/core/jvm/src/main/scala/zio/sql/select/SubselectBuilder.scala b/core/shared/src/main/scala/zio/sql/select/SubselectBuilder.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/select/SubselectBuilder.scala
rename to core/shared/src/main/scala/zio/sql/select/SubselectBuilder.scala
diff --git a/core/jvm/src/main/scala/zio/sql/table/Column.scala b/core/shared/src/main/scala/zio/sql/table/Column.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/table/Column.scala
rename to core/shared/src/main/scala/zio/sql/table/Column.scala
diff --git a/core/jvm/src/main/scala/zio/sql/table/ExprAccesorBuilder.scala b/core/shared/src/main/scala/zio/sql/table/ExprAccesorBuilder.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/table/ExprAccesorBuilder.scala
rename to core/shared/src/main/scala/zio/sql/table/ExprAccesorBuilder.scala
diff --git a/core/jvm/src/main/scala/zio/sql/table/JoinType.scala b/core/shared/src/main/scala/zio/sql/table/JoinType.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/table/JoinType.scala
rename to core/shared/src/main/scala/zio/sql/table/JoinType.scala
diff --git a/core/jvm/src/main/scala/zio/sql/table/Table.scala b/core/shared/src/main/scala/zio/sql/table/Table.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/table/Table.scala
rename to core/shared/src/main/scala/zio/sql/table/Table.scala
diff --git a/core/jvm/src/main/scala/zio/sql/table/TableNameAnnotation.scala b/core/shared/src/main/scala/zio/sql/table/TableNameAnnotation.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/table/TableNameAnnotation.scala
rename to core/shared/src/main/scala/zio/sql/table/TableNameAnnotation.scala
diff --git a/core/jvm/src/main/scala/zio/sql/typetag/Decodable.scala b/core/shared/src/main/scala/zio/sql/typetag/Decodable.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/typetag/Decodable.scala
rename to core/shared/src/main/scala/zio/sql/typetag/Decodable.scala
diff --git a/core/jvm/src/main/scala/zio/sql/typetag/IsDate.scala b/core/shared/src/main/scala/zio/sql/typetag/IsDate.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/typetag/IsDate.scala
rename to core/shared/src/main/scala/zio/sql/typetag/IsDate.scala
diff --git a/core/jvm/src/main/scala/zio/sql/typetag/IsIntegral.scala b/core/shared/src/main/scala/zio/sql/typetag/IsIntegral.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/typetag/IsIntegral.scala
rename to core/shared/src/main/scala/zio/sql/typetag/IsIntegral.scala
diff --git a/core/jvm/src/main/scala/zio/sql/typetag/IsNumeric.scala b/core/shared/src/main/scala/zio/sql/typetag/IsNumeric.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/typetag/IsNumeric.scala
rename to core/shared/src/main/scala/zio/sql/typetag/IsNumeric.scala
diff --git a/core/jvm/src/main/scala/zio/sql/typetag/TypeTag.scala b/core/shared/src/main/scala/zio/sql/typetag/TypeTag.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/typetag/TypeTag.scala
rename to core/shared/src/main/scala/zio/sql/typetag/TypeTag.scala
diff --git a/core/jvm/src/main/scala/zio/sql/update/Update.scala b/core/shared/src/main/scala/zio/sql/update/Update.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/update/Update.scala
rename to core/shared/src/main/scala/zio/sql/update/Update.scala
diff --git a/core/jvm/src/main/scala/zio/sql/update/UpdateBuilder.scala b/core/shared/src/main/scala/zio/sql/update/UpdateBuilder.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/update/UpdateBuilder.scala
rename to core/shared/src/main/scala/zio/sql/update/UpdateBuilder.scala
diff --git a/core/jvm/src/main/scala/zio/sql/utils/Pluralize.scala b/core/shared/src/main/scala/zio/sql/utils/Pluralize.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/utils/Pluralize.scala
rename to core/shared/src/main/scala/zio/sql/utils/Pluralize.scala
diff --git a/core/jvm/src/main/scala/zio/sql/utils/TrailingUnitNormalizer.scala b/core/shared/src/main/scala/zio/sql/utils/TrailingUnitNormalizer.scala
similarity index 100%
rename from core/jvm/src/main/scala/zio/sql/utils/TrailingUnitNormalizer.scala
rename to core/shared/src/main/scala/zio/sql/utils/TrailingUnitNormalizer.scala
diff --git a/core/shared/src/test/scala/zio-sql/HelloWorldSpec.scala b/core/shared/src/test/scala/zio/sql/HelloWorldSpec.scala
similarity index 100%
rename from core/shared/src/test/scala/zio-sql/HelloWorldSpec.scala
rename to core/shared/src/test/scala/zio/sql/HelloWorldSpec.scala
diff --git a/macros/src/main/scala-2/zio/sql/macros/Normalizer.scala b/macros/shared/src/main/scala-2/zio/sql/macros/Normalizer.scala
similarity index 100%
rename from macros/src/main/scala-2/zio/sql/macros/Normalizer.scala
rename to macros/shared/src/main/scala-2/zio/sql/macros/Normalizer.scala
diff --git a/macros/src/main/scala-2/zio/sql/macros/groupbylike.scala b/macros/shared/src/main/scala-2/zio/sql/macros/groupbylike.scala
similarity index 100%
rename from macros/src/main/scala-2/zio/sql/macros/groupbylike.scala
rename to macros/shared/src/main/scala-2/zio/sql/macros/groupbylike.scala
diff --git a/macros/src/main/scala-2/zio/sql/macros/havinglike.scala b/macros/shared/src/main/scala-2/zio/sql/macros/havinglike.scala
similarity index 100%
rename from macros/src/main/scala-2/zio/sql/macros/havinglike.scala
rename to macros/shared/src/main/scala-2/zio/sql/macros/havinglike.scala
diff --git a/macros/src/main/scala-2/zio/sql/macros/insertlike.scala b/macros/shared/src/main/scala-2/zio/sql/macros/insertlike.scala
similarity index 100%
rename from macros/src/main/scala-2/zio/sql/macros/insertlike.scala
rename to macros/shared/src/main/scala-2/zio/sql/macros/insertlike.scala
diff --git a/macros/src/main/scala-2/zio/sql/macros/notliteral.scala b/macros/shared/src/main/scala-2/zio/sql/macros/notliteral.scala
similarity index 100%
rename from macros/src/main/scala-2/zio/sql/macros/notliteral.scala
rename to macros/shared/src/main/scala-2/zio/sql/macros/notliteral.scala
diff --git a/macros/src/main/scala-2/zio/sql/macros/tablelike.scala b/macros/shared/src/main/scala-2/zio/sql/macros/tablelike.scala
similarity index 100%
rename from macros/src/main/scala-2/zio/sql/macros/tablelike.scala
rename to macros/shared/src/main/scala-2/zio/sql/macros/tablelike.scala
diff --git a/macros/src/main/scala-2/zio/sql/macros/wherelike.scala b/macros/shared/src/main/scala-2/zio/sql/macros/wherelike.scala
similarity index 100%
rename from macros/src/main/scala-2/zio/sql/macros/wherelike.scala
rename to macros/shared/src/main/scala-2/zio/sql/macros/wherelike.scala
diff --git a/macros/src/main/scala-3/zio/sql/macros/groupbylike.scala b/macros/shared/src/main/scala-3/zio/sql/macros/groupbylike.scala
similarity index 100%
rename from macros/src/main/scala-3/zio/sql/macros/groupbylike.scala
rename to macros/shared/src/main/scala-3/zio/sql/macros/groupbylike.scala
diff --git a/macros/src/main/scala-3/zio/sql/macros/havinglike.scala b/macros/shared/src/main/scala-3/zio/sql/macros/havinglike.scala
similarity index 100%
rename from macros/src/main/scala-3/zio/sql/macros/havinglike.scala
rename to macros/shared/src/main/scala-3/zio/sql/macros/havinglike.scala
diff --git a/macros/src/main/scala-3/zio/sql/macros/insertlike.scala b/macros/shared/src/main/scala-3/zio/sql/macros/insertlike.scala
similarity index 100%
rename from macros/src/main/scala-3/zio/sql/macros/insertlike.scala
rename to macros/shared/src/main/scala-3/zio/sql/macros/insertlike.scala
diff --git a/macros/src/main/scala-3/zio/sql/macros/normalizer.scala b/macros/shared/src/main/scala-3/zio/sql/macros/normalizer.scala
similarity index 100%
rename from macros/src/main/scala-3/zio/sql/macros/normalizer.scala
rename to macros/shared/src/main/scala-3/zio/sql/macros/normalizer.scala
diff --git a/macros/src/main/scala-3/zio/sql/macros/notliteral.scala b/macros/shared/src/main/scala-3/zio/sql/macros/notliteral.scala
similarity index 100%
rename from macros/src/main/scala-3/zio/sql/macros/notliteral.scala
rename to macros/shared/src/main/scala-3/zio/sql/macros/notliteral.scala
diff --git a/macros/src/main/scala-3/zio/sql/macros/tablelike.scala b/macros/shared/src/main/scala-3/zio/sql/macros/tablelike.scala
similarity index 100%
rename from macros/src/main/scala-3/zio/sql/macros/tablelike.scala
rename to macros/shared/src/main/scala-3/zio/sql/macros/tablelike.scala
diff --git a/macros/src/main/scala-3/zio/sql/macros/wherelike.scala b/macros/shared/src/main/scala-3/zio/sql/macros/wherelike.scala
similarity index 100%
rename from macros/src/main/scala-3/zio/sql/macros/wherelike.scala
rename to macros/shared/src/main/scala-3/zio/sql/macros/wherelike.scala
diff --git a/macros/src/main/scala/zio/sql/Features.scala b/macros/shared/src/main/scala/zio/sql/Features.scala
similarity index 100%
rename from macros/src/main/scala/zio/sql/Features.scala
rename to macros/shared/src/main/scala/zio/sql/Features.scala
diff --git a/project/plugins.sbt b/project/plugins.sbt
index c81f8d2b7..5b36cc236 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -7,6 +7,6 @@ addSbtPlugin("org.scoverage"             % "sbt-scoverage"             % "2.0.6"
 addSbtPlugin("ch.epfl.scala"             % "sbt-bloop"                 % "1.5.3")
 addSbtPlugin("com.github.sbt"            % "sbt-ci-release"            % "1.5.9")
 addSbtPlugin("com.github.cb372"          % "sbt-explicit-dependencies" % "0.2.16")
-addSbtPlugin("ch.epfl.scala"             % "sbt-scalafix"              % "0.10.1")
+addSbtPlugin("ch.epfl.scala"             % "sbt-scalafix"              % "0.10.4")
 addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat"              % "0.4.2")
 addSbtPlugin("dev.zio"                   % "zio-sbt-website"           % "0.3.10")