From cf91bfbc8670383d2f9e8292e04faaaebe57cac4 Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Sat, 1 Jun 2024 09:52:29 -0400
Subject: [PATCH 1/2] update readme

---
 README.md | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 28b8402..0ab7437 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
 A friendly newtype library for Scala 3.
 
 ```scala
-"io.github.kitlangton" %% "neotype" % "0.2.19"
+"io.github.kitlangton" %% "neotype" % "0.3.0"
 ```
 
 ## Features
@@ -62,19 +62,23 @@ Error: /src/main/scala/examples/Main.scala:9:16
 
 ## Integrations
 
-Neotype integrates with the following libraries.
-
-- zio-test `DeriveGen`
-- zio-json
-- zio-config
-- zio-schema
-- play-json
-- tapir
-- quill
-- circe
-- jsoniter
-- chimney
-- caliban
+Neotype integrates with the following libraries:
+
+- **JSON**
+  - [zio-json](https://github.com/zio/zio-json)
+  - [play-json](https://github.com/playframework/play-json)
+  - [jsoniter](https://github.com/plokhotnyuk/jsoniter-scala)
+  - [circe](https://github.com/circe/circe)
+- **DATABASE**
+  - [doobie](https://github.com/tpolecat/doobie)
+  - [quill](https://github.com/zio/zio-quill)
+- **MISCELLANEOUS**
+  - [zio-test](https://github.com/zio/zio) `DeriveGen`
+  - [zio-config](https://github.com/zio/zio-config)
+  - [zio-schema](https://github.com/zio/zio-schema)
+  - [tapir](https://github.com/softwaremill/tapir)
+  - [chimney](https://github.com/outr/chimney)
+  - [caliban](https://github.com/ghostdogpr/caliban)
 
 ### ZIO Json Example
 

From 385259343b0d6efaf2f09e7279f1c6ccb2d96796 Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Sat, 1 Jun 2024 10:00:10 -0400
Subject: [PATCH 2/2] new module structure

---
 .../src/main/scala/neotype/{ => interop}/caliban/Main.scala | 2 +-
 .../scala/neotype/{ => interop}/caliban/CalibanSpec.scala   | 2 +-
 .../src/main/scala/neotype/{ => interop}/chimney/Main.scala | 2 +-
 .../scala/neotype/{ => interop}/chimney/ChimneySpec.scala   | 2 +-
 .../src/main/scala/neotype/{ => interop}/circe/Main.scala   | 2 +-
 .../scala/neotype/{ => interop}/circe/CirceJsonSpec.scala   | 3 ++-
 .../src/main/scala/neotype/{ => interop}/doobie/Main.scala  | 3 +--
 .../neotype/{ => interop}/doobie/DoobieInstancesSpec.scala  | 6 +++++-
 .../main/scala/neotype/{ => interop}/jsoniter/Main.scala    | 2 +-
 .../scala/neotype/{ => interop}/jsoniter/JsoniterSpec.scala | 3 +--
 .../main/scala/neotype/{ => interop}/playjson/Main.scala    | 2 +-
 .../scala/neotype/{ => interop}/playjson/PlayJsonSpec.scala | 6 +++++-
 .../src/main/scala/neotype/{ => interop}/tapir/Main.scala   | 2 +-
 .../test/scala/neotype/{ => interop}/tapir/TapirSpec.scala  | 5 ++++-
 .../main/scala/neotype/{ => interop}/zioconfig/Main.scala   | 2 +-
 .../neotype/{ => interop}/zioconfig/ZioConfigSpec.scala     | 2 +-
 .../src/main/scala/neotype/{ => interop}/ziojson/Main.scala | 2 +-
 .../scala/neotype/{ => interop}/ziojson/ZioJsonSpec.scala   | 3 ++-
 .../neotype/{ => interop}/ziojson/ZioJsonSpecificSpec.scala | 2 +-
 .../scala/neotype/{zioquill => interop/quill}/Main.scala    | 2 +-
 .../{zioquill => interop/quill}/ZioQuillNewtypeSpec.scala   | 4 +---
 .../neotype/{ => interop}/zioschema/ZioSchemaSpec.scala     | 3 ++-
 .../main/scala/neotype/{ => interop}/zioschema/Main.scala   | 2 +-
 .../src/main/scala/neotype/{ => interop}/ziotest/Main.scala | 2 +-
 .../neotype/{ => interop}/ziotest/ZioNewtypeSpec.scala      | 4 +---
 25 files changed, 39 insertions(+), 31 deletions(-)
 rename modules/neotype-caliban/shared/src/main/scala/neotype/{ => interop}/caliban/Main.scala (95%)
 rename modules/neotype-caliban/shared/src/test/scala/neotype/{ => interop}/caliban/CalibanSpec.scala (98%)
 rename modules/neotype-chimney/shared/src/main/scala/neotype/{ => interop}/chimney/Main.scala (95%)
 rename modules/neotype-chimney/shared/src/test/scala/neotype/{ => interop}/chimney/ChimneySpec.scala (98%)
 rename modules/neotype-circe/shared/src/main/scala/neotype/{ => interop}/circe/Main.scala (96%)
 rename modules/neotype-circe/shared/src/test/scala/neotype/{ => interop}/circe/CirceJsonSpec.scala (96%)
 rename modules/neotype-doobie/shared/src/main/scala/neotype/{ => interop}/doobie/Main.scala (96%)
 rename modules/neotype-doobie/shared/src/test/scala/neotype/{ => interop}/doobie/DoobieInstancesSpec.scala (95%)
 rename modules/neotype-jsoniter/shared/src/main/scala/neotype/{ => interop}/jsoniter/Main.scala (98%)
 rename modules/neotype-jsoniter/shared/src/test/scala/neotype/{ => interop}/jsoniter/JsoniterSpec.scala (97%)
 rename modules/neotype-play-json/shared/src/main/scala/neotype/{ => interop}/playjson/Main.scala (98%)
 rename modules/neotype-play-json/shared/src/test/scala/neotype/{ => interop}/playjson/PlayJsonSpec.scala (85%)
 rename modules/neotype-tapir/shared/src/main/scala/neotype/{ => interop}/tapir/Main.scala (99%)
 rename modules/neotype-tapir/shared/src/test/scala/neotype/{ => interop}/tapir/TapirSpec.scala (97%)
 rename modules/neotype-zio-config/src/main/scala/neotype/{ => interop}/zioconfig/Main.scala (96%)
 rename modules/neotype-zio-config/src/test/scala/neotype/{ => interop}/zioconfig/ZioConfigSpec.scala (97%)
 rename modules/neotype-zio-json/shared/src/main/scala/neotype/{ => interop}/ziojson/Main.scala (98%)
 rename modules/neotype-zio-json/shared/src/test/scala/neotype/{ => interop}/ziojson/ZioJsonSpec.scala (86%)
 rename modules/neotype-zio-json/shared/src/test/scala/neotype/{ => interop}/ziojson/ZioJsonSpecificSpec.scala (94%)
 rename modules/neotype-zio-quill/src/main/scala/neotype/{zioquill => interop/quill}/Main.scala (96%)
 rename modules/neotype-zio-quill/src/test/scala/neotype/{zioquill => interop/quill}/ZioQuillNewtypeSpec.scala (96%)
 rename modules/neotype-zio-schema/jvm/src/test/scala/neotype/{ => interop}/zioschema/ZioSchemaSpec.scala (97%)
 rename modules/neotype-zio-schema/shared/src/main/scala/neotype/{ => interop}/zioschema/Main.scala (96%)
 rename modules/neotype-zio-test/shared/src/main/scala/neotype/{ => interop}/ziotest/Main.scala (93%)
 rename modules/neotype-zio-test/shared/src/test/scala/neotype/{ => interop}/ziotest/ZioNewtypeSpec.scala (87%)

diff --git a/modules/neotype-caliban/shared/src/main/scala/neotype/caliban/Main.scala b/modules/neotype-caliban/shared/src/main/scala/neotype/interop/caliban/Main.scala
similarity index 95%
rename from modules/neotype-caliban/shared/src/main/scala/neotype/caliban/Main.scala
rename to modules/neotype-caliban/shared/src/main/scala/neotype/interop/caliban/Main.scala
index 89208ff..2b6f687 100644
--- a/modules/neotype-caliban/shared/src/main/scala/neotype/caliban/Main.scala
+++ b/modules/neotype-caliban/shared/src/main/scala/neotype/interop/caliban/Main.scala
@@ -1,4 +1,4 @@
-package neotype.caliban
+package neotype.interop.caliban
 
 import _root_.caliban.CalibanError.ExecutionError
 import caliban.schema.*
diff --git a/modules/neotype-caliban/shared/src/test/scala/neotype/caliban/CalibanSpec.scala b/modules/neotype-caliban/shared/src/test/scala/neotype/interop/caliban/CalibanSpec.scala
similarity index 98%
rename from modules/neotype-caliban/shared/src/test/scala/neotype/caliban/CalibanSpec.scala
rename to modules/neotype-caliban/shared/src/test/scala/neotype/interop/caliban/CalibanSpec.scala
index 0a5bf7c..e654b7e 100644
--- a/modules/neotype-caliban/shared/src/test/scala/neotype/caliban/CalibanSpec.scala
+++ b/modules/neotype-caliban/shared/src/test/scala/neotype/interop/caliban/CalibanSpec.scala
@@ -1,4 +1,4 @@
-package neotype.caliban
+package neotype.interop.caliban
 
 import caliban.Value.IntValue
 import caliban.Value.StringValue
diff --git a/modules/neotype-chimney/shared/src/main/scala/neotype/chimney/Main.scala b/modules/neotype-chimney/shared/src/main/scala/neotype/interop/chimney/Main.scala
similarity index 95%
rename from modules/neotype-chimney/shared/src/main/scala/neotype/chimney/Main.scala
rename to modules/neotype-chimney/shared/src/main/scala/neotype/interop/chimney/Main.scala
index 4f14857..a5ad36c 100644
--- a/modules/neotype-chimney/shared/src/main/scala/neotype/chimney/Main.scala
+++ b/modules/neotype-chimney/shared/src/main/scala/neotype/interop/chimney/Main.scala
@@ -1,4 +1,4 @@
-package neotype.chimney
+package neotype.interop.chimney
 
 import io.scalaland.chimney.*
 import io.scalaland.chimney.partial.syntax.*
diff --git a/modules/neotype-chimney/shared/src/test/scala/neotype/chimney/ChimneySpec.scala b/modules/neotype-chimney/shared/src/test/scala/neotype/interop/chimney/ChimneySpec.scala
similarity index 98%
rename from modules/neotype-chimney/shared/src/test/scala/neotype/chimney/ChimneySpec.scala
rename to modules/neotype-chimney/shared/src/test/scala/neotype/interop/chimney/ChimneySpec.scala
index 874a53d..aca5f8f 100644
--- a/modules/neotype-chimney/shared/src/test/scala/neotype/chimney/ChimneySpec.scala
+++ b/modules/neotype-chimney/shared/src/test/scala/neotype/interop/chimney/ChimneySpec.scala
@@ -1,4 +1,4 @@
-package neotype.chimney
+package neotype.interop.chimney
 
 import io.scalaland.chimney.dsl.*
 import neotype.Newtype
diff --git a/modules/neotype-circe/shared/src/main/scala/neotype/circe/Main.scala b/modules/neotype-circe/shared/src/main/scala/neotype/interop/circe/Main.scala
similarity index 96%
rename from modules/neotype-circe/shared/src/main/scala/neotype/circe/Main.scala
rename to modules/neotype-circe/shared/src/main/scala/neotype/interop/circe/Main.scala
index 9b25067..a9fd57a 100644
--- a/modules/neotype-circe/shared/src/main/scala/neotype/circe/Main.scala
+++ b/modules/neotype-circe/shared/src/main/scala/neotype/interop/circe/Main.scala
@@ -1,4 +1,4 @@
-package neotype.circe
+package neotype.interop.circe
 
 import io.circe.*
 import neotype.*
diff --git a/modules/neotype-circe/shared/src/test/scala/neotype/circe/CirceJsonSpec.scala b/modules/neotype-circe/shared/src/test/scala/neotype/interop/circe/CirceJsonSpec.scala
similarity index 96%
rename from modules/neotype-circe/shared/src/test/scala/neotype/circe/CirceJsonSpec.scala
rename to modules/neotype-circe/shared/src/test/scala/neotype/interop/circe/CirceJsonSpec.scala
index bf7d591..c569a34 100644
--- a/modules/neotype-circe/shared/src/test/scala/neotype/circe/CirceJsonSpec.scala
+++ b/modules/neotype-circe/shared/src/test/scala/neotype/interop/circe/CirceJsonSpec.scala
@@ -1,9 +1,10 @@
-package neotype.circe
+package neotype.interop.circe
 
 import io.circe.*
 import io.circe.parser.*
 import neotype.Newtype
 import neotype.Subtype
+import neotype.interop.circe.given_Decoder_B
 import neotype.test.definitions.*
 import zio.test.*
 
diff --git a/modules/neotype-doobie/shared/src/main/scala/neotype/doobie/Main.scala b/modules/neotype-doobie/shared/src/main/scala/neotype/interop/doobie/Main.scala
similarity index 96%
rename from modules/neotype-doobie/shared/src/main/scala/neotype/doobie/Main.scala
rename to modules/neotype-doobie/shared/src/main/scala/neotype/interop/doobie/Main.scala
index 66fa358..6252686 100644
--- a/modules/neotype-doobie/shared/src/main/scala/neotype/doobie/Main.scala
+++ b/modules/neotype-doobie/shared/src/main/scala/neotype/interop/doobie/Main.scala
@@ -1,11 +1,10 @@
-package neotype.doobie
+package neotype.interop.doobie
 
 import cats.Show
 import cats.implicits.*
 import doobie.*
 import neotype.*
 
-import scala.collection.mutable.ArrayBuffer
 import scala.reflect.ClassTag
 
 /////////////
diff --git a/modules/neotype-doobie/shared/src/test/scala/neotype/doobie/DoobieInstancesSpec.scala b/modules/neotype-doobie/shared/src/test/scala/neotype/interop/doobie/DoobieInstancesSpec.scala
similarity index 95%
rename from modules/neotype-doobie/shared/src/test/scala/neotype/doobie/DoobieInstancesSpec.scala
rename to modules/neotype-doobie/shared/src/test/scala/neotype/interop/doobie/DoobieInstancesSpec.scala
index 7992510..e01d06e 100644
--- a/modules/neotype-doobie/shared/src/test/scala/neotype/doobie/DoobieInstancesSpec.scala
+++ b/modules/neotype-doobie/shared/src/test/scala/neotype/interop/doobie/DoobieInstancesSpec.scala
@@ -1,4 +1,4 @@
-package neotype.doobie
+package neotype.interop.doobie
 
 import _root_.doobie.*
 import _root_.doobie.implicits.*
@@ -9,6 +9,10 @@ import cats.effect.IO
 import cats.effect.unsafe.implicits.global
 import neotype.Newtype
 import neotype.Subtype
+import neotype.interop.doobie.newtypeArrayGet
+import neotype.interop.doobie.newtypeGet
+import neotype.interop.doobie.subtypeArrayGet
+import neotype.interop.doobie.subtypeGet
 import neotype.test.definitions.*
 import zio.*
 import zio.test.*
diff --git a/modules/neotype-jsoniter/shared/src/main/scala/neotype/jsoniter/Main.scala b/modules/neotype-jsoniter/shared/src/main/scala/neotype/interop/jsoniter/Main.scala
similarity index 98%
rename from modules/neotype-jsoniter/shared/src/main/scala/neotype/jsoniter/Main.scala
rename to modules/neotype-jsoniter/shared/src/main/scala/neotype/interop/jsoniter/Main.scala
index b13c298..6549a17 100644
--- a/modules/neotype-jsoniter/shared/src/main/scala/neotype/jsoniter/Main.scala
+++ b/modules/neotype-jsoniter/shared/src/main/scala/neotype/interop/jsoniter/Main.scala
@@ -1,4 +1,4 @@
-package neotype.jsoniter
+package neotype.interop.jsoniter
 
 import com.github.plokhotnyuk.jsoniter_scala.core.JsonReader
 import com.github.plokhotnyuk.jsoniter_scala.core.JsonValueCodec
diff --git a/modules/neotype-jsoniter/shared/src/test/scala/neotype/jsoniter/JsoniterSpec.scala b/modules/neotype-jsoniter/shared/src/test/scala/neotype/interop/jsoniter/JsoniterSpec.scala
similarity index 97%
rename from modules/neotype-jsoniter/shared/src/test/scala/neotype/jsoniter/JsoniterSpec.scala
rename to modules/neotype-jsoniter/shared/src/test/scala/neotype/interop/jsoniter/JsoniterSpec.scala
index cc5b1e0..9a80491 100644
--- a/modules/neotype-jsoniter/shared/src/test/scala/neotype/jsoniter/JsoniterSpec.scala
+++ b/modules/neotype-jsoniter/shared/src/test/scala/neotype/interop/jsoniter/JsoniterSpec.scala
@@ -1,4 +1,4 @@
-package neotype.jsoniter
+package neotype.interop.jsoniter
 
 import com.github.plokhotnyuk.jsoniter_scala.core.JsonValueCodec
 import com.github.plokhotnyuk.jsoniter_scala.core.readFromString
@@ -6,7 +6,6 @@ import com.github.plokhotnyuk.jsoniter_scala.macros.CodecMakerConfig
 import com.github.plokhotnyuk.jsoniter_scala.macros.ConfiguredJsonValueCodec
 import com.github.plokhotnyuk.jsoniter_scala.macros.JsonCodecMaker
 import neotype.*
-import neotype.jsoniter.given
 import neotype.test.definitions.*
 import zio.*
 import zio.test.*
diff --git a/modules/neotype-play-json/shared/src/main/scala/neotype/playjson/Main.scala b/modules/neotype-play-json/shared/src/main/scala/neotype/interop/playjson/Main.scala
similarity index 98%
rename from modules/neotype-play-json/shared/src/main/scala/neotype/playjson/Main.scala
rename to modules/neotype-play-json/shared/src/main/scala/neotype/interop/playjson/Main.scala
index cf27b35..09ac2a2 100644
--- a/modules/neotype-play-json/shared/src/main/scala/neotype/playjson/Main.scala
+++ b/modules/neotype-play-json/shared/src/main/scala/neotype/interop/playjson/Main.scala
@@ -1,4 +1,4 @@
-package neotype.playjson
+package neotype.interop.playjson
 
 import neotype.*
 import play.api.libs.json.*
diff --git a/modules/neotype-play-json/shared/src/test/scala/neotype/playjson/PlayJsonSpec.scala b/modules/neotype-play-json/shared/src/test/scala/neotype/interop/playjson/PlayJsonSpec.scala
similarity index 85%
rename from modules/neotype-play-json/shared/src/test/scala/neotype/playjson/PlayJsonSpec.scala
rename to modules/neotype-play-json/shared/src/test/scala/neotype/interop/playjson/PlayJsonSpec.scala
index 1a4e5c9..9c3bc9f 100644
--- a/modules/neotype-play-json/shared/src/test/scala/neotype/playjson/PlayJsonSpec.scala
+++ b/modules/neotype-play-json/shared/src/test/scala/neotype/interop/playjson/PlayJsonSpec.scala
@@ -1,5 +1,9 @@
-package neotype.playjson
+package neotype.interop.playjson
 
+import neotype.interop.playjson.newtypeFormat
+import neotype.interop.playjson.simpleNewtypeFormat
+import neotype.interop.playjson.simpleSubtypeFormat
+import neotype.interop.playjson.subtypeFormat
 import neotype.test.*
 import neotype.test.definitions.*
 import play.api.libs.json.*
diff --git a/modules/neotype-tapir/shared/src/main/scala/neotype/tapir/Main.scala b/modules/neotype-tapir/shared/src/main/scala/neotype/interop/tapir/Main.scala
similarity index 99%
rename from modules/neotype-tapir/shared/src/main/scala/neotype/tapir/Main.scala
rename to modules/neotype-tapir/shared/src/main/scala/neotype/interop/tapir/Main.scala
index e815e07..7322f4f 100644
--- a/modules/neotype-tapir/shared/src/main/scala/neotype/tapir/Main.scala
+++ b/modules/neotype-tapir/shared/src/main/scala/neotype/interop/tapir/Main.scala
@@ -1,4 +1,4 @@
-package neotype.tapir
+package neotype.interop.tapir
 
 import neotype.*
 import sttp.tapir.Codec
diff --git a/modules/neotype-tapir/shared/src/test/scala/neotype/tapir/TapirSpec.scala b/modules/neotype-tapir/shared/src/test/scala/neotype/interop/tapir/TapirSpec.scala
similarity index 97%
rename from modules/neotype-tapir/shared/src/test/scala/neotype/tapir/TapirSpec.scala
rename to modules/neotype-tapir/shared/src/test/scala/neotype/interop/tapir/TapirSpec.scala
index d53fbb2..dfeb260 100644
--- a/modules/neotype-tapir/shared/src/test/scala/neotype/tapir/TapirSpec.scala
+++ b/modules/neotype-tapir/shared/src/test/scala/neotype/interop/tapir/TapirSpec.scala
@@ -1,7 +1,10 @@
-package neotype.tapir
+package neotype.interop.tapir
 
 import neotype.Newtype
 import neotype.Subtype
+import neotype.interop.tapir.given_Codec_L_B_CF
+import neotype.interop.tapir.given_Pickler_B
+import neotype.interop.tapir.given_Schema_B
 import neotype.test.definitions.*
 import sttp.tapir.Codec
 import sttp.tapir.DecodeResult
diff --git a/modules/neotype-zio-config/src/main/scala/neotype/zioconfig/Main.scala b/modules/neotype-zio-config/src/main/scala/neotype/interop/zioconfig/Main.scala
similarity index 96%
rename from modules/neotype-zio-config/src/main/scala/neotype/zioconfig/Main.scala
rename to modules/neotype-zio-config/src/main/scala/neotype/interop/zioconfig/Main.scala
index c221868..ff7c12f 100644
--- a/modules/neotype-zio-config/src/main/scala/neotype/zioconfig/Main.scala
+++ b/modules/neotype-zio-config/src/main/scala/neotype/interop/zioconfig/Main.scala
@@ -1,4 +1,4 @@
-package neotype.zioconfig
+package neotype.interop.zioconfig
 
 import neotype.*
 import zio.Chunk
diff --git a/modules/neotype-zio-config/src/test/scala/neotype/zioconfig/ZioConfigSpec.scala b/modules/neotype-zio-config/src/test/scala/neotype/interop/zioconfig/ZioConfigSpec.scala
similarity index 97%
rename from modules/neotype-zio-config/src/test/scala/neotype/zioconfig/ZioConfigSpec.scala
rename to modules/neotype-zio-config/src/test/scala/neotype/interop/zioconfig/ZioConfigSpec.scala
index 6a5cddf..e3b02e5 100644
--- a/modules/neotype-zio-config/src/test/scala/neotype/zioconfig/ZioConfigSpec.scala
+++ b/modules/neotype-zio-config/src/test/scala/neotype/interop/zioconfig/ZioConfigSpec.scala
@@ -1,4 +1,4 @@
-package neotype.zioconfig
+package neotype.interop.zioconfig
 
 import neotype.*
 import neotype.test.definitions.*
diff --git a/modules/neotype-zio-json/shared/src/main/scala/neotype/ziojson/Main.scala b/modules/neotype-zio-json/shared/src/main/scala/neotype/interop/ziojson/Main.scala
similarity index 98%
rename from modules/neotype-zio-json/shared/src/main/scala/neotype/ziojson/Main.scala
rename to modules/neotype-zio-json/shared/src/main/scala/neotype/interop/ziojson/Main.scala
index 2e9ffb9..6dfaae7 100644
--- a/modules/neotype-zio-json/shared/src/main/scala/neotype/ziojson/Main.scala
+++ b/modules/neotype-zio-json/shared/src/main/scala/neotype/interop/ziojson/Main.scala
@@ -1,4 +1,4 @@
-package neotype.ziojson
+package neotype.interop.ziojson
 
 import neotype.*
 import zio.json.*
diff --git a/modules/neotype-zio-json/shared/src/test/scala/neotype/ziojson/ZioJsonSpec.scala b/modules/neotype-zio-json/shared/src/test/scala/neotype/interop/ziojson/ZioJsonSpec.scala
similarity index 86%
rename from modules/neotype-zio-json/shared/src/test/scala/neotype/ziojson/ZioJsonSpec.scala
rename to modules/neotype-zio-json/shared/src/test/scala/neotype/interop/ziojson/ZioJsonSpec.scala
index c1d571c..fa42c10 100644
--- a/modules/neotype-zio-json/shared/src/test/scala/neotype/ziojson/ZioJsonSpec.scala
+++ b/modules/neotype-zio-json/shared/src/test/scala/neotype/interop/ziojson/ZioJsonSpec.scala
@@ -1,6 +1,7 @@
-package neotype.ziojson
+package neotype.interop.ziojson
 
 import neotype.*
+import neotype.interop.ziojson.given_JsonCodec_B
 import neotype.test.*
 import neotype.test.definitions.*
 import zio.json.*
diff --git a/modules/neotype-zio-json/shared/src/test/scala/neotype/ziojson/ZioJsonSpecificSpec.scala b/modules/neotype-zio-json/shared/src/test/scala/neotype/interop/ziojson/ZioJsonSpecificSpec.scala
similarity index 94%
rename from modules/neotype-zio-json/shared/src/test/scala/neotype/ziojson/ZioJsonSpecificSpec.scala
rename to modules/neotype-zio-json/shared/src/test/scala/neotype/interop/ziojson/ZioJsonSpecificSpec.scala
index 099daf0..428b147 100644
--- a/modules/neotype-zio-json/shared/src/test/scala/neotype/ziojson/ZioJsonSpecificSpec.scala
+++ b/modules/neotype-zio-json/shared/src/test/scala/neotype/interop/ziojson/ZioJsonSpecificSpec.scala
@@ -1,4 +1,4 @@
-package neotype.ziojson
+package neotype.interop.ziojson
 
 import neotype.*
 import zio.json.*
diff --git a/modules/neotype-zio-quill/src/main/scala/neotype/zioquill/Main.scala b/modules/neotype-zio-quill/src/main/scala/neotype/interop/quill/Main.scala
similarity index 96%
rename from modules/neotype-zio-quill/src/main/scala/neotype/zioquill/Main.scala
rename to modules/neotype-zio-quill/src/main/scala/neotype/interop/quill/Main.scala
index 215124e..dd07bc5 100644
--- a/modules/neotype-zio-quill/src/main/scala/neotype/zioquill/Main.scala
+++ b/modules/neotype-zio-quill/src/main/scala/neotype/interop/quill/Main.scala
@@ -1,4 +1,4 @@
-package neotype.zioquill
+package neotype.interop.quill
 
 import io.getquill
 import io.getquill.MappedEncoding
diff --git a/modules/neotype-zio-quill/src/test/scala/neotype/zioquill/ZioQuillNewtypeSpec.scala b/modules/neotype-zio-quill/src/test/scala/neotype/interop/quill/ZioQuillNewtypeSpec.scala
similarity index 96%
rename from modules/neotype-zio-quill/src/test/scala/neotype/zioquill/ZioQuillNewtypeSpec.scala
rename to modules/neotype-zio-quill/src/test/scala/neotype/interop/quill/ZioQuillNewtypeSpec.scala
index d7458bb..3d73b2f 100644
--- a/modules/neotype-zio-quill/src/test/scala/neotype/zioquill/ZioQuillNewtypeSpec.scala
+++ b/modules/neotype-zio-quill/src/test/scala/neotype/interop/quill/ZioQuillNewtypeSpec.scala
@@ -1,8 +1,6 @@
-package neotype.zioquill
+package neotype.interop.quill
 
 import io.getquill.*
-import neotype.Newtype
-import neotype.Subtype
 import neotype.test.definitions.*
 import zio.test.*
 
diff --git a/modules/neotype-zio-schema/jvm/src/test/scala/neotype/zioschema/ZioSchemaSpec.scala b/modules/neotype-zio-schema/jvm/src/test/scala/neotype/interop/zioschema/ZioSchemaSpec.scala
similarity index 97%
rename from modules/neotype-zio-schema/jvm/src/test/scala/neotype/zioschema/ZioSchemaSpec.scala
rename to modules/neotype-zio-schema/jvm/src/test/scala/neotype/interop/zioschema/ZioSchemaSpec.scala
index e74046a..988e0c9 100644
--- a/modules/neotype-zio-schema/jvm/src/test/scala/neotype/zioschema/ZioSchemaSpec.scala
+++ b/modules/neotype-zio-schema/jvm/src/test/scala/neotype/interop/zioschema/ZioSchemaSpec.scala
@@ -1,7 +1,8 @@
-package neotype.zioschema
+package neotype.interop.zioschema
 
 import neotype.Newtype
 import neotype.Subtype
+import neotype.interop.zioschema.given_Schema_B
 import neotype.test.definitions.*
 import zio.*
 import zio.json.*
diff --git a/modules/neotype-zio-schema/shared/src/main/scala/neotype/zioschema/Main.scala b/modules/neotype-zio-schema/shared/src/main/scala/neotype/interop/zioschema/Main.scala
similarity index 96%
rename from modules/neotype-zio-schema/shared/src/main/scala/neotype/zioschema/Main.scala
rename to modules/neotype-zio-schema/shared/src/main/scala/neotype/interop/zioschema/Main.scala
index 570c8bc..f783982 100644
--- a/modules/neotype-zio-schema/shared/src/main/scala/neotype/zioschema/Main.scala
+++ b/modules/neotype-zio-schema/shared/src/main/scala/neotype/interop/zioschema/Main.scala
@@ -1,4 +1,4 @@
-package neotype.zioschema
+package neotype.interop.zioschema
 
 import neotype.*
 import zio.schema.Schema
diff --git a/modules/neotype-zio-test/shared/src/main/scala/neotype/ziotest/Main.scala b/modules/neotype-zio-test/shared/src/main/scala/neotype/interop/ziotest/Main.scala
similarity index 93%
rename from modules/neotype-zio-test/shared/src/main/scala/neotype/ziotest/Main.scala
rename to modules/neotype-zio-test/shared/src/main/scala/neotype/interop/ziotest/Main.scala
index a2b070e..d68ad8c 100644
--- a/modules/neotype-zio-test/shared/src/main/scala/neotype/ziotest/Main.scala
+++ b/modules/neotype-zio-test/shared/src/main/scala/neotype/interop/ziotest/Main.scala
@@ -1,4 +1,4 @@
-package neotype.ziotest
+package neotype.interop.ziotest
 
 import _root_.zio.test.*
 import neotype.*
diff --git a/modules/neotype-zio-test/shared/src/test/scala/neotype/ziotest/ZioNewtypeSpec.scala b/modules/neotype-zio-test/shared/src/test/scala/neotype/interop/ziotest/ZioNewtypeSpec.scala
similarity index 87%
rename from modules/neotype-zio-test/shared/src/test/scala/neotype/ziotest/ZioNewtypeSpec.scala
rename to modules/neotype-zio-test/shared/src/test/scala/neotype/interop/ziotest/ZioNewtypeSpec.scala
index e8f0dae..10858b2 100644
--- a/modules/neotype-zio-test/shared/src/test/scala/neotype/ziotest/ZioNewtypeSpec.scala
+++ b/modules/neotype-zio-test/shared/src/test/scala/neotype/interop/ziotest/ZioNewtypeSpec.scala
@@ -1,7 +1,5 @@
-package neotype.ziotest
+package neotype.interop.ziotest
 
-import neotype.Newtype
-import neotype.Subtype
 import neotype.test.definitions.*
 import zio.*
 import zio.test.*