diff --git a/.gitignore b/.gitignore
index 9ec44e5f..808b78c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ docs/.next
 
 # Ignore debug
 debug/
+CLAUDE.md
diff --git a/packages/evolution/package.json b/packages/evolution/package.json
index 03e8f131..b7012fba 100644
--- a/packages/evolution/package.json
+++ b/packages/evolution/package.json
@@ -45,6 +45,7 @@
     "typescript": "^5.9.2"
   },
   "dependencies": {
+    "@effect/platform": "^0.90.6",
     "@effect/platform-node": "^0.96.0",
     "@noble/hashes": "^1.8.0",
     "@scure/base": "^1.2.6",
diff --git a/packages/evolution/src/AddressDetails.ts b/packages/evolution/src/core/AddressDetails.ts
similarity index 86%
rename from packages/evolution/src/AddressDetails.ts
rename to packages/evolution/src/core/AddressDetails.ts
index 4a8919ed..28bb2bc8 100644
--- a/packages/evolution/src/AddressDetails.ts
+++ b/packages/evolution/src/core/AddressDetails.ts
@@ -1,6 +1,6 @@
 import { Data, Effect as Eff, ParseResult, Schema } from "effect"
 
-import * as Address from "./Address.js"
+import * as AddressEras from "./AddressEras.js"
 import * as Bytes from "./Bytes.js"
 import * as Function from "./Function.js"
 import * as NetworkId from "./NetworkId.js"
@@ -26,7 +26,7 @@ export class AddressDetails extends Schema.Class<AddressDetails>("AddressDetails
     Schema.Literal("RewardAccount"),
     Schema.Literal("ByronAddress")
   ),
-  address: Address.Address,
+  address: AddressEras.AddressEras,
   bech32: Schema.String,
   hex: Bytes.HexSchema
 }) {}
@@ -36,8 +36,8 @@ export const FromBech32 = Schema.transformOrFail(Schema.String, AddressDetails,
   encode: (_, __, ___, toA) => ParseResult.succeed(toA.bech32),
   decode: (_, __, ___, fromA) =>
     Eff.gen(function* () {
-      const address = yield* ParseResult.decode(Address.FromBech32)(fromA)
-      const hex = yield* ParseResult.encode(Address.FromHex)(address)
+      const address = yield* ParseResult.decode(AddressEras.FromBech32)(fromA)
+      const hex = yield* ParseResult.encode(AddressEras.FromHex)(address)
       return new AddressDetails({
         networkId: address.networkId,
         type: address._tag,
@@ -53,8 +53,8 @@ export const FromHex = Schema.transformOrFail(Bytes.HexSchema, AddressDetails, {
   encode: (_, __, ___, toA) => ParseResult.succeed(toA.hex),
   decode: (_, __, ___, fromA) =>
     Eff.gen(function* () {
-      const address = yield* ParseResult.decode(Address.FromHex)(fromA)
-      const bech32 = yield* ParseResult.encode(Address.FromBech32)(address)
+      const address = yield* ParseResult.decode(AddressEras.FromHex)(fromA)
+      const bech32 = yield* ParseResult.encode(AddressEras.FromBech32)(address)
       return new AddressDetails({
         networkId: address.networkId,
         type: address._tag,
@@ -83,7 +83,7 @@ export const equals = (self: AddressDetails, that: AddressDetails): boolean => {
   return (
     self.networkId === that.networkId &&
     self.type === that.type &&
-    Address.equals(self.address, that.address) &&
+    AddressEras.equals(self.address, that.address) &&
     self.bech32 === that.bech32 &&
     self.hex === that.hex
   )
@@ -95,7 +95,7 @@ export const equals = (self: AddressDetails, that: AddressDetails): boolean => {
  * @since 2.0.0
  * @category arbitrary
  */
-export const arbitrary = Address.arbitrary.map((address) => fromAddress(address))
+export const arbitrary = AddressEras.arbitrary.map((address) => fromAddress(address))
 
 /**
  * Create AddressDetails from an Address.
@@ -103,10 +103,10 @@ export const arbitrary = Address.arbitrary.map((address) => fromAddress(address)
  * @since 2.0.0
  * @category constructors
  */
-export const fromAddress = (address: Address.Address): AddressDetails => {
+export const fromAddress = (address: AddressEras.AddressEras): AddressDetails => {
   // Use schema encoding to get the serialized formats
-  const bech32 = Eff.runSync(Schema.encode(Address.FromBech32)(address))
-  const hex = Eff.runSync(Schema.encode(Address.FromHex)(address))
+  const bech32 = Eff.runSync(Schema.encode(AddressEras.FromBech32)(address))
+  const hex = Eff.runSync(Schema.encode(AddressEras.FromHex)(address))
   return new AddressDetails({
     networkId: address.networkId,
     type: address._tag,
diff --git a/packages/evolution/src/Address.ts b/packages/evolution/src/core/AddressEras.ts
similarity index 97%
rename from packages/evolution/src/Address.ts
rename to packages/evolution/src/core/AddressEras.ts
index 79e9e833..81138839 100644
--- a/packages/evolution/src/Address.ts
+++ b/packages/evolution/src/core/AddressEras.ts
@@ -62,7 +62,7 @@ export class AddressError extends Data.TaggedError("AddressError")<{
  * @since 2.0.0
  * @category model
  */
-export const Address = Schema.Union(
+export const AddressEras = Schema.Union(
   BaseAddress.BaseAddress,
   EnterpriseAddress.EnterpriseAddress,
   PointerAddress.PointerAddress,
@@ -70,13 +70,15 @@ export const Address = Schema.Union(
   ByronAddress.ByronAddress
 )
 
+export const isAddress = Schema.is(AddressEras)
+
 /**
  * Type representing an address.
  *
  * @since 2.0.0
  * @category model
  */
-export type Address = typeof Address.Type
+export type AddressEras = typeof AddressEras.Type
 
 /**
  * Schema for encoding/decoding addresses as bytes.
@@ -84,7 +86,7 @@ export type Address = typeof Address.Type
  * @since 2.0.0
  * @category schema
  */
-export const FromBytes = Schema.transformOrFail(Schema.Uint8ArrayFromSelf, Address, {
+export const FromBytes = Schema.transformOrFail(Schema.Uint8ArrayFromSelf, AddressEras, {
   strict: true,
   encode: (_, __, ___, toA) => {
     switch (toA._tag) {
@@ -154,7 +156,7 @@ export const FromHex = Schema.compose(Bytes.FromHex, FromBytes)
  * @since 2.0.0
  * @category schema
  */
-export const FromBech32 = Schema.transformOrFail(Schema.String, Address, {
+export const FromBech32 = Schema.transformOrFail(Schema.String, AddressEras, {
   strict: true,
   encode: (_, __, ast, toA) =>
     Eff.gen(function* () {
@@ -206,7 +208,7 @@ export const FromBech32 = Schema.transformOrFail(Schema.String, Address, {
  * @since 2.0.0
  * @category utils
  */
-export const equals = (a: Address, b: Address): boolean => {
+export const equals = (a: AddressEras, b: AddressEras): boolean => {
   if (a._tag !== b._tag) {
     return false
   }
diff --git a/packages/evolution/src/core/AddressStructure.ts b/packages/evolution/src/core/AddressStructure.ts
new file mode 100644
index 00000000..62f0ed81
--- /dev/null
+++ b/packages/evolution/src/core/AddressStructure.ts
@@ -0,0 +1,281 @@
+/**
+ * @since 1.0.0
+ */
+
+import { bech32 } from "@scure/base"
+import { Data, Effect as Eff, FastCheck, ParseResult, Schema } from "effect"
+
+import * as Bytes from "./Bytes.js"
+import * as Bytes29 from "./Bytes29.js"
+import * as Bytes57 from "./Bytes57.js"
+import * as Credential from "./Credential.js"
+import * as Function from "./Function.js"
+import * as KeyHash from "./KeyHash.js"
+import * as NetworkId from "./NetworkId.js"
+import * as ScriptHash from "./ScriptHash.js"
+
+export class AddressStructureError extends Data.TaggedError("AddressStructureError")<{
+  message?: string
+  cause?: unknown
+}> {}
+
+/**
+ * @since 1.0.0
+ * @category Schema
+ */
+export class AddressStructure extends Schema.Class<AddressStructure>("AddressStructure")({
+  networkId: NetworkId.NetworkId,
+  paymentCredential: Credential.Credential,
+  stakingCredential: Schema.optional(Credential.Credential)
+}) {
+  toString(): string {
+    const staking = this.stakingCredential ? `, stakingCredential: ${this.stakingCredential}` : ""
+    return `AddressStructure(${this.networkId === 0 ? "testnet" : "mainnet"}:${this.paymentCredential}${staking})`
+  }
+
+  [Symbol.for("nodejs.util.inspect.custom")](): string {
+    return this.toString()
+  }
+}
+
+/**
+ * Transform from bytes to AddressStructure
+ * Handles both BaseAddress (57 bytes) and EnterpriseAddress (29 bytes)
+ *
+ * @since 1.0.0
+ * @category Transformations
+ */
+export const FromBytes = Schema.transformOrFail(
+  Schema.Union(Bytes57.BytesSchema, Bytes29.BytesSchema),
+  AddressStructure,
+  {
+    strict: true,
+    encode: (_, __, ___, toA) =>
+      Eff.gen(function* () {
+        if (toA.stakingCredential) {
+          // BaseAddress encoding (57 bytes)
+          const paymentBit = toA.paymentCredential._tag === "KeyHash" ? 0 : 1
+          const stakeBit = toA.stakingCredential._tag === "KeyHash" ? 0 : 1
+          const header = (0b00 << 6) | (stakeBit << 5) | (paymentBit << 4) | (toA.networkId & 0b00001111)
+          const result = new Uint8Array(57)
+          result[0] = header
+          const paymentCredentialBytes = toA.paymentCredential.hash
+          result.set(paymentCredentialBytes, 1)
+          const stakeCredentialBytes = toA.stakingCredential.hash
+          result.set(stakeCredentialBytes, 29)
+          return yield* ParseResult.succeed(result)
+        } else {
+          // EnterpriseAddress encoding (29 bytes)
+          const paymentBit = toA.paymentCredential._tag === "KeyHash" ? 0 : 1
+          const header = (0b01 << 6) | (0b1 << 5) | (paymentBit << 4) | (toA.networkId & 0b00001111)
+          const result = new Uint8Array(29)
+          result[0] = header
+          const paymentCredentialBytes = toA.paymentCredential.hash
+          result.set(paymentCredentialBytes, 1)
+          return yield* ParseResult.succeed(result)
+        }
+      }),
+    decode: (fromI, options, ast, fromA) =>
+      Eff.gen(function* () {
+        const header = fromA[0]
+        const networkId = header & 0b00001111
+        const addressTypeBits = (header >> 4) & 0b1111
+
+        if (fromA.length === 57) {
+          // BaseAddress (with staking credential)
+          const isPaymentKey = (addressTypeBits & 0b0001) === 0
+          const paymentCredential: Credential.Credential = isPaymentKey
+            ? new KeyHash.KeyHash({ hash: fromA.slice(1, 29) })
+            : new ScriptHash.ScriptHash({ hash: fromA.slice(1, 29) })
+
+          const isStakeKey = (addressTypeBits & 0b0010) === 0
+          const stakingCredential: Credential.Credential = isStakeKey
+            ? new KeyHash.KeyHash({ hash: fromA.slice(29, 57) })
+            : new ScriptHash.ScriptHash({ hash: fromA.slice(29, 57) })
+
+          return yield* ParseResult.decode(AddressStructure)({
+            networkId,
+            paymentCredential,
+            stakingCredential
+          })
+        } else if (fromA.length === 29) {
+          // EnterpriseAddress (no staking credential)
+          const isPaymentKey = (addressTypeBits & 0b0001) === 0
+          const paymentCredential: Credential.Credential = isPaymentKey
+            ? new KeyHash.KeyHash({ hash: fromA.slice(1, 29) })
+            : new ScriptHash.ScriptHash({ hash: fromA.slice(1, 29) })
+
+          return yield* ParseResult.decode(AddressStructure)({
+            networkId,
+            paymentCredential,
+            stakingCredential: undefined
+          })
+        } else {
+          return yield* ParseResult.fail(new ParseResult.Type(ast, fromA, "Invalid address length"))
+        }
+      })
+  }
+).annotations({
+  identifier: "AddressStructure.FromBytes"
+})
+
+/**
+ * Transform from hex string to AddressStructure
+ *
+ * @since 1.0.0
+ * @category Transformations
+ */
+export const FromHex = Schema.compose(Bytes.FromHex, FromBytes).annotations({
+  identifier: "AddressStructure.FromHex"
+})
+
+/**
+ * Transform from Bech32 string to AddressStructure
+ *
+ * @since 1.0.0
+ * @category Transformations
+ */
+export const FromBech32 = Schema.transformOrFail(Schema.String, AddressStructure, {
+  strict: true,
+  encode: (_, __, ___, toA) =>
+    Eff.gen(function* () {
+      const prefix = toA.networkId === 0 ? "addr_test" : "addr"
+      const bytes = yield* ParseResult.encode(FromBytes)(toA)
+      const words = bech32.toWords(bytes)
+      return bech32.encode(prefix, words, false)
+    }),
+  decode: (fromA, _, ast) =>
+    Eff.gen(function* () {
+      const result = yield* Eff.try({
+        try: () => {
+          const decoded = bech32.decode(fromA as any, false)
+          const bytes = bech32.fromWords(decoded.words)
+          return new Uint8Array(bytes)
+        },
+        catch: () => new ParseResult.Type(ast, fromA, `Failed to decode Bech32: ${fromA}`)
+      })
+      return yield* ParseResult.decode(FromBytes)(result)
+    })
+}).annotations({
+  identifier: "AddressStructure.FromBech32",
+  description: "Transforms Bech32 string to AddressStructure"
+})
+
+/**
+ * Check if two AddressStructure instances are equal.
+ *
+ * @since 1.0.0
+ * @category Utils
+ */
+export const equals = (a: AddressStructure, b: AddressStructure): boolean =>
+  a.networkId === b.networkId &&
+  Credential.equals(a.paymentCredential, b.paymentCredential) &&
+  ((a.stakingCredential === undefined && b.stakingCredential === undefined) ||
+    (a.stakingCredential !== undefined &&
+      b.stakingCredential !== undefined &&
+      Credential.equals(a.stakingCredential, b.stakingCredential)))
+
+/**
+ * Check if AddressStructure has staking credential (BaseAddress-like)
+ *
+ * @since 1.0.0
+ * @category Utils
+ */
+export const hasStakingCredential = (address: AddressStructure): boolean => address.stakingCredential !== undefined
+
+/**
+ * Check if AddressStructure is enterprise-like (no staking credential)
+ *
+ * @since 1.0.0
+ * @category Utils
+ */
+export const isEnterprise = (address: AddressStructure): boolean => address.stakingCredential === undefined
+
+/**
+ * Get network ID from AddressStructure
+ *
+ * @since 1.0.0
+ * @category Utils
+ */
+export const getNetworkId = (address: AddressStructure): NetworkId.NetworkId => address.networkId
+
+/**
+ * Sync functions using Function module utilities
+ *
+ * @since 1.0.0
+ * @category Functions
+ */
+export const fromBech32 = Function.makeDecodeSync(FromBech32, AddressStructureError, "fromBech32")
+export const toBech32 = Function.makeEncodeSync(FromBech32, AddressStructureError, "toBech32")
+export const fromHex = Function.makeDecodeSync(FromHex, AddressStructureError, "fromHex")
+export const toHex = Function.makeEncodeSync(FromHex, AddressStructureError, "toHex")
+export const fromBytes = Function.makeDecodeSync(FromBytes, AddressStructureError, "fromBytes")
+export const toBytes = Function.makeEncodeSync(FromBytes, AddressStructureError, "toBytes")
+
+/**
+ * FastCheck arbitrary generator for testing
+ *
+ * @since 1.0.0
+ * @category Arbitrary
+ */
+export const arbitrary = FastCheck.record({
+  networkId: NetworkId.arbitrary,
+  paymentCredential: Credential.arbitrary,
+  stakingCredential: FastCheck.option(Credential.arbitrary)
+}).map(
+  (props) =>
+    new AddressStructure({
+      ...props,
+      stakingCredential: props.stakingCredential ?? undefined
+    })
+)
+
+export namespace Either {
+  /**
+   * Parse an AddressStructure from bytes.
+   *
+   * @since 1.0.0
+   * @category parsing
+   */
+  export const fromBytes = Function.makeDecodeEither(FromBytes, AddressStructureError)
+
+  /**
+   * Parse an AddressStructure from hex string.
+   *
+   * @since 1.0.0
+   * @category parsing
+   */
+  export const fromHex = Function.makeDecodeEither(FromHex, AddressStructureError)
+
+  /**
+   * Convert an AddressStructure to bytes.
+   *
+   * @since 1.0.0
+   * @category encoding
+   */
+  export const toBytes = Function.makeEncodeEither(FromBytes, AddressStructureError)
+
+  /**
+   * Convert an AddressStructure to hex string.
+   *
+   * @since 1.0.0
+   * @category encoding
+   */
+  export const toHex = Function.makeEncodeEither(FromHex, AddressStructureError)
+
+  /**
+   * Convert AddressStructure to Bech32 string.
+   *
+   * @since 1.0.0
+   * @category encoding
+   */
+  export const toBech32 = Function.makeEncodeEither(FromBech32, AddressStructureError)
+
+  /**
+   * Parse an AddressStructure from Bech32 string.
+   *
+   * @since 1.0.0
+   * @category parsing
+   */
+  export const fromBech32 = Function.makeDecodeEither(FromBech32, AddressStructureError)
+}
diff --git a/packages/evolution/src/AddressTag.ts b/packages/evolution/src/core/AddressTag.ts
similarity index 100%
rename from packages/evolution/src/AddressTag.ts
rename to packages/evolution/src/core/AddressTag.ts
diff --git a/packages/evolution/src/Anchor.ts b/packages/evolution/src/core/Anchor.ts
similarity index 100%
rename from packages/evolution/src/Anchor.ts
rename to packages/evolution/src/core/Anchor.ts
diff --git a/packages/evolution/src/AssetName.ts b/packages/evolution/src/core/AssetName.ts
similarity index 100%
rename from packages/evolution/src/AssetName.ts
rename to packages/evolution/src/core/AssetName.ts
diff --git a/packages/evolution/src/AuxiliaryData.ts b/packages/evolution/src/core/AuxiliaryData.ts
similarity index 100%
rename from packages/evolution/src/AuxiliaryData.ts
rename to packages/evolution/src/core/AuxiliaryData.ts
diff --git a/packages/evolution/src/AuxiliaryDataHash.ts b/packages/evolution/src/core/AuxiliaryDataHash.ts
similarity index 100%
rename from packages/evolution/src/AuxiliaryDataHash.ts
rename to packages/evolution/src/core/AuxiliaryDataHash.ts
diff --git a/packages/evolution/src/BaseAddress.ts b/packages/evolution/src/core/BaseAddress.ts
similarity index 100%
rename from packages/evolution/src/BaseAddress.ts
rename to packages/evolution/src/core/BaseAddress.ts
diff --git a/packages/evolution/src/Bech32.ts b/packages/evolution/src/core/Bech32.ts
similarity index 100%
rename from packages/evolution/src/Bech32.ts
rename to packages/evolution/src/core/Bech32.ts
diff --git a/packages/evolution/src/BigInt.ts b/packages/evolution/src/core/BigInt.ts
similarity index 100%
rename from packages/evolution/src/BigInt.ts
rename to packages/evolution/src/core/BigInt.ts
diff --git a/packages/evolution/src/Bip32PrivateKey.ts b/packages/evolution/src/core/Bip32PrivateKey.ts
similarity index 100%
rename from packages/evolution/src/Bip32PrivateKey.ts
rename to packages/evolution/src/core/Bip32PrivateKey.ts
diff --git a/packages/evolution/src/Bip32PublicKey.ts b/packages/evolution/src/core/Bip32PublicKey.ts
similarity index 100%
rename from packages/evolution/src/Bip32PublicKey.ts
rename to packages/evolution/src/core/Bip32PublicKey.ts
diff --git a/packages/evolution/src/Block.ts b/packages/evolution/src/core/Block.ts
similarity index 100%
rename from packages/evolution/src/Block.ts
rename to packages/evolution/src/core/Block.ts
diff --git a/packages/evolution/src/BlockBodyHash.ts b/packages/evolution/src/core/BlockBodyHash.ts
similarity index 100%
rename from packages/evolution/src/BlockBodyHash.ts
rename to packages/evolution/src/core/BlockBodyHash.ts
diff --git a/packages/evolution/src/BlockHeaderHash.ts b/packages/evolution/src/core/BlockHeaderHash.ts
similarity index 100%
rename from packages/evolution/src/BlockHeaderHash.ts
rename to packages/evolution/src/core/BlockHeaderHash.ts
diff --git a/packages/evolution/src/BootstrapWitness.ts b/packages/evolution/src/core/BootstrapWitness.ts
similarity index 100%
rename from packages/evolution/src/BootstrapWitness.ts
rename to packages/evolution/src/core/BootstrapWitness.ts
diff --git a/packages/evolution/src/BoundedBytes.ts b/packages/evolution/src/core/BoundedBytes.ts
similarity index 100%
rename from packages/evolution/src/BoundedBytes.ts
rename to packages/evolution/src/core/BoundedBytes.ts
diff --git a/packages/evolution/src/ByronAddress.ts b/packages/evolution/src/core/ByronAddress.ts
similarity index 100%
rename from packages/evolution/src/ByronAddress.ts
rename to packages/evolution/src/core/ByronAddress.ts
diff --git a/packages/evolution/src/Bytes.ts b/packages/evolution/src/core/Bytes.ts
similarity index 90%
rename from packages/evolution/src/Bytes.ts
rename to packages/evolution/src/core/Bytes.ts
index efb63b3a..3cbb6c72 100644
--- a/packages/evolution/src/Bytes.ts
+++ b/packages/evolution/src/core/Bytes.ts
@@ -189,14 +189,12 @@ export const BytesFromHexLenient = makeBytesTransformation({
  * @category composition
  */
 export const hexLengthEquals =
-  (byteLength: number, moduleName: string) =>
+  (byteLength: number) =>
   <S extends Schema.Schema<any, string>>(baseSchema: S) =>
     baseSchema.pipe(
       Schema.filter((hex: string) => hex.length === byteLength * 2, {
         message: (issue) =>
-          `${issue.actual} Must be exactly ${byteLength * 2} hex characters (${byteLength} bytes), got ${(issue.actual as string).length}`,
-
-        identifier: `${moduleName}.LengthEquals${byteLength}`
+          `${issue.actual} Must be exactly ${byteLength * 2} hex characters (${byteLength} bytes), got ${(issue.actual as string).length}`
       })
     )
 
@@ -208,7 +206,7 @@ export const hexLengthEquals =
  * @category composition
  */
 export const hexLengthBetween =
-  (minBytes: number, maxBytes: number, moduleName: string) =>
+  (minBytes: number, maxBytes: number) =>
   <S extends Schema.Schema<any, string>>(baseSchema: S) =>
     baseSchema.pipe(
       Schema.filter(
@@ -218,8 +216,7 @@ export const hexLengthBetween =
         },
         {
           message: () =>
-            `Must be between ${minBytes} and ${maxBytes} bytes (${minBytes * 2}-${maxBytes * 2} hex characters)`,
-          identifier: `${moduleName}.LengthBetween${minBytes}And${maxBytes}`
+            `Must be between ${minBytes} and ${maxBytes} bytes (${minBytes * 2}-${maxBytes * 2} hex characters)`
         }
       )
     )
@@ -232,12 +229,11 @@ export const hexLengthBetween =
  * @category composition
  */
 export const hexLengthMin =
-  (minBytes: number, moduleName: string) =>
+  (minBytes: number) =>
   <S extends Schema.Schema<any, string>>(baseSchema: S) =>
     baseSchema.pipe(
       Schema.filter((hex: string) => hex.length >= minBytes * 2, {
-        message: () => `Must be at least ${minBytes} bytes (${minBytes * 2} hex characters)`,
-        identifier: `${moduleName}.LengthMin${minBytes}`
+        message: () => `Must be at least ${minBytes} bytes (${minBytes * 2} hex characters)`
       })
     )
 
@@ -249,12 +245,11 @@ export const hexLengthMin =
  * @category composition
  */
 export const hexLengthMax =
-  (maxBytes: number, moduleName: string) =>
+  (maxBytes: number) =>
   <S extends Schema.Schema<any, string>>(baseSchema: S) =>
     baseSchema.pipe(
       Schema.filter((hex: string) => hex.length <= maxBytes * 2, {
-        message: () => `Must be at most ${maxBytes} bytes (${maxBytes * 2} hex characters)`,
-        identifier: `${moduleName}.LengthMax${maxBytes}`
+        message: () => `Must be at most ${maxBytes} bytes (${maxBytes * 2} hex characters)`
       })
     )
 
@@ -266,12 +261,11 @@ export const hexLengthMax =
  * @category composition
  */
 export const hexStartsWithPrefix =
-  (prefix: string, moduleName: string) =>
+  (prefix: string) =>
   <S extends Schema.Schema<any, string>>(baseSchema: S) =>
     baseSchema.pipe(
       Schema.filter((hex: string) => hex.toLowerCase().startsWith(prefix.toLowerCase()), {
-        message: () => `Must start with prefix "${prefix}"`,
-        identifier: `${moduleName}.StartsWithPrefix`
+        message: () => `Must start with prefix "${prefix}"`
       })
     )
 
@@ -284,13 +278,12 @@ export const hexStartsWithPrefix =
  * @category composition
  */
 export const bytesLengthEquals =
-  (byteLength: number, moduleName: string) =>
+  (byteLength: number) =>
   <S extends Schema.Schema<any, any>>(baseSchema: S) =>
     baseSchema.pipe(
       Schema.filter((bytes: Uint8Array) => bytes.length === byteLength, {
         message: (issue) =>
-          `${issue.actual} Must be exactly ${byteLength} bytes, got ${(issue.actual as Uint8Array).length}`,
-        identifier: `${moduleName}.BytesLengthEquals${byteLength}`
+          `${issue.actual} Must be exactly ${byteLength} bytes, got ${(issue.actual as Uint8Array).length}`
       })
     )
 
@@ -302,12 +295,11 @@ export const bytesLengthEquals =
  * @category composition
  */
 export const bytesLengthBetween =
-  (minBytes: number, maxBytes: number, moduleName: string) =>
+  (minBytes: number, maxBytes: number) =>
   <S extends Schema.Schema<any, Uint8Array>>(baseSchema: S) =>
     baseSchema.pipe(
       Schema.filter((bytes: Uint8Array) => bytes.length >= minBytes && bytes.length <= maxBytes, {
-        message: () => `Must be between ${minBytes} and ${maxBytes} bytes`,
-        identifier: `${moduleName}.BytesLengthBetween${minBytes}And${maxBytes}`
+        message: () => `Must be between ${minBytes} and ${maxBytes} bytes`
       })
     )
 
@@ -319,12 +311,11 @@ export const bytesLengthBetween =
  * @category composition
  */
 export const bytesLengthMin =
-  (minBytes: number, moduleName: string) =>
+  (minBytes: number) =>
   <S extends Schema.Schema<any, Uint8Array>>(baseSchema: S) =>
     baseSchema.pipe(
       Schema.filter((bytes: Uint8Array) => bytes.length >= minBytes, {
-        message: () => `Must be at least ${minBytes} bytes`,
-        identifier: `${moduleName}.BytesLengthMin${minBytes}`
+        message: () => `Must be at least ${minBytes} bytes`
       })
     )
 
@@ -353,7 +344,7 @@ export const bytesLengthMax =
  * @category composition
  */
 export const bytesStartsWithPrefix =
-  (prefix: Uint8Array, moduleName: string) =>
+  (prefix: Uint8Array) =>
   <S extends Schema.Schema<any, Uint8Array>>(baseSchema: S) =>
     baseSchema.pipe(
       Schema.filter(
@@ -365,8 +356,7 @@ export const bytesStartsWithPrefix =
           return true
         },
         {
-          message: () => `Must start with prefix [${Array.from(prefix).join(", ")}]`,
-          identifier: `${moduleName}.BytesStartsWithPrefix`
+          message: () => `Must start with prefix [${Array.from(prefix).join(", ")}]`
         }
       )
     )
diff --git a/packages/evolution/src/Bytes128.ts b/packages/evolution/src/core/Bytes128.ts
similarity index 90%
rename from packages/evolution/src/Bytes128.ts
rename to packages/evolution/src/core/Bytes128.ts
index b8fbf6bd..6c496a80 100644
--- a/packages/evolution/src/Bytes128.ts
+++ b/packages/evolution/src/core/Bytes128.ts
@@ -28,11 +28,11 @@ export class Bytes128Error extends Data.TaggedError("Bytes128Error")<{
 export const BYTES_LENGTH = 128
 
 export const BytesSchema = Schema.Uint8ArrayFromSelf.pipe(
-  Bytes.bytesLengthEquals(BYTES_LENGTH, `Bytes${BYTES_LENGTH}.Bytes${BYTES_LENGTH}`)
+  Bytes.bytesLengthEquals(BYTES_LENGTH)
 )
 
 export const HexSchema = Bytes.HexSchema.pipe(
-  Bytes.hexLengthEquals(BYTES_LENGTH, `Bytes${BYTES_LENGTH}.Hex${BYTES_LENGTH}`)
+  Bytes.hexLengthEquals(BYTES_LENGTH)
 )
 
 /**
@@ -50,7 +50,7 @@ export const FromHex = Bytes.makeBytesTransformation({
 })
 
 export const VariableBytes = Schema.Uint8ArrayFromSelf.pipe(
-  Bytes.bytesLengthBetween(0, BYTES_LENGTH, `Bytes${BYTES_LENGTH}.VariableBytes${BYTES_LENGTH}`)
+  Bytes.bytesLengthBetween(0, BYTES_LENGTH)
 )
 
 /**
@@ -62,7 +62,7 @@ export const VariableBytes = Schema.Uint8ArrayFromSelf.pipe(
 export const VariableBytesFromHex = Bytes.makeBytesTransformation({
   id: `Bytes${BYTES_LENGTH}.VariableBytes${BYTES_LENGTH}FromHex`,
   stringSchema: Bytes.HexLenientSchema.pipe(
-    Bytes.hexLengthBetween(0, BYTES_LENGTH, `Bytes${BYTES_LENGTH}.VariableHex${BYTES_LENGTH}`)
+    Bytes.hexLengthBetween(0, BYTES_LENGTH)
   ),
   uint8ArraySchema: VariableBytes,
   decode: Bytes.fromHexLenient,
diff --git a/packages/evolution/src/Bytes16.ts b/packages/evolution/src/core/Bytes16.ts
similarity index 90%
rename from packages/evolution/src/Bytes16.ts
rename to packages/evolution/src/core/Bytes16.ts
index 2a7d600c..6c778337 100644
--- a/packages/evolution/src/Bytes16.ts
+++ b/packages/evolution/src/core/Bytes16.ts
@@ -28,11 +28,11 @@ export class Bytes16Error extends Data.TaggedError("Bytes16Error")<{
 export const BYTES_LENGTH = 16
 
 export const BytesSchema = Schema.Uint8ArrayFromSelf.pipe(
-  Bytes.bytesLengthEquals(BYTES_LENGTH, `Bytes${BYTES_LENGTH}.Bytes${BYTES_LENGTH}`)
+  Bytes.bytesLengthEquals(BYTES_LENGTH)
 )
 
 export const HexSchema = Bytes.HexSchema.pipe(
-  Bytes.hexLengthEquals(BYTES_LENGTH, `Bytes${BYTES_LENGTH}.Hex${BYTES_LENGTH}`)
+  Bytes.hexLengthEquals(BYTES_LENGTH)
 )
 
 /**
@@ -50,7 +50,7 @@ export const FromHex = Bytes.makeBytesTransformation({
 })
 
 export const VariableBytes = Schema.Uint8ArrayFromSelf.pipe(
-  Bytes.bytesLengthBetween(0, BYTES_LENGTH, `Bytes${BYTES_LENGTH}.VariableBytes${BYTES_LENGTH}`)
+  Bytes.bytesLengthBetween(0, BYTES_LENGTH)
 )
 
 /**
@@ -62,7 +62,7 @@ export const VariableBytes = Schema.Uint8ArrayFromSelf.pipe(
 export const VariableBytesFromHex = Bytes.makeBytesTransformation({
   id: `Bytes${BYTES_LENGTH}.VariableBytes${BYTES_LENGTH}FromHex`,
   stringSchema: Bytes.HexLenientSchema.pipe(
-    Bytes.hexLengthBetween(0, BYTES_LENGTH, `Bytes${BYTES_LENGTH}.VariableHex${BYTES_LENGTH}`)
+    Bytes.hexLengthBetween(0, BYTES_LENGTH)
   ),
   uint8ArraySchema: VariableBytes,
   decode: Bytes.fromHexLenient,
diff --git a/packages/evolution/src/Bytes29.ts b/packages/evolution/src/core/Bytes29.ts
similarity index 90%
rename from packages/evolution/src/Bytes29.ts
rename to packages/evolution/src/core/Bytes29.ts
index ec076ad6..46d3ad3a 100644
--- a/packages/evolution/src/Bytes29.ts
+++ b/packages/evolution/src/core/Bytes29.ts
@@ -28,11 +28,11 @@ export class Bytes29Error extends Data.TaggedError("Bytes29Error")<{
 export const BYTES_LENGTH = 29
 
 export const BytesSchema = Schema.Uint8ArrayFromSelf.pipe(
-  Bytes.bytesLengthEquals(BYTES_LENGTH, `Bytes${BYTES_LENGTH}.Bytes${BYTES_LENGTH}`)
+  Bytes.bytesLengthEquals(BYTES_LENGTH)
 )
 
 export const HexSchema = Bytes.HexSchema.pipe(
-  Bytes.hexLengthEquals(BYTES_LENGTH, `Bytes${BYTES_LENGTH}.Hex${BYTES_LENGTH}`)
+  Bytes.hexLengthEquals(BYTES_LENGTH)
 )
 
 /**
@@ -50,7 +50,7 @@ export const FromHex = Bytes.makeBytesTransformation({
 })
 
 export const VariableBytes = Schema.Uint8ArrayFromSelf.pipe(
-  Bytes.bytesLengthBetween(0, BYTES_LENGTH, `Bytes${BYTES_LENGTH}.VariableBytes${BYTES_LENGTH}`)
+  Bytes.bytesLengthBetween(0, BYTES_LENGTH)
 )
 
 /**
@@ -62,7 +62,7 @@ export const VariableBytes = Schema.Uint8ArrayFromSelf.pipe(
 export const VariableBytesFromHex = Bytes.makeBytesTransformation({
   id: `Bytes${BYTES_LENGTH}.VariableBytes${BYTES_LENGTH}FromHex`,
   stringSchema: Bytes.HexLenientSchema.pipe(
-    Bytes.hexLengthBetween(0, BYTES_LENGTH, `Bytes${BYTES_LENGTH}.VariableHex${BYTES_LENGTH}`)
+    Bytes.hexLengthBetween(0, BYTES_LENGTH)
   ),
   uint8ArraySchema: VariableBytes,
   decode: Bytes.fromHexLenient,
diff --git a/packages/evolution/src/Bytes32.ts b/packages/evolution/src/core/Bytes32.ts
similarity index 90%
rename from packages/evolution/src/Bytes32.ts
rename to packages/evolution/src/core/Bytes32.ts
index 88f83dad..a92ed8f5 100644
--- a/packages/evolution/src/Bytes32.ts
+++ b/packages/evolution/src/core/Bytes32.ts
@@ -28,11 +28,11 @@ export class Bytes32Error extends Data.TaggedError("Bytes32Error")<{
 export const BYTES_LENGTH = 32
 
 export const BytesSchema = Schema.Uint8ArrayFromSelf.pipe(
-  Bytes.bytesLengthEquals(BYTES_LENGTH, `Bytes${BYTES_LENGTH}.Bytes${BYTES_LENGTH}`)
+  Bytes.bytesLengthEquals(BYTES_LENGTH)
 )
 
 export const HexSchema = Bytes.HexSchema.pipe(
-  Bytes.hexLengthEquals(BYTES_LENGTH, `Bytes${BYTES_LENGTH}.Hex${BYTES_LENGTH}`)
+  Bytes.hexLengthEquals(BYTES_LENGTH)
 )
 
 /**
@@ -50,7 +50,7 @@ export const FromHex = Bytes.makeBytesTransformation({
 })
 
 export const VariableBytes = Schema.Uint8ArrayFromSelf.pipe(
-  Bytes.bytesLengthBetween(0, BYTES_LENGTH, `Bytes${BYTES_LENGTH}.VariableBytes${BYTES_LENGTH}`)
+  Bytes.bytesLengthBetween(0, BYTES_LENGTH)
 )
 
 /**
@@ -62,7 +62,7 @@ export const VariableBytes = Schema.Uint8ArrayFromSelf.pipe(
 export const VariableBytesFromHex = Bytes.makeBytesTransformation({
   id: `Bytes${BYTES_LENGTH}.VariableBytes${BYTES_LENGTH}FromHex`,
   stringSchema: Bytes.HexLenientSchema.pipe(
-    Bytes.hexLengthBetween(0, BYTES_LENGTH, `Bytes${BYTES_LENGTH}.VariableHex${BYTES_LENGTH}`)
+    Bytes.hexLengthBetween(0, BYTES_LENGTH)
   ),
   uint8ArraySchema: VariableBytes,
   decode: Bytes.fromHexLenient,
diff --git a/packages/evolution/src/Bytes4.ts b/packages/evolution/src/core/Bytes4.ts
similarity index 90%
rename from packages/evolution/src/Bytes4.ts
rename to packages/evolution/src/core/Bytes4.ts
index 3676e6a5..105c1e52 100644
--- a/packages/evolution/src/Bytes4.ts
+++ b/packages/evolution/src/core/Bytes4.ts
@@ -28,11 +28,11 @@ export class Bytes4Error extends Data.TaggedError("Bytes4Error")<{
 export const BYTES_LENGTH = 4
 
 export const BytesSchema = Schema.Uint8ArrayFromSelf.pipe(
-  Bytes.bytesLengthEquals(BYTES_LENGTH, `Bytes${BYTES_LENGTH}.Bytes${BYTES_LENGTH}`)
+  Bytes.bytesLengthEquals(BYTES_LENGTH)
 )
 
 export const HexSchema = Bytes.HexSchema.pipe(
-  Bytes.hexLengthEquals(BYTES_LENGTH, `Bytes${BYTES_LENGTH}.Hex${BYTES_LENGTH}`)
+  Bytes.hexLengthEquals(BYTES_LENGTH)
 )
 
 /**
@@ -50,7 +50,7 @@ export const FromHex = Bytes.makeBytesTransformation({
 })
 
 export const VariableBytes = Schema.Uint8ArrayFromSelf.pipe(
-  Bytes.bytesLengthBetween(0, BYTES_LENGTH, `Bytes${BYTES_LENGTH}.VariableBytes${BYTES_LENGTH}`)
+  Bytes.bytesLengthBetween(0, BYTES_LENGTH)
 )
 
 /**
@@ -62,7 +62,7 @@ export const VariableBytes = Schema.Uint8ArrayFromSelf.pipe(
 export const VariableBytesFromHex = Bytes.makeBytesTransformation({
   id: `Bytes${BYTES_LENGTH}.VariableBytes${BYTES_LENGTH}FromHex`,
   stringSchema: Bytes.HexLenientSchema.pipe(
-    Bytes.hexLengthBetween(0, BYTES_LENGTH, `Bytes${BYTES_LENGTH}.VariableHex${BYTES_LENGTH}`)
+    Bytes.hexLengthBetween(0, BYTES_LENGTH)
   ),
   uint8ArraySchema: VariableBytes,
   decode: Bytes.fromHexLenient,
diff --git a/packages/evolution/src/Bytes448.ts b/packages/evolution/src/core/Bytes448.ts
similarity index 90%
rename from packages/evolution/src/Bytes448.ts
rename to packages/evolution/src/core/Bytes448.ts
index fad24b9e..d8accc90 100644
--- a/packages/evolution/src/Bytes448.ts
+++ b/packages/evolution/src/core/Bytes448.ts
@@ -28,11 +28,11 @@ export class Bytes448Error extends Data.TaggedError("Bytes448Error")<{
 export const BYTES_LENGTH = 448
 
 export const BytesSchema = Schema.Uint8ArrayFromSelf.pipe(
-  Bytes.bytesLengthEquals(BYTES_LENGTH, `Bytes${BYTES_LENGTH}.Bytes${BYTES_LENGTH}`)
+  Bytes.bytesLengthEquals(BYTES_LENGTH)
 )
 
 export const HexSchema = Bytes.HexSchema.pipe(
-  Bytes.hexLengthEquals(BYTES_LENGTH, `Bytes${BYTES_LENGTH}.Hex${BYTES_LENGTH}`)
+  Bytes.hexLengthEquals(BYTES_LENGTH)
 )
 
 /**
@@ -50,7 +50,7 @@ export const FromHex = Bytes.makeBytesTransformation({
 })
 
 export const VariableBytes = Schema.Uint8ArrayFromSelf.pipe(
-  Bytes.bytesLengthBetween(0, BYTES_LENGTH, `Bytes${BYTES_LENGTH}.VariableBytes${BYTES_LENGTH}`)
+  Bytes.bytesLengthBetween(0, BYTES_LENGTH)
 )
 
 /**
@@ -62,7 +62,7 @@ export const VariableBytes = Schema.Uint8ArrayFromSelf.pipe(
 export const VariableBytesFromHex = Bytes.makeBytesTransformation({
   id: `Bytes${BYTES_LENGTH}.VariableBytes${BYTES_LENGTH}FromHex`,
   stringSchema: Bytes.HexLenientSchema.pipe(
-    Bytes.hexLengthBetween(0, BYTES_LENGTH, `Bytes${BYTES_LENGTH}.VariableHex${BYTES_LENGTH}`)
+    Bytes.hexLengthBetween(0, BYTES_LENGTH)
   ),
   uint8ArraySchema: VariableBytes,
   decode: Bytes.fromHexLenient,
diff --git a/packages/evolution/src/Bytes57.ts b/packages/evolution/src/core/Bytes57.ts
similarity index 90%
rename from packages/evolution/src/Bytes57.ts
rename to packages/evolution/src/core/Bytes57.ts
index 6946422d..5b9cbadb 100644
--- a/packages/evolution/src/Bytes57.ts
+++ b/packages/evolution/src/core/Bytes57.ts
@@ -28,11 +28,11 @@ export class Bytes57Error extends Data.TaggedError("Bytes57Error")<{
 export const BYTES_LENGTH = 57
 
 export const BytesSchema = Schema.Uint8ArrayFromSelf.pipe(
-  Bytes.bytesLengthEquals(BYTES_LENGTH, `Bytes${BYTES_LENGTH}.Bytes${BYTES_LENGTH}`)
+  Bytes.bytesLengthEquals(BYTES_LENGTH)
 )
 
 export const HexSchema = Bytes.HexSchema.pipe(
-  Bytes.hexLengthEquals(BYTES_LENGTH, `Bytes${BYTES_LENGTH}.Hex${BYTES_LENGTH}`)
+  Bytes.hexLengthEquals(BYTES_LENGTH)
 )
 
 /**
@@ -50,7 +50,7 @@ export const FromHex = Bytes.makeBytesTransformation({
 })
 
 export const VariableBytes = Schema.Uint8ArrayFromSelf.pipe(
-  Bytes.bytesLengthBetween(0, BYTES_LENGTH, `Bytes${BYTES_LENGTH}.VariableBytes${BYTES_LENGTH}`)
+  Bytes.bytesLengthBetween(0, BYTES_LENGTH)
 )
 
 /**
@@ -62,7 +62,7 @@ export const VariableBytes = Schema.Uint8ArrayFromSelf.pipe(
 export const VariableBytesFromHex = Bytes.makeBytesTransformation({
   id: `Bytes${BYTES_LENGTH}.VariableBytes${BYTES_LENGTH}FromHex`,
   stringSchema: Bytes.HexLenientSchema.pipe(
-    Bytes.hexLengthBetween(0, BYTES_LENGTH, `Bytes${BYTES_LENGTH}.VariableHex${BYTES_LENGTH}`)
+    Bytes.hexLengthBetween(0, BYTES_LENGTH)
   ),
   uint8ArraySchema: VariableBytes,
   decode: Bytes.fromHexLenient,
diff --git a/packages/evolution/src/Bytes64.ts b/packages/evolution/src/core/Bytes64.ts
similarity index 89%
rename from packages/evolution/src/Bytes64.ts
rename to packages/evolution/src/core/Bytes64.ts
index 6abc763d..2627beb9 100644
--- a/packages/evolution/src/Bytes64.ts
+++ b/packages/evolution/src/core/Bytes64.ts
@@ -17,11 +17,11 @@ export class Bytes64Error extends Data.TaggedError("Bytes64Error")<{
 export const BYTES_LENGTH = 64
 
 export const BytesSchema = Schema.Uint8ArrayFromSelf.pipe(
-  Bytes.bytesLengthEquals(BYTES_LENGTH, `Bytes${BYTES_LENGTH}.Bytes${BYTES_LENGTH}`)
+  Bytes.bytesLengthEquals(BYTES_LENGTH)
 )
 
 export const HexSchema = Bytes.HexSchema.pipe(
-  Bytes.hexLengthEquals(BYTES_LENGTH, `Bytes${BYTES_LENGTH}.Hex${BYTES_LENGTH}`)
+  Bytes.hexLengthEquals(BYTES_LENGTH)
 )
 
 export const FromHex = Bytes.makeBytesTransformation({
@@ -33,7 +33,7 @@ export const FromHex = Bytes.makeBytesTransformation({
 })
 
 export const VariableBytes = Schema.Uint8ArrayFromSelf.pipe(
-  Bytes.bytesLengthBetween(0, BYTES_LENGTH, `Bytes${BYTES_LENGTH}.VariableBytes${BYTES_LENGTH}`)
+  Bytes.bytesLengthBetween(0, BYTES_LENGTH)
 )
 
 /**
@@ -45,7 +45,7 @@ export const VariableBytes = Schema.Uint8ArrayFromSelf.pipe(
 export const VariableBytesFromHex = Bytes.makeBytesTransformation({
   id: `Bytes${BYTES_LENGTH}.VariableBytes${BYTES_LENGTH}FromHex`,
   stringSchema: Bytes.HexLenientSchema.pipe(
-    Bytes.hexLengthBetween(0, BYTES_LENGTH, `Bytes${BYTES_LENGTH}.VariableHex${BYTES_LENGTH}`)
+    Bytes.hexLengthBetween(0, BYTES_LENGTH)
   ),
   uint8ArraySchema: VariableBytes,
   decode: Bytes.fromHexLenient,
diff --git a/packages/evolution/src/Bytes80.ts b/packages/evolution/src/core/Bytes80.ts
similarity index 90%
rename from packages/evolution/src/Bytes80.ts
rename to packages/evolution/src/core/Bytes80.ts
index b562efdf..f6007785 100644
--- a/packages/evolution/src/Bytes80.ts
+++ b/packages/evolution/src/core/Bytes80.ts
@@ -28,11 +28,11 @@ export class Bytes80Error extends Data.TaggedError("Bytes32Error")<{
 export const BYTES_LENGTH = 80
 
 export const BytesSchema = Schema.Uint8ArrayFromSelf.pipe(
-  Bytes.bytesLengthEquals(BYTES_LENGTH, `Bytes${BYTES_LENGTH}.Bytes${BYTES_LENGTH}`)
+  Bytes.bytesLengthEquals(BYTES_LENGTH)
 )
 
 export const HexSchema = Bytes.HexSchema.pipe(
-  Bytes.hexLengthEquals(BYTES_LENGTH, `Bytes${BYTES_LENGTH}.Hex${BYTES_LENGTH}`)
+  Bytes.hexLengthEquals(BYTES_LENGTH)
 )
 
 /**
@@ -58,10 +58,10 @@ export const FromHex = Bytes.makeBytesTransformation({
 export const VariableBytesFromHex = Bytes.makeBytesTransformation({
   id: `Bytes${BYTES_LENGTH}.VariableBytes${BYTES_LENGTH}FromHex`,
   stringSchema: Bytes.HexLenientSchema.pipe(
-    Bytes.hexLengthBetween(0, BYTES_LENGTH, `Bytes${BYTES_LENGTH}.VariableHex${BYTES_LENGTH}`)
+    Bytes.hexLengthBetween(0, BYTES_LENGTH)
   ),
   uint8ArraySchema: Schema.Uint8ArrayFromSelf.pipe(
-    Bytes.bytesLengthBetween(0, BYTES_LENGTH, `Bytes${BYTES_LENGTH}.VariableBytes${BYTES_LENGTH}`)
+    Bytes.bytesLengthBetween(0, BYTES_LENGTH)
   ),
   decode: Bytes.fromHexLenient,
   encode: Bytes.toHexLenientUnsafe
diff --git a/packages/evolution/src/Bytes96.ts b/packages/evolution/src/core/Bytes96.ts
similarity index 90%
rename from packages/evolution/src/Bytes96.ts
rename to packages/evolution/src/core/Bytes96.ts
index f7290688..4e3ecf95 100644
--- a/packages/evolution/src/Bytes96.ts
+++ b/packages/evolution/src/core/Bytes96.ts
@@ -28,11 +28,11 @@ export class Bytes96Error extends Data.TaggedError("Bytes96Error")<{
 export const BYTES_LENGTH = 96
 
 export const BytesSchema = Schema.Uint8ArrayFromSelf.pipe(
-  Bytes.bytesLengthEquals(BYTES_LENGTH, `Bytes${BYTES_LENGTH}.Bytes${BYTES_LENGTH}`)
+  Bytes.bytesLengthEquals(BYTES_LENGTH)
 )
 
 export const HexSchema = Bytes.HexSchema.pipe(
-  Bytes.hexLengthEquals(BYTES_LENGTH, `Bytes${BYTES_LENGTH}.Hex${BYTES_LENGTH}`)
+  Bytes.hexLengthEquals(BYTES_LENGTH)
 )
 
 /**
@@ -50,7 +50,7 @@ export const FromHex = Bytes.makeBytesTransformation({
 })
 
 export const VariableBytes = Schema.Uint8ArrayFromSelf.pipe(
-  Bytes.bytesLengthBetween(0, BYTES_LENGTH, `Bytes${BYTES_LENGTH}.VariableBytes${BYTES_LENGTH}`)
+  Bytes.bytesLengthBetween(0, BYTES_LENGTH)
 )
 
 /**
@@ -62,7 +62,7 @@ export const VariableBytes = Schema.Uint8ArrayFromSelf.pipe(
 export const VariableBytesFromHex = Bytes.makeBytesTransformation({
   id: `Bytes${BYTES_LENGTH}.VariableBytes${BYTES_LENGTH}FromHex`,
   stringSchema: Bytes.HexLenientSchema.pipe(
-    Bytes.hexLengthBetween(0, BYTES_LENGTH, `Bytes${BYTES_LENGTH}.VariableHex${BYTES_LENGTH}`)
+    Bytes.hexLengthBetween(0, BYTES_LENGTH)
   ),
   uint8ArraySchema: VariableBytes,
   decode: Bytes.fromHexLenient,
diff --git a/packages/evolution/src/CBOR.ts b/packages/evolution/src/core/CBOR.ts
similarity index 100%
rename from packages/evolution/src/CBOR.ts
rename to packages/evolution/src/core/CBOR.ts
diff --git a/packages/evolution/src/Certificate.ts b/packages/evolution/src/core/Certificate.ts
similarity index 100%
rename from packages/evolution/src/Certificate.ts
rename to packages/evolution/src/core/Certificate.ts
diff --git a/packages/evolution/src/Codec.ts b/packages/evolution/src/core/Codec.ts
similarity index 100%
rename from packages/evolution/src/Codec.ts
rename to packages/evolution/src/core/Codec.ts
diff --git a/packages/evolution/src/Coin.ts b/packages/evolution/src/core/Coin.ts
similarity index 100%
rename from packages/evolution/src/Coin.ts
rename to packages/evolution/src/core/Coin.ts
diff --git a/packages/evolution/src/Combinator.ts b/packages/evolution/src/core/Combinator.ts
similarity index 100%
rename from packages/evolution/src/Combinator.ts
rename to packages/evolution/src/core/Combinator.ts
diff --git a/packages/evolution/src/CommitteeColdCredential.ts b/packages/evolution/src/core/CommitteeColdCredential.ts
similarity index 100%
rename from packages/evolution/src/CommitteeColdCredential.ts
rename to packages/evolution/src/core/CommitteeColdCredential.ts
diff --git a/packages/evolution/src/CommitteeHotCredential.ts b/packages/evolution/src/core/CommitteeHotCredential.ts
similarity index 100%
rename from packages/evolution/src/CommitteeHotCredential.ts
rename to packages/evolution/src/core/CommitteeHotCredential.ts
diff --git a/packages/evolution/src/Constitution.ts b/packages/evolution/src/core/Constitution.ts
similarity index 100%
rename from packages/evolution/src/Constitution.ts
rename to packages/evolution/src/core/Constitution.ts
diff --git a/packages/evolution/src/CostModel.ts b/packages/evolution/src/core/CostModel.ts
similarity index 100%
rename from packages/evolution/src/CostModel.ts
rename to packages/evolution/src/core/CostModel.ts
diff --git a/packages/evolution/src/Credential.ts b/packages/evolution/src/core/Credential.ts
similarity index 100%
rename from packages/evolution/src/Credential.ts
rename to packages/evolution/src/core/Credential.ts
diff --git a/packages/evolution/src/DRep.ts b/packages/evolution/src/core/DRep.ts
similarity index 100%
rename from packages/evolution/src/DRep.ts
rename to packages/evolution/src/core/DRep.ts
diff --git a/packages/evolution/src/DRepCredential.ts b/packages/evolution/src/core/DRepCredential.ts
similarity index 100%
rename from packages/evolution/src/DRepCredential.ts
rename to packages/evolution/src/core/DRepCredential.ts
diff --git a/packages/evolution/src/Data.ts b/packages/evolution/src/core/Data.ts
similarity index 100%
rename from packages/evolution/src/Data.ts
rename to packages/evolution/src/core/Data.ts
diff --git a/packages/evolution/src/DataJson.ts b/packages/evolution/src/core/DataJson.ts
similarity index 100%
rename from packages/evolution/src/DataJson.ts
rename to packages/evolution/src/core/DataJson.ts
diff --git a/packages/evolution/src/DatumOption.ts b/packages/evolution/src/core/DatumOption.ts
similarity index 100%
rename from packages/evolution/src/DatumOption.ts
rename to packages/evolution/src/core/DatumOption.ts
diff --git a/packages/evolution/src/DnsName.ts b/packages/evolution/src/core/DnsName.ts
similarity index 100%
rename from packages/evolution/src/DnsName.ts
rename to packages/evolution/src/core/DnsName.ts
diff --git a/packages/evolution/src/Ed25519Signature.ts b/packages/evolution/src/core/Ed25519Signature.ts
similarity index 100%
rename from packages/evolution/src/Ed25519Signature.ts
rename to packages/evolution/src/core/Ed25519Signature.ts
diff --git a/packages/evolution/src/EnterpriseAddress.ts b/packages/evolution/src/core/EnterpriseAddress.ts
similarity index 100%
rename from packages/evolution/src/EnterpriseAddress.ts
rename to packages/evolution/src/core/EnterpriseAddress.ts
diff --git a/packages/evolution/src/EpochNo.ts b/packages/evolution/src/core/EpochNo.ts
similarity index 100%
rename from packages/evolution/src/EpochNo.ts
rename to packages/evolution/src/core/EpochNo.ts
diff --git a/packages/evolution/src/FormatError.ts b/packages/evolution/src/core/FormatError.ts
similarity index 100%
rename from packages/evolution/src/FormatError.ts
rename to packages/evolution/src/core/FormatError.ts
diff --git a/packages/evolution/src/Function.ts b/packages/evolution/src/core/Function.ts
similarity index 100%
rename from packages/evolution/src/Function.ts
rename to packages/evolution/src/core/Function.ts
diff --git a/packages/evolution/src/GovernanceAction.ts b/packages/evolution/src/core/GovernanceAction.ts
similarity index 100%
rename from packages/evolution/src/GovernanceAction.ts
rename to packages/evolution/src/core/GovernanceAction.ts
diff --git a/packages/evolution/src/Hash28.ts b/packages/evolution/src/core/Hash28.ts
similarity index 90%
rename from packages/evolution/src/Hash28.ts
rename to packages/evolution/src/core/Hash28.ts
index c795346a..52567b4b 100644
--- a/packages/evolution/src/Hash28.ts
+++ b/packages/evolution/src/core/Hash28.ts
@@ -28,11 +28,11 @@ export class Hash28Error extends Data.TaggedError("Hash28Error")<{
 export const BYTES_LENGTH = 28
 
 export const BytesSchema = Schema.Uint8ArrayFromSelf.pipe(
-  Bytes.bytesLengthEquals(BYTES_LENGTH, `Hash${BYTES_LENGTH}.Hash${BYTES_LENGTH}`)
+  Bytes.bytesLengthEquals(BYTES_LENGTH)
 )
 
 export const HexSchema = Bytes.HexSchema.pipe(
-  Bytes.hexLengthEquals(BYTES_LENGTH, `Hash${BYTES_LENGTH}.Hex${BYTES_LENGTH}`)
+  Bytes.hexLengthEquals(BYTES_LENGTH)
 )
 
 /**
@@ -50,7 +50,7 @@ export const FromHex = Bytes.makeBytesTransformation({
 })
 
 export const VariableBytes = Schema.Uint8ArrayFromSelf.pipe(
-  Bytes.bytesLengthBetween(0, BYTES_LENGTH, `Hash${BYTES_LENGTH}.VariableHash${BYTES_LENGTH}`)
+  Bytes.bytesLengthBetween(0, BYTES_LENGTH)
 )
 
 /**
@@ -62,7 +62,7 @@ export const VariableBytes = Schema.Uint8ArrayFromSelf.pipe(
 export const VariableBytesFromHex = Bytes.makeBytesTransformation({
   id: `Hash${BYTES_LENGTH}.VariableHash${BYTES_LENGTH}FromHex`,
   stringSchema: Bytes.HexLenientSchema.pipe(
-    Bytes.hexLengthBetween(0, BYTES_LENGTH, `Hash${BYTES_LENGTH}.VariableHex${BYTES_LENGTH}`)
+    Bytes.hexLengthBetween(0, BYTES_LENGTH)
   ),
   uint8ArraySchema: VariableBytes,
   decode: Bytes.fromHexLenient,
diff --git a/packages/evolution/src/Header.ts b/packages/evolution/src/core/Header.ts
similarity index 100%
rename from packages/evolution/src/Header.ts
rename to packages/evolution/src/core/Header.ts
diff --git a/packages/evolution/src/HeaderBody.ts b/packages/evolution/src/core/HeaderBody.ts
similarity index 100%
rename from packages/evolution/src/HeaderBody.ts
rename to packages/evolution/src/core/HeaderBody.ts
diff --git a/packages/evolution/src/IPv4.ts b/packages/evolution/src/core/IPv4.ts
similarity index 100%
rename from packages/evolution/src/IPv4.ts
rename to packages/evolution/src/core/IPv4.ts
diff --git a/packages/evolution/src/IPv6.ts b/packages/evolution/src/core/IPv6.ts
similarity index 100%
rename from packages/evolution/src/IPv6.ts
rename to packages/evolution/src/core/IPv6.ts
diff --git a/packages/evolution/src/KESVkey.ts b/packages/evolution/src/core/KESVkey.ts
similarity index 100%
rename from packages/evolution/src/KESVkey.ts
rename to packages/evolution/src/core/KESVkey.ts
diff --git a/packages/evolution/src/KesSignature.ts b/packages/evolution/src/core/KesSignature.ts
similarity index 100%
rename from packages/evolution/src/KesSignature.ts
rename to packages/evolution/src/core/KesSignature.ts
diff --git a/packages/evolution/src/KeyHash.ts b/packages/evolution/src/core/KeyHash.ts
similarity index 100%
rename from packages/evolution/src/KeyHash.ts
rename to packages/evolution/src/core/KeyHash.ts
diff --git a/packages/evolution/src/Language.ts b/packages/evolution/src/core/Language.ts
similarity index 100%
rename from packages/evolution/src/Language.ts
rename to packages/evolution/src/core/Language.ts
diff --git a/packages/evolution/src/Metadata.ts b/packages/evolution/src/core/Metadata.ts
similarity index 100%
rename from packages/evolution/src/Metadata.ts
rename to packages/evolution/src/core/Metadata.ts
diff --git a/packages/evolution/src/Mint.ts b/packages/evolution/src/core/Mint.ts
similarity index 100%
rename from packages/evolution/src/Mint.ts
rename to packages/evolution/src/core/Mint.ts
diff --git a/packages/evolution/src/MultiAsset.ts b/packages/evolution/src/core/MultiAsset.ts
similarity index 100%
rename from packages/evolution/src/MultiAsset.ts
rename to packages/evolution/src/core/MultiAsset.ts
diff --git a/packages/evolution/src/MultiHostName.ts b/packages/evolution/src/core/MultiHostName.ts
similarity index 100%
rename from packages/evolution/src/MultiHostName.ts
rename to packages/evolution/src/core/MultiHostName.ts
diff --git a/packages/evolution/src/NativeScriptJSON.ts b/packages/evolution/src/core/NativeScriptJSON.ts
similarity index 100%
rename from packages/evolution/src/NativeScriptJSON.ts
rename to packages/evolution/src/core/NativeScriptJSON.ts
diff --git a/packages/evolution/src/NativeScripts.ts b/packages/evolution/src/core/NativeScripts.ts
similarity index 100%
rename from packages/evolution/src/NativeScripts.ts
rename to packages/evolution/src/core/NativeScripts.ts
diff --git a/packages/evolution/src/Natural.ts b/packages/evolution/src/core/Natural.ts
similarity index 100%
rename from packages/evolution/src/Natural.ts
rename to packages/evolution/src/core/Natural.ts
diff --git a/packages/evolution/src/Network.ts b/packages/evolution/src/core/Network.ts
similarity index 100%
rename from packages/evolution/src/Network.ts
rename to packages/evolution/src/core/Network.ts
diff --git a/packages/evolution/src/NetworkId.ts b/packages/evolution/src/core/NetworkId.ts
similarity index 91%
rename from packages/evolution/src/NetworkId.ts
rename to packages/evolution/src/core/NetworkId.ts
index fbf27881..05fa1560 100644
--- a/packages/evolution/src/NetworkId.ts
+++ b/packages/evolution/src/core/NetworkId.ts
@@ -18,7 +18,7 @@ export class NetworkIdError extends Data.TaggedError("NetworkIdError")<{
  * @since 2.0.0
  * @category schemas
  */
-export const NetworkId = Schema.NonNegativeInt.pipe(Schema.brand("NetworkId")).annotations({
+export const NetworkId = Schema.NonNegativeInt.annotations({
   identifier: "NetworkId"
 })
 
diff --git a/packages/evolution/src/NonZeroInt64.ts b/packages/evolution/src/core/NonZeroInt64.ts
similarity index 100%
rename from packages/evolution/src/NonZeroInt64.ts
rename to packages/evolution/src/core/NonZeroInt64.ts
diff --git a/packages/evolution/src/NonnegativeInterval.ts b/packages/evolution/src/core/NonnegativeInterval.ts
similarity index 100%
rename from packages/evolution/src/NonnegativeInterval.ts
rename to packages/evolution/src/core/NonnegativeInterval.ts
diff --git a/packages/evolution/src/Numeric.ts b/packages/evolution/src/core/Numeric.ts
similarity index 100%
rename from packages/evolution/src/Numeric.ts
rename to packages/evolution/src/core/Numeric.ts
diff --git a/packages/evolution/src/OperationalCert.ts b/packages/evolution/src/core/OperationalCert.ts
similarity index 100%
rename from packages/evolution/src/OperationalCert.ts
rename to packages/evolution/src/core/OperationalCert.ts
diff --git a/packages/evolution/src/PaymentAddress.ts b/packages/evolution/src/core/PaymentAddress.ts
similarity index 100%
rename from packages/evolution/src/PaymentAddress.ts
rename to packages/evolution/src/core/PaymentAddress.ts
diff --git a/packages/evolution/src/PlutusV1.ts b/packages/evolution/src/core/PlutusV1.ts
similarity index 100%
rename from packages/evolution/src/PlutusV1.ts
rename to packages/evolution/src/core/PlutusV1.ts
diff --git a/packages/evolution/src/PlutusV2.ts b/packages/evolution/src/core/PlutusV2.ts
similarity index 100%
rename from packages/evolution/src/PlutusV2.ts
rename to packages/evolution/src/core/PlutusV2.ts
diff --git a/packages/evolution/src/PlutusV3.ts b/packages/evolution/src/core/PlutusV3.ts
similarity index 100%
rename from packages/evolution/src/PlutusV3.ts
rename to packages/evolution/src/core/PlutusV3.ts
diff --git a/packages/evolution/src/Pointer.ts b/packages/evolution/src/core/Pointer.ts
similarity index 100%
rename from packages/evolution/src/Pointer.ts
rename to packages/evolution/src/core/Pointer.ts
diff --git a/packages/evolution/src/PointerAddress.ts b/packages/evolution/src/core/PointerAddress.ts
similarity index 100%
rename from packages/evolution/src/PointerAddress.ts
rename to packages/evolution/src/core/PointerAddress.ts
diff --git a/packages/evolution/src/PolicyId.ts b/packages/evolution/src/core/PolicyId.ts
similarity index 100%
rename from packages/evolution/src/PolicyId.ts
rename to packages/evolution/src/core/PolicyId.ts
diff --git a/packages/evolution/src/PoolKeyHash.ts b/packages/evolution/src/core/PoolKeyHash.ts
similarity index 100%
rename from packages/evolution/src/PoolKeyHash.ts
rename to packages/evolution/src/core/PoolKeyHash.ts
diff --git a/packages/evolution/src/PoolMetadata.ts b/packages/evolution/src/core/PoolMetadata.ts
similarity index 100%
rename from packages/evolution/src/PoolMetadata.ts
rename to packages/evolution/src/core/PoolMetadata.ts
diff --git a/packages/evolution/src/PoolParams.ts b/packages/evolution/src/core/PoolParams.ts
similarity index 100%
rename from packages/evolution/src/PoolParams.ts
rename to packages/evolution/src/core/PoolParams.ts
diff --git a/packages/evolution/src/Port.ts b/packages/evolution/src/core/Port.ts
similarity index 100%
rename from packages/evolution/src/Port.ts
rename to packages/evolution/src/core/Port.ts
diff --git a/packages/evolution/src/PositiveCoin.ts b/packages/evolution/src/core/PositiveCoin.ts
similarity index 100%
rename from packages/evolution/src/PositiveCoin.ts
rename to packages/evolution/src/core/PositiveCoin.ts
diff --git a/packages/evolution/src/PrivateKey.ts b/packages/evolution/src/core/PrivateKey.ts
similarity index 100%
rename from packages/evolution/src/PrivateKey.ts
rename to packages/evolution/src/core/PrivateKey.ts
diff --git a/packages/evolution/src/ProposalProcedure.ts b/packages/evolution/src/core/ProposalProcedure.ts
similarity index 100%
rename from packages/evolution/src/ProposalProcedure.ts
rename to packages/evolution/src/core/ProposalProcedure.ts
diff --git a/packages/evolution/src/ProposalProcedures.ts b/packages/evolution/src/core/ProposalProcedures.ts
similarity index 100%
rename from packages/evolution/src/ProposalProcedures.ts
rename to packages/evolution/src/core/ProposalProcedures.ts
diff --git a/packages/evolution/src/ProtocolParamUpdate.ts b/packages/evolution/src/core/ProtocolParamUpdate.ts
similarity index 100%
rename from packages/evolution/src/ProtocolParamUpdate.ts
rename to packages/evolution/src/core/ProtocolParamUpdate.ts
diff --git a/packages/evolution/src/ProtocolVersion.ts b/packages/evolution/src/core/ProtocolVersion.ts
similarity index 100%
rename from packages/evolution/src/ProtocolVersion.ts
rename to packages/evolution/src/core/ProtocolVersion.ts
diff --git a/packages/evolution/src/Redeemer.ts b/packages/evolution/src/core/Redeemer.ts
similarity index 100%
rename from packages/evolution/src/Redeemer.ts
rename to packages/evolution/src/core/Redeemer.ts
diff --git a/packages/evolution/src/Relay.ts b/packages/evolution/src/core/Relay.ts
similarity index 100%
rename from packages/evolution/src/Relay.ts
rename to packages/evolution/src/core/Relay.ts
diff --git a/packages/evolution/src/RewardAccount.ts b/packages/evolution/src/core/RewardAccount.ts
similarity index 100%
rename from packages/evolution/src/RewardAccount.ts
rename to packages/evolution/src/core/RewardAccount.ts
diff --git a/packages/evolution/src/RewardAddress.ts b/packages/evolution/src/core/RewardAddress.ts
similarity index 100%
rename from packages/evolution/src/RewardAddress.ts
rename to packages/evolution/src/core/RewardAddress.ts
diff --git a/packages/evolution/src/Script.ts b/packages/evolution/src/core/Script.ts
similarity index 92%
rename from packages/evolution/src/Script.ts
rename to packages/evolution/src/core/Script.ts
index 2205bd92..2c95cd28 100644
--- a/packages/evolution/src/Script.ts
+++ b/packages/evolution/src/core/Script.ts
@@ -1,6 +1,7 @@
 import { Data, Effect as Eff, FastCheck, ParseResult, Schema } from "effect"
 
 import * as CBOR from "./CBOR.js"
+import * as Function from "./Function.js"
 import * as NativeScripts from "./NativeScripts.js"
 import * as PlutusV1 from "./PlutusV1.js"
 import * as PlutusV2 from "./PlutusV2.js"
@@ -171,3 +172,8 @@ export const arbitrary: FastCheck.Arbitrary<Script> = FastCheck.oneof(
   PlutusV2.arbitrary,
   PlutusV3.arbitrary
 )
+
+export const fromCBOR = Function.makeCBORDecodeSync(FromCDDL, ScriptError, "Script.fromCBOR")
+export const fromCBORHex = Function.makeCBORDecodeHexSync(FromCDDL, ScriptError, "Script.fromCBORHex")
+export const toCBOR = Function.makeCBOREncodeSync(FromCDDL, ScriptError, "Script.toCBOR")
+export const toCBORHex = Function.makeCBOREncodeHexSync(FromCDDL, ScriptError, "Script.toCBORHex")
diff --git a/packages/evolution/src/ScriptDataHash.ts b/packages/evolution/src/core/ScriptDataHash.ts
similarity index 100%
rename from packages/evolution/src/ScriptDataHash.ts
rename to packages/evolution/src/core/ScriptDataHash.ts
diff --git a/packages/evolution/src/ScriptHash.ts b/packages/evolution/src/core/ScriptHash.ts
similarity index 70%
rename from packages/evolution/src/ScriptHash.ts
rename to packages/evolution/src/core/ScriptHash.ts
index 41530e35..75f69f5a 100644
--- a/packages/evolution/src/ScriptHash.ts
+++ b/packages/evolution/src/core/ScriptHash.ts
@@ -1,8 +1,11 @@
+import { blake2b } from "@noble/hashes/blake2"
 import { Data, FastCheck, Schema } from "effect"
 
 import * as Bytes from "./Bytes.js"
 import * as Function from "./Function.js"
 import * as Hash28 from "./Hash28.js"
+import * as NativeScripts from "./NativeScripts.js"
+import type * as Script from "./Script.js"
 
 /**
  * Error class for ScriptHash related operations.
@@ -135,6 +138,55 @@ export const toBytes = (scriptHash: ScriptHash): Uint8Array => new Uint8Array(sc
  */
 export const toHex = (scriptHash: ScriptHash): string => Bytes.toHex(scriptHash.hash)
 
+// ============================================================================
+// Script Hash Computation
+// ============================================================================
+
+/**
+ * Compute a script hash (policy id) from any Script variant.
+ *
+ * Conway-era rule: prepend a 1-byte language tag to the script bytes, then hash with blake2b-224.
+ * - 0x00: native/multisig (hash over CBOR of native_script)
+ * - 0x01: Plutus V1 (hash over raw script bytes)
+ * - 0x02: Plutus V2 (hash over raw script bytes)
+ * - 0x03: Plutus V3 (hash over raw script bytes)
+ *
+ * @since 2.0.0
+ * @category computation
+ */
+export const fromScript = (script: Script.Script): ScriptHash => {
+  // Native scripts use CBOR of native_script as body with 0x00 tag
+  if (!("_tag" in script)) {
+    const body = NativeScripts.toCBORBytes(script)
+    const prefixed = new Uint8Array(1 + body.length)
+    prefixed[0] = 0x00
+    prefixed.set(body, 1)
+    const hashBytes = blake2b(prefixed, { dkLen: 28 })
+    return make({ hash: new Uint8Array(hashBytes) }, { disableValidation: true })
+  }
+
+  // Plutus scripts use raw bytes with language-specific tag
+  let tag: number
+  let body: Uint8Array
+  if (script._tag === "PlutusV1") {
+    tag = 0x01
+    body = script.bytes
+  } else if (script._tag === "PlutusV2") {
+    tag = 0x02
+    body = script.bytes
+  } else {
+    // Remaining case is PlutusV3
+    tag = 0x03
+    body = script.bytes
+  }
+
+  const prefixed = new Uint8Array(1 + body.length)
+  prefixed[0] = tag
+  prefixed.set(body, 1)
+  const hashBytes = blake2b(prefixed, { dkLen: 28 })
+  return make({ hash: new Uint8Array(hashBytes) }, { disableValidation: true })
+}
+
 // ============================================================================
 // Either Namespace - Either-based Error Handling
 // ============================================================================
diff --git a/packages/evolution/src/ScriptRef.ts b/packages/evolution/src/core/ScriptRef.ts
similarity index 100%
rename from packages/evolution/src/ScriptRef.ts
rename to packages/evolution/src/core/ScriptRef.ts
diff --git a/packages/evolution/src/SingleHostAddr.ts b/packages/evolution/src/core/SingleHostAddr.ts
similarity index 100%
rename from packages/evolution/src/SingleHostAddr.ts
rename to packages/evolution/src/core/SingleHostAddr.ts
diff --git a/packages/evolution/src/SingleHostName.ts b/packages/evolution/src/core/SingleHostName.ts
similarity index 100%
rename from packages/evolution/src/SingleHostName.ts
rename to packages/evolution/src/core/SingleHostName.ts
diff --git a/packages/evolution/src/StakeReference.ts b/packages/evolution/src/core/StakeReference.ts
similarity index 100%
rename from packages/evolution/src/StakeReference.ts
rename to packages/evolution/src/core/StakeReference.ts
diff --git a/packages/evolution/src/TSchema.ts b/packages/evolution/src/core/TSchema.ts
similarity index 100%
rename from packages/evolution/src/TSchema.ts
rename to packages/evolution/src/core/TSchema.ts
diff --git a/packages/evolution/src/Text.ts b/packages/evolution/src/core/Text.ts
similarity index 100%
rename from packages/evolution/src/Text.ts
rename to packages/evolution/src/core/Text.ts
diff --git a/packages/evolution/src/Text128.ts b/packages/evolution/src/core/Text128.ts
similarity index 100%
rename from packages/evolution/src/Text128.ts
rename to packages/evolution/src/core/Text128.ts
diff --git a/packages/evolution/src/Transaction.ts b/packages/evolution/src/core/Transaction.ts
similarity index 100%
rename from packages/evolution/src/Transaction.ts
rename to packages/evolution/src/core/Transaction.ts
diff --git a/packages/evolution/src/TransactionBody.ts b/packages/evolution/src/core/TransactionBody.ts
similarity index 98%
rename from packages/evolution/src/TransactionBody.ts
rename to packages/evolution/src/core/TransactionBody.ts
index 7d952142..237fc8b5 100644
--- a/packages/evolution/src/TransactionBody.ts
+++ b/packages/evolution/src/core/TransactionBody.ts
@@ -463,7 +463,7 @@ export const isTransactionBody = Schema.is(TransactionBody)
 export const fromCBORBytes = Function.makeCBORDecodeSync(
   FromCDDL,
   TransactionBodyError,
-  "TransactionBody.fromCBORBytes",
+  "TransactionBody.fromCBORBytes"
 )
 
 /**
@@ -473,11 +473,7 @@ export const fromCBORBytes = Function.makeCBORDecodeSync(
  * @since 2.0.0
  * @category parsing
  */
-export const fromCBORHex = Function.makeCBORDecodeHexSync(
-  FromCDDL,
-  TransactionBodyError,
-  "TransactionBody.fromCBORHex",
-)
+export const fromCBORHex = Function.makeCBORDecodeHexSync(FromCDDL, TransactionBodyError, "TransactionBody.fromCBORHex")
 
 // ============================================================================
 // Encoding Functions
@@ -490,11 +486,7 @@ export const fromCBORHex = Function.makeCBORDecodeHexSync(
  * @since 2.0.0
  * @category encoding
  */
-export const toCBORBytes = Function.makeCBOREncodeSync(
-  FromCDDL,
-  TransactionBodyError,
-  "TransactionBody.toCBORBytes",
-)
+export const toCBORBytes = Function.makeCBOREncodeSync(FromCDDL, TransactionBodyError, "TransactionBody.toCBORBytes")
 
 /**
  * Convert a TransactionBody to CBOR hex string.
@@ -503,11 +495,7 @@ export const toCBORBytes = Function.makeCBOREncodeSync(
  * @since 2.0.0
  * @category encoding
  */
-export const toCBORHex = Function.makeCBOREncodeHexSync(
-  FromCDDL,
-  TransactionBodyError,
-  "TransactionBody.toCBORHex",
-)
+export const toCBORHex = Function.makeCBOREncodeHexSync(FromCDDL, TransactionBodyError, "TransactionBody.toCBORHex")
 
 // ============================================================================
 // Either Namespace - Either-based Error Handling
diff --git a/packages/evolution/src/TransactionHash.ts b/packages/evolution/src/core/TransactionHash.ts
similarity index 100%
rename from packages/evolution/src/TransactionHash.ts
rename to packages/evolution/src/core/TransactionHash.ts
diff --git a/packages/evolution/src/TransactionIndex.ts b/packages/evolution/src/core/TransactionIndex.ts
similarity index 100%
rename from packages/evolution/src/TransactionIndex.ts
rename to packages/evolution/src/core/TransactionIndex.ts
diff --git a/packages/evolution/src/TransactionInput.ts b/packages/evolution/src/core/TransactionInput.ts
similarity index 100%
rename from packages/evolution/src/TransactionInput.ts
rename to packages/evolution/src/core/TransactionInput.ts
diff --git a/packages/evolution/src/TransactionMetadatum.ts b/packages/evolution/src/core/TransactionMetadatum.ts
similarity index 100%
rename from packages/evolution/src/TransactionMetadatum.ts
rename to packages/evolution/src/core/TransactionMetadatum.ts
diff --git a/packages/evolution/src/TransactionMetadatumLabels.ts b/packages/evolution/src/core/TransactionMetadatumLabels.ts
similarity index 100%
rename from packages/evolution/src/TransactionMetadatumLabels.ts
rename to packages/evolution/src/core/TransactionMetadatumLabels.ts
diff --git a/packages/evolution/src/TransactionOutput.ts b/packages/evolution/src/core/TransactionOutput.ts
similarity index 93%
rename from packages/evolution/src/TransactionOutput.ts
rename to packages/evolution/src/core/TransactionOutput.ts
index cd6e2579..3ba5e6bf 100644
--- a/packages/evolution/src/TransactionOutput.ts
+++ b/packages/evolution/src/core/TransactionOutput.ts
@@ -1,9 +1,11 @@
 import { Data, Either as E, FastCheck, ParseResult, Schema } from "effect"
 
-import * as Address from "./Address.js"
+import * as AddressEras from "./AddressEras.js"
+import * as BaseAddress from "./BaseAddress.js"
 import * as Bytes from "./Bytes.js"
 import * as CBOR from "./CBOR.js"
 import * as DatumOption from "./DatumOption.js"
+import * as EnterpriseAddress from "./EnterpriseAddress.js"
 import * as Function from "./Function.js"
 import * as ScriptRef from "./ScriptRef.js"
 import * as Value from "./Value.js"
@@ -20,8 +22,8 @@ export class TransactionOutputError extends Data.TaggedError("TransactionOutputE
 }> {}
 
 // Pre-bind frequently used ParseResult helpers for hot paths
-const encAddress = ParseResult.encodeEither(Address.FromBytes)
-const decAddress = ParseResult.decodeUnknownEither(Address.FromBytes)
+const encAddress = ParseResult.encodeEither(AddressEras.FromBytes)
+const decAddress = ParseResult.decodeUnknownEither(Schema.Union(BaseAddress.FromBytes, EnterpriseAddress.FromBytes))
 const encValue = ParseResult.encodeEither(Value.FromCDDL)
 const decValue = ParseResult.decodeUnknownEither(Value.FromCDDL)
 const encDatumOption = ParseResult.encodeEither(DatumOption.FromCDDL)
@@ -44,7 +46,7 @@ const decScriptRef = ParseResult.decodeUnknownEither(ScriptRef.FromCDDL)
 export class ShelleyTransactionOutput extends Schema.TaggedClass<ShelleyTransactionOutput>()(
   "ShelleyTransactionOutput",
   {
-    address: Address.Address,
+    address: Schema.Union(BaseAddress.BaseAddress, EnterpriseAddress.EnterpriseAddress),
     amount: Value.Value,
     datumHash: Schema.optional(DatumOption.DatumHash)
   }
@@ -75,7 +77,7 @@ export class ShelleyTransactionOutput extends Schema.TaggedClass<ShelleyTransact
 export class BabbageTransactionOutput extends Schema.TaggedClass<BabbageTransactionOutput>()(
   "BabbageTransactionOutput",
   {
-    address: Address.Address, // 0
+    address: Schema.Union(BaseAddress.BaseAddress, EnterpriseAddress.EnterpriseAddress),
     amount: Value.Value, // 1
     datumOption: Schema.optional(DatumOption.DatumOptionSchema), // 2
     scriptRef: Schema.optional(ScriptRef.ScriptRef) // 3
@@ -139,13 +141,8 @@ export const FromShelleyTransactionOutputCDDLSchema = Schema.transformOrFail(
     decode: (fromI) =>
       E.gen(function* () {
         const [addressBytes, valueBytes, datumHashBytes] = fromI
-
-        // Validate addressBytes is a byte array before decoding (avoid instanceof)
-        if (Object.prototype.toString.call(addressBytes) !== "[object Uint8Array]") {
-          return yield* E.left(new ParseResult.Type(BabbageTransactionOutputCDDL.ast, fromI))
-        }
         const address = yield* decAddress(addressBytes)
-        const amount = yield* decValue(valueBytes as any)
+        const amount = yield* decValue(valueBytes)
         let datumHash: DatumOption.DatumHash | undefined
         if (datumHashBytes !== undefined) {
           datumHash = yield* decDatumHash(datumHashBytes)
@@ -286,14 +283,14 @@ export const equals = (a: TransactionOutput, b: TransactionOutput): boolean => {
   }
 
   if (a._tag === "ShelleyTransactionOutput" && b._tag === "ShelleyTransactionOutput") {
-    const addrEq = Address.equals(a.address, b.address)
+    const addrEq = AddressEras.equals(a.address, b.address)
     const amountEq = Value.equals(a.amount, b.amount)
     const datumEq = optionalEquals(a.datumHash, b.datumHash, DatumOption.equals)
     return addrEq && amountEq && datumEq
   }
 
   if (a._tag === "BabbageTransactionOutput" && b._tag === "BabbageTransactionOutput") {
-    const addrEq = Address.equals(a.address, b.address)
+    const addrEq = AddressEras.equals(a.address, b.address)
     const amountEq = Value.equals(a.amount, b.amount)
     const datumEq = optionalEquals(a.datumOption, b.datumOption, DatumOption.equals)
     const scriptEq = optionalEquals(a.scriptRef, b.scriptRef, ScriptRef.equals)
@@ -329,14 +326,14 @@ export const arbitrary = (): FastCheck.Arbitrary<TransactionOutput> =>
   FastCheck.oneof(
     // Shelley TransactionOutput
     FastCheck.record({
-      address: Address.arbitrary,
+      address: FastCheck.oneof(BaseAddress.arbitrary, EnterpriseAddress.arbitrary),
       amount: Value.arbitrary,
       datumHash: FastCheck.option(DatumOption.datumHashArbitrary, { nil: undefined })
     }).map((props) => new ShelleyTransactionOutput(props)),
 
     // Babbage TransactionOutput
     FastCheck.record({
-      address: Address.arbitrary,
+      address: FastCheck.oneof(BaseAddress.arbitrary, EnterpriseAddress.arbitrary),
       amount: Value.arbitrary,
       datumOption: FastCheck.option(DatumOption.arbitrary, { nil: undefined }),
       scriptRef: FastCheck.option(ScriptRef.arbitrary, { nil: undefined })
diff --git a/packages/evolution/src/TransactionWitnessSet.ts b/packages/evolution/src/core/TransactionWitnessSet.ts
similarity index 100%
rename from packages/evolution/src/TransactionWitnessSet.ts
rename to packages/evolution/src/core/TransactionWitnessSet.ts
diff --git a/packages/evolution/src/UnitInterval.ts b/packages/evolution/src/core/UnitInterval.ts
similarity index 100%
rename from packages/evolution/src/UnitInterval.ts
rename to packages/evolution/src/core/UnitInterval.ts
diff --git a/packages/evolution/src/Url.ts b/packages/evolution/src/core/Url.ts
similarity index 100%
rename from packages/evolution/src/Url.ts
rename to packages/evolution/src/core/Url.ts
diff --git a/packages/evolution/src/VKey.ts b/packages/evolution/src/core/VKey.ts
similarity index 100%
rename from packages/evolution/src/VKey.ts
rename to packages/evolution/src/core/VKey.ts
diff --git a/packages/evolution/src/Value.ts b/packages/evolution/src/core/Value.ts
similarity index 100%
rename from packages/evolution/src/Value.ts
rename to packages/evolution/src/core/Value.ts
diff --git a/packages/evolution/src/VotingProcedures.ts b/packages/evolution/src/core/VotingProcedures.ts
similarity index 100%
rename from packages/evolution/src/VotingProcedures.ts
rename to packages/evolution/src/core/VotingProcedures.ts
diff --git a/packages/evolution/src/VrfCert.ts b/packages/evolution/src/core/VrfCert.ts
similarity index 100%
rename from packages/evolution/src/VrfCert.ts
rename to packages/evolution/src/core/VrfCert.ts
diff --git a/packages/evolution/src/VrfKeyHash.ts b/packages/evolution/src/core/VrfKeyHash.ts
similarity index 100%
rename from packages/evolution/src/VrfKeyHash.ts
rename to packages/evolution/src/core/VrfKeyHash.ts
diff --git a/packages/evolution/src/VrfVkey.ts b/packages/evolution/src/core/VrfVkey.ts
similarity index 100%
rename from packages/evolution/src/VrfVkey.ts
rename to packages/evolution/src/core/VrfVkey.ts
diff --git a/packages/evolution/src/Withdrawals.ts b/packages/evolution/src/core/Withdrawals.ts
similarity index 100%
rename from packages/evolution/src/Withdrawals.ts
rename to packages/evolution/src/core/Withdrawals.ts
diff --git a/packages/evolution/src/index.ts b/packages/evolution/src/index.ts
index 470da154..36aacc98 100644
--- a/packages/evolution/src/index.ts
+++ b/packages/evolution/src/index.ts
@@ -1,116 +1,116 @@
-export * as Address from "./Address.js"
-export * as AddressDetails from "./AddressDetails.js"
-export * as AddressTag from "./AddressTag.js"
-export * as Anchor from "./Anchor.js"
-export * as AssetName from "./AssetName.js"
-export * as AuxiliaryData from "./AuxiliaryData.js"
-export * as AuxiliaryDataHash from "./AuxiliaryDataHash.js"
-export * as BaseAddress from "./BaseAddress.js"
-export * as Bech32 from "./Bech32.js"
-export * as BigInt from "./BigInt.js"
-export * as Bip32PrivateKey from "./Bip32PrivateKey.js"
-export * as Bip32PublicKey from "./Bip32PublicKey.js"
-export * as Block from "./Block.js"
-export * as BlockBodyHash from "./BlockBodyHash.js"
-export * as BlockHeaderHash from "./BlockHeaderHash.js"
-export * as BootstrapWitness from "./BootstrapWitness.js"
-export * as BoundedBytes from "./BoundedBytes.js"
-export * as ByronAddress from "./ByronAddress.js"
-export * as Bytes from "./Bytes.js"
-export * as Bytes4 from "./Bytes4.js"
-export * as Bytes16 from "./Bytes16.js"
-export * as Bytes29 from "./Bytes29.js"
-export * as Bytes32 from "./Bytes32.js"
-export * as Bytes57 from "./Bytes57.js"
-export * as Bytes64 from "./Bytes64.js"
-export * as Bytes80 from "./Bytes80.js"
-export * as Bytes96 from "./Bytes96.js"
-export * as Bytes128 from "./Bytes128.js"
-export * as Bytes448 from "./Bytes448.js"
-export * as CBOR from "./CBOR.js"
-export * as Certificate from "./Certificate.js"
-export * as Codec from "./Codec.js"
-export * as Coin from "./Coin.js"
-export * as Combinator from "./Combinator.js"
-export * as CommitteeColdCredential from "./CommitteeColdCredential.js"
-export * as CommitteeHotCredential from "./CommitteeHotCredential.js"
-export * as Constitution from "./Constitution.js"
-export * as Credential from "./Credential.js"
-export * as Data from "./Data.js"
+export * as AddressDetails from "./core/AddressDetails.js"
+export * as Address from "./core/AddressEras.js"
+export * as AddressTag from "./core/AddressTag.js"
+export * as Anchor from "./core/Anchor.js"
+export * as AssetName from "./core/AssetName.js"
+export * as AuxiliaryData from "./core/AuxiliaryData.js"
+export * as AuxiliaryDataHash from "./core/AuxiliaryDataHash.js"
+export * as BaseAddress from "./core/BaseAddress.js"
+export * as Bech32 from "./core/Bech32.js"
+export * as BigInt from "./core/BigInt.js"
+export * as Bip32PrivateKey from "./core/Bip32PrivateKey.js"
+export * as Bip32PublicKey from "./core/Bip32PublicKey.js"
+export * as Block from "./core/Block.js"
+export * as BlockBodyHash from "./core/BlockBodyHash.js"
+export * as BlockHeaderHash from "./core/BlockHeaderHash.js"
+export * as BootstrapWitness from "./core/BootstrapWitness.js"
+export * as BoundedBytes from "./core/BoundedBytes.js"
+export * as ByronAddress from "./core/ByronAddress.js"
+export * as Bytes from "./core/Bytes.js"
+export * as Bytes4 from "./core/Bytes4.js"
+export * as Bytes16 from "./core/Bytes16.js"
+export * as Bytes29 from "./core/Bytes29.js"
+export * as Bytes32 from "./core/Bytes32.js"
+export * as Bytes57 from "./core/Bytes57.js"
+export * as Bytes64 from "./core/Bytes64.js"
+export * as Bytes80 from "./core/Bytes80.js"
+export * as Bytes96 from "./core/Bytes96.js"
+export * as Bytes128 from "./core/Bytes128.js"
+export * as Bytes448 from "./core/Bytes448.js"
+export * as CBOR from "./core/CBOR.js"
+export * as Certificate from "./core/Certificate.js"
+export * as Codec from "./core/Codec.js"
+export * as Coin from "./core/Coin.js"
+export * as Combinator from "./core/Combinator.js"
+export * as CommitteeColdCredential from "./core/CommitteeColdCredential.js"
+export * as CommitteeHotCredential from "./core/CommitteeHotCredential.js"
+export * as Constitution from "./core/Constitution.js"
+export * as Credential from "./core/Credential.js"
+export * as Data from "./core/Data.js"
 // export * as DataJson from "./DataJson.js"  // Temporarily disabled due to cardano-multiplatform-lib dependency
-export * as DatumOption from "./DatumOption.js"
-export * as Devnet from "./Devnet/Devnet.js"
-export * as DevnetDefault from "./Devnet/DevnetDefault.js"
-export * as DnsName from "./DnsName.js"
-export * as DRep from "./DRep.js"
-export * as DRepCredential from "./DRepCredential.js"
-export * as Ed25519Signature from "./Ed25519Signature.js"
-export * as EnterpriseAddress from "./EnterpriseAddress.js"
-export * as EpochNo from "./EpochNo.js"
-export * as FormatError from "./FormatError.js"
-export * as GovernanceAction from "./GovernanceAction.js"
-export * as Hash28 from "./Hash28.js"
-export * as Header from "./Header.js"
-export * as HeaderBody from "./HeaderBody.js"
-export * as IPv4 from "./IPv4.js"
-export * as IPv6 from "./IPv6.js"
-export * as KesSignature from "./KesSignature.js"
-export * as KESVkey from "./KESVkey.js"
-export * as KeyHash from "./KeyHash.js"
-export * as Mint from "./Mint.js"
-export * as MultiAsset from "./MultiAsset.js"
-export * as MultiHostName from "./MultiHostName.js"
-export * as NativeScriptJSON from "./NativeScriptJSON.js"
-export * as NativeScripts from "./NativeScripts.js"
-export * as Natural from "./Natural.js"
-export * as Network from "./Network.js"
-export * as NetworkId from "./NetworkId.js"
-export * as NonZeroInt64 from "./NonZeroInt64.js"
-export * as Numeric from "./Numeric.js"
-export * as OperationalCert from "./OperationalCert.js"
-export * as PaymentAddress from "./PaymentAddress.js"
-export * as Pointer from "./Pointer.js"
-export * as PointerAddress from "./PointerAddress.js"
-export * as PolicyId from "./PolicyId.js"
-export * as PoolKeyHash from "./PoolKeyHash.js"
-export * as PoolMetadata from "./PoolMetadata.js"
-export * as PoolParams from "./PoolParams.js"
-export * as Port from "./Port.js"
-export * as PositiveCoin from "./PositiveCoin.js"
-export * as PrivateKey from "./PrivateKey.js"
-export * as ProposalProcedure from "./ProposalProcedure.js"
-export * as ProposalProcedures from "./ProposalProcedures.js"
-export * as ProtocolParamUpdate from "./ProtocolParamUpdate.js"
-export * as ProtocolVersion from "./ProtocolVersion.js"
-export * as Redeemer from "./Redeemer.js"
-export * as Relay from "./Relay.js"
-export * as RewardAccount from "./RewardAccount.js"
-export * as RewardAddress from "./RewardAddress.js"
-export * as Script from "./Script.js"
-export * as ScriptDataHash from "./ScriptDataHash.js"
-export * as ScriptHash from "./ScriptHash.js"
-export * as ScriptRef from "./ScriptRef.js"
-export * as SingleHostAddr from "./SingleHostAddr.js"
-export * as SingleHostName from "./SingleHostName.js"
-export * as StakeReference from "./StakeReference.js"
-export * as Text from "./Text.js"
-export * as Text128 from "./Text128.js"
-export * as Transaction from "./Transaction.js"
-export * as TransactionBody from "./TransactionBody.js"
-export * as TransactionHash from "./TransactionHash.js"
-export * as TransactionIndex from "./TransactionIndex.js"
-export * as TransactionInput from "./TransactionInput.js"
-export * as TransactionMetadatum from "./TransactionMetadatum.js"
-export * as TransactionMetadatumLabels from "./TransactionMetadatumLabels.js"
-export * as TransactionOutput from "./TransactionOutput.js"
-export * as TSchema from "./TSchema.js"
-export * as UnitInterval from "./UnitInterval.js"
-export * as Url from "./Url.js"
-export * as Value from "./Value.js"
-export * as VKey from "./VKey.js"
-export * as VotingProcedures from "./VotingProcedures.js"
-export * as VrfCert from "./VrfCert.js"
-export * as VrfKeyHash from "./VrfKeyHash.js"
-export * as VrfVkey from "./VrfVkey.js"
-export * as Withdrawals from "./Withdrawals.js"
+export * as DatumOption from "./core/DatumOption.js"
+export * as DnsName from "./core/DnsName.js"
+export * as DRep from "./core/DRep.js"
+export * as DRepCredential from "./core/DRepCredential.js"
+export * as Ed25519Signature from "./core/Ed25519Signature.js"
+export * as EnterpriseAddress from "./core/EnterpriseAddress.js"
+export * as EpochNo from "./core/EpochNo.js"
+export * as FormatError from "./core/FormatError.js"
+export * as GovernanceAction from "./core/GovernanceAction.js"
+export * as Hash28 from "./core/Hash28.js"
+export * as Header from "./core/Header.js"
+export * as HeaderBody from "./core/HeaderBody.js"
+export * as IPv4 from "./core/IPv4.js"
+export * as IPv6 from "./core/IPv6.js"
+export * as KesSignature from "./core/KesSignature.js"
+export * as KESVkey from "./core/KESVkey.js"
+export * as KeyHash from "./core/KeyHash.js"
+export * as Mint from "./core/Mint.js"
+export * as MultiAsset from "./core/MultiAsset.js"
+export * as MultiHostName from "./core/MultiHostName.js"
+export * as NativeScriptJSON from "./core/NativeScriptJSON.js"
+export * as NativeScripts from "./core/NativeScripts.js"
+export * as Natural from "./core/Natural.js"
+export * as Network from "./core/Network.js"
+export * as NetworkId from "./core/NetworkId.js"
+export * as NonZeroInt64 from "./core/NonZeroInt64.js"
+export * as Numeric from "./core/Numeric.js"
+export * as OperationalCert from "./core/OperationalCert.js"
+export * as PaymentAddress from "./core/PaymentAddress.js"
+export * as Pointer from "./core/Pointer.js"
+export * as PointerAddress from "./core/PointerAddress.js"
+export * as PolicyId from "./core/PolicyId.js"
+export * as PoolKeyHash from "./core/PoolKeyHash.js"
+export * as PoolMetadata from "./core/PoolMetadata.js"
+export * as PoolParams from "./core/PoolParams.js"
+export * as Port from "./core/Port.js"
+export * as PositiveCoin from "./core/PositiveCoin.js"
+export * as PrivateKey from "./core/PrivateKey.js"
+export * as ProposalProcedure from "./core/ProposalProcedure.js"
+export * as ProposalProcedures from "./core/ProposalProcedures.js"
+export * as ProtocolParamUpdate from "./core/ProtocolParamUpdate.js"
+export * as ProtocolVersion from "./core/ProtocolVersion.js"
+export * as Redeemer from "./core/Redeemer.js"
+export * as Relay from "./core/Relay.js"
+export * as RewardAccount from "./core/RewardAccount.js"
+export * as RewardAddress from "./core/RewardAddress.js"
+export * as Script from "./core/Script.js"
+export * as ScriptDataHash from "./core/ScriptDataHash.js"
+export * as ScriptHash from "./core/ScriptHash.js"
+export * as ScriptRef from "./core/ScriptRef.js"
+export * as SingleHostAddr from "./core/SingleHostAddr.js"
+export * as SingleHostName from "./core/SingleHostName.js"
+export * as StakeReference from "./core/StakeReference.js"
+export * as Text from "./core/Text.js"
+export * as Text128 from "./core/Text128.js"
+export * as Transaction from "./core/Transaction.js"
+export * as TransactionBody from "./core/TransactionBody.js"
+export * as TransactionHash from "./core/TransactionHash.js"
+export * as TransactionIndex from "./core/TransactionIndex.js"
+export * as TransactionInput from "./core/TransactionInput.js"
+export * as TransactionMetadatum from "./core/TransactionMetadatum.js"
+export * as TransactionMetadatumLabels from "./core/TransactionMetadatumLabels.js"
+export * as TransactionOutput from "./core/TransactionOutput.js"
+export * as TSchema from "./core/TSchema.js"
+export * as UnitInterval from "./core/UnitInterval.js"
+export * as Url from "./core/Url.js"
+export * as Value from "./core/Value.js"
+export * as VKey from "./core/VKey.js"
+export * as VotingProcedures from "./core/VotingProcedures.js"
+export * as VrfCert from "./core/VrfCert.js"
+export * as VrfKeyHash from "./core/VrfKeyHash.js"
+export * as VrfVkey from "./core/VrfVkey.js"
+export * as Withdrawals from "./core/Withdrawals.js"
+export * as Devnet from "./sdk/Devnet/Devnet.js"
+export * as DevnetDefault from "./sdk/Devnet/DevnetDefault.js"
 export { Effect, Either, pipe, Schema } from "effect"
diff --git a/packages/evolution/src/sdk/Address.ts b/packages/evolution/src/sdk/Address.ts
new file mode 100644
index 00000000..3640d290
--- /dev/null
+++ b/packages/evolution/src/sdk/Address.ts
@@ -0,0 +1,52 @@
+import * as CoreAddressStructure from "../core/AddressStructure.js"
+import * as Credential from "./Credential.js"
+
+// bech32
+export type Address = string
+
+export const toCoreAddress = (address: Address): CoreAddressStructure.AddressStructure =>
+  CoreAddressStructure.fromBech32(address)
+
+export const fromCoreAddress = (address: CoreAddressStructure.AddressStructure): Address =>
+  CoreAddressStructure.toBech32(address)
+
+export const withCredentials = ({
+  network,
+  paymentCredential,
+  stakingCredential
+}: {
+  network: "Mainnet" | "Testnet"
+  paymentCredential: Credential.Credential
+  stakingCredential?: Credential.Credential
+}) => {
+  const coreAddress = new CoreAddressStructure.AddressStructure({
+    networkId: network === "Mainnet" ? 1 : 0, // Fix: 1 for Mainnet, 0 for Testnet
+    paymentCredential: Credential.toCoreCredential(paymentCredential),
+    stakingCredential: stakingCredential ? Credential.toCoreCredential(stakingCredential) : undefined
+  })
+  return CoreAddressStructure.toBech32(coreAddress)
+}
+
+/**
+ * Create an enterprise address (payment only) from a payment credential.
+ * An enterprise address has only a payment credential and no staking credential.
+ * 
+ * @example
+ * ```typescript
+ * const credential = { type: "Key", hash: "abcd1234..." }
+ * const address = fromPaymentCredential(credential, "Mainnet")
+ * // Returns: "addr1w9rlm65wjfkctdlyxl5cw87h9...
+ * ```
+ */
+export const fromPaymentCredential = (
+  paymentCredential: Credential.Credential,
+  network: Credential.Network = "Mainnet"
+): Address => {
+  const coreAddress = new CoreAddressStructure.AddressStructure({
+    networkId: network === "Mainnet" ? 1 : 0,
+    paymentCredential: Credential.toCoreCredential(paymentCredential),
+    // No staking credential for enterprise addresses
+    stakingCredential: undefined
+  })
+  return CoreAddressStructure.toBech32(coreAddress)
+}
diff --git a/packages/evolution/src/sdk/Assets.ts b/packages/evolution/src/sdk/Assets.ts
new file mode 100644
index 00000000..8d8ea4c7
--- /dev/null
+++ b/packages/evolution/src/sdk/Assets.ts
@@ -0,0 +1,135 @@
+export interface Assets {
+  lovelace: bigint
+  [key: string]: bigint
+}
+
+// Constructor and factory functions
+export const make = (lovelace: bigint, tokens: Record<string, bigint> = {}): Assets => ({
+  lovelace,
+  ...tokens
+})
+
+export const fromLovelace = (lovelace: bigint): Assets => ({
+  lovelace
+})
+
+export const empty = (): Assets => ({
+  lovelace: 0n
+})
+
+// Utility functions
+export const add = (a: Assets, b: Assets): Assets => {
+  const result: Record<string, bigint> = { lovelace: a.lovelace + b.lovelace }
+
+  // Add all tokens from a
+  for (const [unit, amount] of Object.entries(a)) {
+    if (unit !== "lovelace") {
+      result[unit] = amount
+    }
+  }
+
+  // Add all tokens from b
+  for (const [unit, amount] of Object.entries(b)) {
+    if (unit !== "lovelace") {
+      result[unit] = (result[unit] || 0n) + amount
+    }
+  }
+
+  return result as Assets
+}
+
+export const subtract = (a: Assets, b: Assets): Assets => {
+  const result: Record<string, bigint> = { lovelace: a.lovelace - b.lovelace }
+
+  // Add all tokens from a
+  for (const [unit, amount] of Object.entries(a)) {
+    if (unit !== "lovelace") {
+      result[unit] = amount
+    }
+  }
+
+  // Subtract all tokens from b
+  for (const [unit, amount] of Object.entries(b)) {
+    if (unit !== "lovelace") {
+      const current = result[unit] || 0n
+      const newAmount = current - amount
+      if (newAmount > 0n) {
+        result[unit] = newAmount
+      } else if (newAmount === 0n) {
+        delete result[unit]
+      } else {
+        result[unit] = newAmount // Allow negative for validation purposes
+      }
+    }
+  }
+
+  return result as Assets
+}
+
+export const merge = (...assets: Array<Assets>): Assets => assets.reduce(add, empty())
+
+export const filter = (assets: Assets, predicate: (unit: string, amount: bigint) => boolean): Assets => {
+  const result: Record<string, bigint> = { lovelace: assets.lovelace }
+
+  for (const [unit, amount] of Object.entries(assets)) {
+    if (unit !== "lovelace" && predicate(unit, amount)) {
+      result[unit] = amount
+    }
+  }
+
+  return result as Assets
+}
+
+// Conversion and validation helpers
+export const getAsset = (assets: Assets, unit: string): bigint => {
+  if (unit === "lovelace") return assets.lovelace
+  return assets[unit] || 0n
+}
+
+export const hasAsset = (assets: Assets, unit: string): boolean => {
+  if (unit === "lovelace") return assets.lovelace > 0n
+  return unit in assets && assets[unit] > 0n
+}
+
+export const isValid = (assets: Assets): boolean => {
+  try {
+    // Check if it has required lovelace field and all values are bigint
+    if (typeof assets.lovelace !== "bigint") return false
+    for (const [unit, amount] of Object.entries(assets)) {
+      if (unit !== "lovelace" && typeof amount !== "bigint") return false
+    }
+    return true
+  } catch {
+    return false
+  }
+}
+
+export const isEmpty = (assets: Assets): boolean => {
+  if (assets.lovelace > 0n) return false
+  for (const [unit, amount] of Object.entries(assets)) {
+    if (unit !== "lovelace" && amount > 0n) return false
+  }
+  return true
+}
+
+export const getUnits = (assets: Assets): Array<string> => {
+  const units = ["lovelace"]
+  for (const unit of Object.keys(assets)) {
+    if (unit !== "lovelace") units.push(unit)
+  }
+  return units
+}
+
+// String representation
+export const toString = (assets: Assets): string => {
+  const tokens = []
+  tokens.push(`lovelace: ${assets.lovelace.toString()}`)
+
+  for (const [unit, amount] of Object.entries(assets)) {
+    if (unit !== "lovelace") {
+      tokens.push(`${unit}: ${amount.toString()}`)
+    }
+  }
+
+  return `{ ${tokens.join(", ")} }`
+}
diff --git a/packages/evolution/src/sdk/Credential.ts b/packages/evolution/src/sdk/Credential.ts
new file mode 100644
index 00000000..3f3ca1a3
--- /dev/null
+++ b/packages/evolution/src/sdk/Credential.ts
@@ -0,0 +1,42 @@
+import { fromHex } from "../core/Bytes.js"
+import * as CoreCredential from "../core/Credential.js"
+
+export type ScriptHash = {
+  type: "Script"
+  hash: string // hex string
+}
+
+export type KeyHash = {
+  type: "Key"
+  hash: string // hex string
+}
+
+export type Credential = ScriptHash | KeyHash
+
+export type Network = "Mainnet" | "Testnet"
+
+export const toCoreCredential = (credential: Credential): CoreCredential.Credential => {
+  if (credential.type === "Key") {
+    return CoreCredential.Credential.members[0].make({
+      hash: fromHex(credential.hash)
+    })
+  } else {
+    return CoreCredential.Credential.members[1].make({
+      hash: fromHex(credential.hash)
+    })
+  }
+}
+
+export const fromCoreCredential = (credential: CoreCredential.Credential): Credential => {
+  if (credential._tag === "KeyHash") {
+    return {
+      type: "Key",
+      hash: credential.toString()
+    }
+  } else {
+    return {
+      type: "Script",
+      hash: credential.toString()
+    }
+  }
+}
diff --git a/packages/evolution/src/Devnet/Devnet.ts b/packages/evolution/src/sdk/Devnet/Devnet.ts
similarity index 100%
rename from packages/evolution/src/Devnet/Devnet.ts
rename to packages/evolution/src/sdk/Devnet/Devnet.ts
diff --git a/packages/evolution/src/Devnet/Devnet.ts.bak b/packages/evolution/src/sdk/Devnet/Devnet.ts.bak
similarity index 100%
rename from packages/evolution/src/Devnet/Devnet.ts.bak
rename to packages/evolution/src/sdk/Devnet/Devnet.ts.bak
diff --git a/packages/evolution/src/Devnet/DevnetDefault.ts b/packages/evolution/src/sdk/Devnet/DevnetDefault.ts
similarity index 100%
rename from packages/evolution/src/Devnet/DevnetDefault.ts
rename to packages/evolution/src/sdk/Devnet/DevnetDefault.ts
diff --git a/packages/evolution/src/Devnet/DevnetDefault.ts.bak b/packages/evolution/src/sdk/Devnet/DevnetDefault.ts.bak
similarity index 100%
rename from packages/evolution/src/Devnet/DevnetDefault.ts.bak
rename to packages/evolution/src/sdk/Devnet/DevnetDefault.ts.bak
diff --git a/packages/evolution/src/sdk/Script.ts b/packages/evolution/src/sdk/Script.ts
new file mode 100644
index 00000000..8280b177
--- /dev/null
+++ b/packages/evolution/src/sdk/Script.ts
@@ -0,0 +1,112 @@
+import { pipe } from "effect"
+
+import * as CoreScript from "../core/Script.js"
+import * as CoreScriptHash from "../core/ScriptHash.js"
+import type * as Credential from "./Credential.js"
+
+export type Native = {
+  type: "Native"
+  script: string // CBOR hex string
+}
+
+export type PlutusV1 = {
+  type: "PlutusV1"
+  script: string // CBOR hex string
+}
+
+export type PlutusV2 = {
+  type: "PlutusV2"
+  script: string // CBOR hex string
+}
+
+export type PlutusV3 = {
+  type: "PlutusV3"
+  script: string // CBOR hex string
+}
+
+export type Script = Native | PlutusV1 | PlutusV2 | PlutusV3
+
+// Additional specific types
+export type Validator = Script
+export type SpendingValidator = Script
+export type MintingPolicy = Script
+export type PolicyId = string // hex string
+
+/**
+ * Convert user-facing Script to strict Script type for hash computation.
+ */
+const toCoreScript = (script: Script): CoreScript.Script => {
+  const strict = CoreScript.fromCBORHex(script.script)
+
+  switch (script.type) {
+    case "Native": {
+      // Native scripts are the union members without a `_tag` property
+      if ("_tag" in strict) {
+        throw new Error("Script type mismatch: expected Native")
+      }
+      return strict
+    }
+    case "PlutusV1": {
+      if ("_tag" in strict && strict._tag === "PlutusV1") return strict
+      break
+    }
+    case "PlutusV2": {
+      if ("_tag" in strict && strict._tag === "PlutusV2") return strict
+      break
+    }
+    case "PlutusV3": {
+      if ("_tag" in strict && strict._tag === "PlutusV3") return strict
+      break
+    }
+  }
+
+  throw new Error(`Script type mismatch: expected ${script.type}`)
+}
+
+/**
+ * Compute the hash of a script.
+ *
+ * Cardano script hashes use blake2b-224 (28 bytes) with tag prefixes:
+ * - Native scripts: tag 0
+ * - PlutusV1 scripts: tag 1
+ * - PlutusV2 scripts: tag 2
+ * - PlutusV3 scripts: tag 3
+ */
+export const toScriptHash = (script: Script): Credential.ScriptHash =>
+  pipe(toCoreScript(script), CoreScriptHash.fromScript, CoreScriptHash.toHex, (hash) => ({
+    type: "Script",
+    hash
+  }))
+
+// Constructor Functions
+export const makeNativeScript = (cbor: string): Native => ({
+  type: "Native",
+  script: cbor
+})
+
+export const makePlutusV1Script = (cbor: string): PlutusV1 => ({
+  type: "PlutusV1",
+  script: cbor
+})
+
+export const makePlutusV2Script = (cbor: string): PlutusV2 => ({
+  type: "PlutusV2",
+  script: cbor
+})
+
+export const makePlutusV3Script = (cbor: string): PlutusV3 => ({
+  type: "PlutusV3",
+  script: cbor
+})
+
+export const scriptEquals = (a: Script, b: Script): boolean => a.type === b.type && a.script === b.script
+
+// ============================================================================
+// Script Hash Generation
+// ============================================================================
+
+/**
+ * Compute the policy ID for a minting policy script.
+ * The policy ID is identical to the script hash.
+ */
+export const mintingPolicyToId = (script: Script): Credential.ScriptHash => toScriptHash(script)
diff --git a/packages/evolution/src/sdk/UTxO.ts b/packages/evolution/src/sdk/UTxO.ts
new file mode 100644
index 00000000..428a2f6b
--- /dev/null
+++ b/packages/evolution/src/sdk/UTxO.ts
@@ -0,0 +1,182 @@
+import * as Assets from "./Assets.js"
+
+export type Datum =
+  | {
+      hash: string
+    }
+  | {
+      inline: string
+    }
+  | undefined
+
+export interface OutRef {
+  txHash: string
+  outputIndex: number
+}
+
+export interface UTxO {
+  txHash: string
+  outputIndex: number
+  address: string
+  assets: Assets.Assets
+  datumOption?: Datum
+  scriptRef?: string
+}
+
+export const hasAssets = (utxo: UTxO): boolean => !Assets.isEmpty(utxo.assets)
+
+export const hasLovelace = (utxo: UTxO): boolean => Assets.getAsset(utxo.assets, "lovelace") > 0n
+
+export const getLovelace = (utxo: UTxO): bigint => Assets.getAsset(utxo.assets, "lovelace")
+
+export const hasNativeTokens = (utxo: UTxO): boolean => {
+  const units = Assets.getUnits(utxo.assets)
+  return units.length > 1 || (units.length === 1 && units[0] !== "lovelace")
+}
+
+export const hasDatum = (utxo: UTxO): boolean => utxo.datumOption !== undefined
+
+export const hasScript = (utxo: UTxO): boolean => utxo.scriptRef !== undefined
+
+// OutRef operations
+export const getOutRef = (utxo: UTxO): OutRef => ({
+  txHash: utxo.txHash,
+  outputIndex: utxo.outputIndex
+})
+
+export const outRefEquals = (a: OutRef, b: OutRef): boolean => a.txHash === b.txHash && a.outputIndex === b.outputIndex
+
+export const outRefToString = (outRef: OutRef): string => `${outRef.txHash}#${outRef.outputIndex}`
+
+export const makeOutRef = (txHash: string, outputIndex: number): OutRef => ({
+  txHash,
+  outputIndex
+})
+
+// Datum type guards and utilities
+export const isDatumHash = (datum: Datum): datum is { hash: string } => datum !== undefined && "hash" in datum
+
+export const isInlineDatum = (datum: Datum): datum is { inline: string } => datum !== undefined && "inline" in datum
+
+export const getDatumHash = (utxo: UTxO): string | undefined =>
+  isDatumHash(utxo.datumOption) ? utxo.datumOption.hash : undefined
+
+export const getInlineDatum = (utxo: UTxO): string | undefined =>
+  isInlineDatum(utxo.datumOption) ? utxo.datumOption.inline : undefined
+
+// Value operations
+export const getValue = (utxo: UTxO): Assets.Assets => utxo.assets
+
+export const withAssets = (utxo: UTxO, assets: Assets.Assets): UTxO => ({
+  ...utxo,
+  assets
+})
+
+export const addAssets = (utxo: UTxO, assets: Assets.Assets): UTxO => withAssets(utxo, Assets.add(utxo.assets, assets))
+
+export const subtractAssets = (utxo: UTxO, assets: Assets.Assets): UTxO =>
+  withAssets(utxo, Assets.subtract(utxo.assets, assets))
+
+// Datum operations
+export const withDatum = (utxo: UTxO, datumOption: Datum): UTxO => ({
+  ...utxo,
+  datumOption
+})
+
+export const withoutDatum = (utxo: UTxO): UTxO => ({
+  ...utxo,
+  datumOption: undefined
+})
+
+// Script operations
+export const withScript = (utxo: UTxO, scriptRef: string): UTxO => ({
+  ...utxo,
+  scriptRef
+})
+
+export const withoutScript = (utxo: UTxO): UTxO => ({
+  ...utxo,
+  scriptRef: undefined
+})
+
+// UTxO Collection utilities
+export type UTxOSet = Array<UTxO>
+
+export const fromArray = (utxos: Array<UTxO>): UTxOSet => utxos
+
+export const toArray = (utxoSet: UTxOSet): Array<UTxO> => utxoSet
+
+export const filterByAddress = (utxoSet: UTxOSet, address: string): UTxOSet =>
+  utxoSet.filter((utxo) => utxo.address === address)
+
+export const filterByAsset = (utxoSet: UTxOSet, unit: string): UTxOSet =>
+  utxoSet.filter((utxo) => Assets.hasAsset(utxo.assets, unit))
+
+export const filterByMinLovelace = (utxoSet: UTxOSet, minLovelace: bigint): UTxOSet =>
+  utxoSet.filter((utxo) => getLovelace(utxo) >= minLovelace)
+
+export const filterWithDatum = (utxoSet: UTxOSet): UTxOSet => utxoSet.filter(hasDatum)
+
+export const filterWithScript = (utxoSet: UTxOSet): UTxOSet => utxoSet.filter(hasScript)
+
+export const sortByLovelace = (utxoSet: UTxOSet, ascending = true): UTxOSet =>
+  [...utxoSet].sort((a, b) => {
+    const diff = getLovelace(a) - getLovelace(b)
+    return ascending ? Number(diff) : Number(-diff)
+  })
+
+export const getTotalAssets = (utxoSet: UTxOSet): Assets.Assets =>
+  utxoSet.reduce((total, utxo) => Assets.add(total, utxo.assets), Assets.empty())
+
+export const getTotalLovelace = (utxoSet: UTxOSet): bigint =>
+  utxoSet.reduce((total, utxo) => total + getLovelace(utxo), 0n)
+
+export const findByOutRef = (utxoSet: UTxOSet, outRef: OutRef): UTxO | undefined =>
+  utxoSet.find((utxo) => outRefEquals(getOutRef(utxo), outRef))
+
+export const removeByOutRef = (utxoSet: UTxOSet, outRef: OutRef): UTxOSet =>
+  utxoSet.filter((utxo) => !outRefEquals(getOutRef(utxo), outRef))
+
+export const isEmpty = (utxoSet: UTxOSet): boolean => utxoSet.length === 0
+
+export const size = (utxoSet: UTxOSet): number => utxoSet.length
+
+// UTxO Set operations
+export const union = (setA: UTxOSet, setB: UTxOSet): UTxOSet => {
+  const result = [...setA]
+  for (const utxo of setB) {
+    if (!findByOutRef(result, getOutRef(utxo))) {
+      result.push(utxo)
+    }
+  }
+  return result
+}
+
+export const intersection = (setA: UTxOSet, setB: UTxOSet): UTxOSet =>
+  setA.filter((utxoA) => findByOutRef(setB, getOutRef(utxoA)) !== undefined)
+
+export const difference = (setA: UTxOSet, setB: UTxOSet): UTxOSet =>
+  setA.filter((utxoA) => findByOutRef(setB, getOutRef(utxoA)) === undefined)
+
+// Enhanced collection utilities
+export const find = (utxos: UTxOSet, predicate: (utxo: UTxO) => boolean): UTxO | undefined => utxos.find(predicate)
+
+export const filter = (utxos: UTxOSet, predicate: (utxo: UTxO) => boolean): UTxOSet => utxos.filter(predicate)
+
+export const map = <T>(utxos: UTxOSet, mapper: (utxo: UTxO) => T): Array<T> => utxos.map(mapper)
+
+export const reduce = <T>(utxos: UTxOSet, reducer: (acc: T, utxo: UTxO) => T, initial: T): T =>
+  utxos.reduce(reducer, initial)
+
+// Specialized finders
+export const findByAddress = (utxos: UTxOSet, address: string): UTxOSet =>
+  filter(utxos, (utxo) => utxo.address === address)
+
+export const findWithDatumHash = (utxos: UTxOSet, hash: string): UTxOSet =>
+  filter(utxos, (utxo) => getDatumHash(utxo) === hash)
+
+export const findWithMinLovelace = (utxos: UTxOSet, minLovelace: bigint): UTxOSet =>
+  filter(utxos, (utxo) => getLovelace(utxo) >= minLovelace)
+
+// Equals utility
+export const equals = (a: UTxO, b: UTxO): boolean => outRefEquals(getOutRef(a), getOutRef(b))
diff --git a/packages/evolution/src/sdk/provider/Kupmios.ts b/packages/evolution/src/sdk/provider/Kupmios.ts
new file mode 100644
index 00000000..19801f90
--- /dev/null
+++ b/packages/evolution/src/sdk/provider/Kupmios.ts
@@ -0,0 +1,332 @@
+import { FetchHttpClient } from "@effect/platform"
+import { Effect, Layer, pipe, Schedule, Schema } from "effect"
+
+import type * as Address from "../../core/AddressEras.js"
+import type * as BaseAddress from "../../core/BaseAddress.js"
+import { fromHex } from "../../core/Bytes.js"
+import type * as Credential from "../../core/Credential.js"
+import * as Data from "../../core/Data.js"
+import * as DatumOption from "../../core/DatumOption.js"
+import type * as EnterpriseAddress from "../../core/EnterpriseAddress.js"
+import type { TransactionHash } from "../../core/TransactionHash.js"
+import type * as Assets from "../../sdk/Assets.js"
+import type * as UTxO from "../../sdk/UTxO.js"
+import * as HttpUtils from "./internal/HttpUtils.js"
+import * as Kupo from "./internal/Kupo.js"
+import * as Ogmios from "./internal/Ogmios.js"
+import type { Provider } from "./Provider.js"
+import { ProviderError, ProviderService } from "./Provider.js"
+import type { ProtocolParameters } from "./types.js"
+
+const TIMEOUT = 10_000
+
+export const toProtocolParameters = (result: Ogmios.ProtocolParameters): ProtocolParameters => {
+  return {
+    minFeeA: result.minFeeCoefficient,
+    minFeeB: result.minFeeConstant.ada.lovelace,
+    maxTxSize: result.maxTransactionSize.bytes,
+    maxValSize: result.maxValueSize.bytes,
+    keyDeposit: BigInt(result.stakeCredentialDeposit.ada.lovelace),
+    poolDeposit: BigInt(result.stakePoolDeposit.ada.lovelace),
+    drepDeposit: BigInt(result.delegateRepresentativeDeposit.ada.lovelace),
+    govActionDeposit: BigInt(result.governanceActionDeposit.ada.lovelace),
+    priceMem: result.scriptExecutionPrices.memory[0] / result.scriptExecutionPrices.memory[1],
+    priceStep: result.scriptExecutionPrices.cpu[0] / result.scriptExecutionPrices.cpu[1],
+    maxTxExMem: BigInt(result.maxExecutionUnitsPerTransaction.memory),
+    maxTxExSteps: BigInt(result.maxExecutionUnitsPerTransaction.cpu),
+    // NOTE: coinsPerUtxoByte is now called utxoCostPerByte:
+    // https://github.com/IntersectMBO/cardano-node/pull/4141
+    // Ogmios v6.x calls it minUtxoDepositCoefficient according to the following
+    // documentation from its protocol parameters data model:
+    // https://github.com/CardanoSolutions/ogmios/blob/master/architectural-decisions/accepted/017-api-version-6-major-rewrite.md#protocol-parameters
+    coinsPerUtxoByte: BigInt(result.minUtxoDepositCoefficient),
+    collateralPercentage: result.collateralPercentage,
+    maxCollateralInputs: result.maxCollateralInputs,
+    minFeeRefScriptCostPerByte: result.minFeeReferenceScripts.base,
+    costModels: {
+      PlutusV1: Object.fromEntries(
+        result.plutusCostModels["plutus:v1"].map((value, index) => [index.toString(), value])
+      ),
+      PlutusV2: Object.fromEntries(
+        result.plutusCostModels["plutus:v2"].map((value, index) => [index.toString(), value])
+      ),
+      PlutusV3: Object.fromEntries(
+        result.plutusCostModels["plutus:v3"].map((value, index) => [index.toString(), value])
+      )
+    }
+  }
+}
+
+const getDatumEffect = (
+  kupoUrl: string,
+  datum_type: Kupo.UTxO["datum_type"],
+  datum_hash: Kupo.UTxO["datum_hash"],
+  kupoHeader?: Record<string, string>
+) =>
+  Effect.gen(function* () {
+    if (datum_type === "inline" && datum_hash) {
+      const pattern = `${kupoUrl}/datums/${datum_hash}`
+      const schema = Kupo.DatumSchema
+      return yield* pipe(
+        HttpUtils.get(pattern, schema, kupoHeader),
+        Effect.flatMap(Effect.fromNullable),
+        Effect.map(
+          (result) =>
+            ({
+              inline: result.datum
+            }) as UTxO.Datum
+        ),
+        Effect.retry(Schedule.compose(Schedule.exponential(50), Schedule.recurs(5))),
+        Effect.timeout(5_000)
+      )
+    } else if (datum_type === "hash" && datum_hash) {
+      return { hash: datum_hash } as UTxO.Datum
+    }
+
+    return undefined
+  })
+
+const toAssets = (value: Kupo.UTxO["value"]): Assets.Assets => {
+  const assets: Assets.Assets = { lovelace: BigInt(value.coins) }
+  for (const unit of Object.keys(value.assets)) {
+    assets[unit.replace(".", "")] = BigInt(value.assets[unit])
+  }
+  return assets
+}
+
+const kupmiosUtxosToUtxos = (kupoURL: string, utxos: ReadonlyArray<Kupo.UTxO>, kupoHeader?: Record<string, string>) =>
+  Effect.forEach(
+    utxos,
+    (utxo) => {
+      return pipe(
+        Effect.all([
+          getDatumEffect(kupoURL, utxo.datum_type, utxo.datum_hash, kupoHeader),
+          getScriptEffect(kupoURL, utxo.script_hash, kupoHeader)
+        ]),
+        Effect.map(
+          ([datum, script]): UTxO.UTxO => ({
+            address: utxo.address,
+            txHash: utxo.transaction_id,
+            outputIndex: utxo.output_index,
+            assets: toAssets(utxo.value),
+            datumOption: datum,
+            scriptRef: script
+          })
+        )
+      )
+    },
+    { concurrency: "unbounded" }
+  )
+
+const getScriptEffect = (kupoUrl: string, script_hash: Kupo.UTxO["script_hash"], kupoHeader?: Record<string, string>) =>
+  Effect.gen(function* () {
+    if (script_hash) {
+      const pattern = `${kupoUrl}/scripts/${script_hash}`
+      const schema = Kupo.ScriptSchema
+      return yield* pipe(
+        HttpUtils.get(pattern, schema, kupoHeader),
+        Effect.flatMap(Effect.fromNullable),
+        Effect.retry(Schedule.compose(Schedule.exponential(50), Schedule.recurs(5))),
+        Effect.timeout(5_000),
+        Effect.map(({ language, script }) => {
+          switch (language) {
+            case "native":
+              return {
+                type: "Native",
+                script
+              } satisfies Script
+            case "plutus:v1":
+              return {
+                type: "PlutusV1",
+                script: applyDoubleCborEncoding(script)
+              } satisfies Script
+            case "plutus:v2":
+              return {
+                type: "PlutusV2",
+                script: applyDoubleCborEncoding(script)
+              } satisfies Script
+            case "plutus:v3":
+              return {
+                type: "PlutusV3",
+                script: applyDoubleCborEncoding(script)
+              } satisfies Script
+          }
+        })
+      )
+    } else return undefined
+  })
+
+export const getProtocolParametersEffect = Effect.fn("getProtocolParameters")(function* (
+  ogmiosUrl: string,
+  headers?: { ogmiosHeader?: Record<string, string> }
+) {
+  const data = {
+    jsonrpc: "2.0",
+    method: "queryLedgerState/protocolParameters",
+    params: {},
+    id: null
+  } as const
+
+  const schema = Ogmios.JSONRPCSchema(Ogmios.ProtocolParametersSchema)
+  const { result } = yield* pipe(
+    HttpUtils.postJson(ogmiosUrl, data, schema, headers?.ogmiosHeader),
+    Effect.timeout(TIMEOUT),
+    Effect.catchAll((cause) => new ProviderError({ cause, message: "Failed to get protocol parameters" })),
+    Effect.provide(FetchHttpClient.layer)
+  )
+  return toProtocolParameters(result)
+})
+
+// async getUtxos(addressOrCredential: Address | Credential): Promise<UTxO[]> {
+//     const isAddress = typeof addressOrCredential === "string";
+//     const queryPredicate = isAddress
+//       ? addressOrCredential
+//       : addressOrCredential.hash;
+//     const pattern = `${this.kupoUrl}/matches/${queryPredicate}${isAddress ? "" : "/*"}?unspent`;
+//     const schema = S.Array(Kupo.UTxOSchema);
+//     const utxos = await pipe(
+//       HttpUtils.makeGet(pattern, schema, this.headers?.kupoHeader),
+//       Effect.flatMap((u) => kupmiosUtxosToUtxos(this.kupoUrl, u)),
+//       Effect.timeout(10_000),
+//       Effect.catchAll((cause) => new KupmiosError({ cause })),
+//       Effect.provide(FetchHttpClient.layer),
+//       Effect.runPromise,
+//     );
+//     return utxos;
+//   }
+export const getUtxos = (kupoUrl: string, headers?: { [key: string]: string }) =>
+  Effect.fn("getUtxos")(function* (
+    addressOrCredential: EnterpriseAddress.EnterpriseAddress | BaseAddress.BaseAddress | Credential.Credential
+  ) {
+    let pattern: string
+    switch (addressOrCredential._tag) {
+      case "EnterpriseAddress":
+        pattern = `${kupoUrl}/matches/${addressOrCredential.toString()}?unspent`
+        break
+      case "BaseAddress":
+        pattern = `${kupoUrl}/matches/${addressOrCredential.toString()}?unspent`
+        break
+      case "KeyHash":
+        pattern = `${kupoUrl}/matches/${addressOrCredential.toString()}/*?unspent`
+        break
+      case "ScriptHash":
+        pattern = `${kupoUrl}/matches/${addressOrCredential.toString()}/*?unspent`
+        break
+    }
+    const schema = Schema.Array(Kupo.UTxOSchema)
+    const utxos = yield* pipe(
+      HttpUtils.get(pattern, schema, headers),
+      Effect.flatMap((u) => kupmiosUtxosToUtxos(kupoUrl, u)),
+      Effect.timeout(10_000),
+      Effect.catchAll((cause) => new KupmiosError({ cause })),
+      Effect.provide(FetchHttpClient.layer)
+    )
+
+    // const isAddress = typeof addressOrCredential === "string";
+    // const queryPredicate = isAddress
+    //   ? addressOrCredential
+    //   : addressOrCredential.hash;
+    // const pattern = `${this.kupoUrl}/matches/${queryPredicate}${isAddress ? "" : "/*"}?unspent`;
+    // const schema = S.Array(Kupo.UTxOSchema);
+    // const utxos = await pipe(
+    //   HttpUtils.makeGet(pattern, schema, this.headers?.kupoHeader),
+    //   Effect.flatMap((u) => kupmiosUtxosToUtxos(this.kupoUrl, u)),
+    //   Effect.timeout(10_000),
+    //   Effect.catchAll((cause) => new KupmiosError({ cause })),
+    //   Effect.provide(FetchHttpClient.layer),
+    //   Effect.runPromise,
+    // );
+    // return utxos;
+  })
+
+/**
+ * Provides support for interacting with both Kupo and Ogmios APIs.
+ *
+ * @example Using Local URLs (No Authentication):
+ * ```typescript
+ * const kupmios = new KupmiosProvider(
+ *   "http://localhost:1442", // Kupo API URL
+ *   "http://localhost:1337"  // Ogmios API URL
+ * );
+ * ```
+ *
+ * @example Using Authenticated URLs (No Custom Headers):
+ * ```typescript
+ * const kupmios = new KupmiosProvider(
+ *   "https://dmtr_kupoXXX.preprod-v2.kupo-m1.demeter.run", // Kupo Authenticated URL
+ *   "https://dmtr_ogmiosXXX.preprod-v6.ogmios-m1.demeter.run" // Ogmios Authenticated URL
+ * );
+ * ```
+ *
+ * @example Using Public URLs with Custom Headers:
+ * ```typescript
+ * const kupmios = new KupmiosProvider(
+ *   "https://preprod-v2.kupo-m1.demeter.run", // Kupo API URL
+ *   "https://preprod-v6.ogmios-m1.demeter.run", // Ogmios API URL
+ *   {
+ *     kupoHeader: { "dmtr-api-key": "dmtr_kupoXXX" }, // Custom header for Kupo
+ *     ogmiosHeader: { "dmtr-api-key": "dmtr_ogmiosXXX" } // Custom header for Ogmios
+ *   }
+ * );
+ */
+export class KupmiosProvider implements Provider {
+  private readonly kupoUrl: string
+  private readonly ogmiosUrl: string
+  private readonly headers?: {
+    readonly ogmiosHeader?: Record<string, string>
+    readonly kupoHeader?: Record<string, string>
+  }
+
+  constructor(
+    kupoUrl: string,
+    ogmiosUrl: string,
+    headers?: {
+      ogmiosHeader?: Record<string, string>
+      kupoHeader?: Record<string, string>
+    }
+  ) {
+    this.kupoUrl = kupoUrl
+    this.ogmiosUrl = ogmiosUrl
+    this.headers = headers
+  }
+
+  async getProtocolParameters(): Promise<ProtocolParameters> {
+    return Effect.runPromise(getProtocolParametersEffect(this.ogmiosUrl, this.headers))
+  }
+
+  async getUtxos(_address: Address): Promise<Array<UTxO>> {
+    // TODO: Implement UTxO fetching from Kupo
+    throw new Error("getUtxos not implemented yet")
+  }
+
+  async submitTx(_tx: string): Promise<TransactionHash> {
+    // TODO: Implement transaction submission to Ogmios
+    throw new Error("submitTx not implemented yet")
+  }
+}
+
+export const makeKupmiosLayer = (
+  kupoUrl: string,
+  ogmiosUrl: string,
+  headers?: {
+    ogmiosHeader?: Record<string, string>
+    kupoHeader?: Record<string, string>
+  }
+) =>
+  Layer.succeed(ProviderService, {
+    getProtocolParameters: getProtocolParametersEffect(ogmiosUrl, headers),
+    getUtxos: (_address: Address) =>
+      Effect.fail(
+        new ProviderError({
+          cause: "Not implemented",
+          message: "getUtxos not implemented yet"
+        })
+      ),
+    submitTx: (_tx: string) =>
+      Effect.fail(
+        new ProviderError({
+          cause: "Not implemented",
+          message: "submitTx not implemented yet"
+        })
+      )
+  })
diff --git a/packages/evolution/src/sdk/provider/Provider.ts b/packages/evolution/src/sdk/provider/Provider.ts
new file mode 100644
index 00000000..dd6df9c6
--- /dev/null
+++ b/packages/evolution/src/sdk/provider/Provider.ts
@@ -0,0 +1,31 @@
+import type { Effect } from "effect"
+import { Context, Data } from "effect"
+
+import type { AddressEras } from "../../core/AddressEras.js"
+import type { TransactionHash } from "../../core/TransactionHash.js"
+import type { UTxO } from "../UTxO.js"
+import type { ProtocolParameters } from "./types.js"
+
+// Base Provider Error
+export class ProviderError extends Data.TaggedError("ProviderError")<{
+  readonly cause: unknown
+  readonly message: string
+}> {}
+
+// Provider Service Interface (Context.Tag)
+export interface ProviderService {
+  readonly getProtocolParameters: Effect.Effect<ProtocolParameters, ProviderError>
+  readonly getUtxos: (address: AddressEras) => Effect.Effect<Array<UTxO>, ProviderError>
+  readonly submitTx: (tx: string) => Effect.Effect<TransactionHash, ProviderError>
+}
+
+// Context.Tag for dependency injection
+export const ProviderService: Context.Tag<ProviderService, ProviderService> =
+  Context.GenericTag<ProviderService>("@evolution/ProviderService")
+
+// Provider Interface (for Promise-based implementations)
+export interface Provider {
+  getProtocolParameters(): Promise<ProtocolParameters>
+  getUtxos(address: AddressEras): Promise<Array<UTxO>>
+  submitTx(tx: string): Promise<TransactionHash>
+}
diff --git a/packages/evolution/src/sdk/provider/internal/HttpUtils.ts b/packages/evolution/src/sdk/provider/internal/HttpUtils.ts
new file mode 100644
index 00000000..4076278f
--- /dev/null
+++ b/packages/evolution/src/sdk/provider/internal/HttpUtils.ts
@@ -0,0 +1,33 @@
+import { HttpClient, HttpClientRequest } from "@effect/platform"
+import { Effect, Schema } from "effect"
+
+/**
+ * Performs a GET request and decodes the response using the provided schema
+ */
+export const get = <A, I, R>(url: string, schema: Schema.Schema<A, I, R>, headers?: Record<string, string>) =>
+  HttpClient.get(url, headers ? { headers } : undefined).pipe(
+    Effect.flatMap((response) => response.json),
+    Effect.flatMap(Schema.decodeUnknown(schema))
+  )
+
+/**
+ * Performs a POST request with JSON body and decodes the response using the provided schema
+ */
+export const postJson = <A, I, R>(
+  url: string,
+  body: unknown,
+  schema: Schema.Schema<A, I, R>,
+  headers?: Record<string, string>
+) =>
+  Effect.gen(function* () {
+    let request = HttpClientRequest.post(url)
+    request = yield* HttpClientRequest.bodyJson(request, body)
+    request = HttpClientRequest.setHeaders(request, {
+      "Content-Type": "application/json",
+      ...(headers || {})
+    })
+
+    const response = yield* HttpClient.execute(request)
+    const json = yield* response.json
+    return yield* Schema.decodeUnknown(schema)(json)
+  })
diff --git a/packages/evolution/src/sdk/provider/internal/Kupo.ts b/packages/evolution/src/sdk/provider/internal/Kupo.ts
new file mode 100644
index 00000000..1407773b
--- /dev/null
+++ b/packages/evolution/src/sdk/provider/internal/Kupo.ts
@@ -0,0 +1,53 @@
+import { Schema as S } from "effect"
+
+export const ValueSchema = S.Struct({
+  coins: S.Number,
+  assets: S.Record({ key: S.String, value: S.Number })
+})
+export interface Value extends S.Schema.Type<typeof ValueSchema> {}
+
+export const UTxOSchema = S.Struct({
+  transaction_index: S.Number,
+  transaction_id: S.String,
+  output_index: S.Number,
+  address: S.String,
+  value: ValueSchema,
+  datum_hash: S.NullOr(S.String),
+  datum_type: S.optional(S.Literal("hash", "inline")),
+  script_hash: S.NullOr(S.String),
+  created_at: S.Struct({
+    slot_no: S.Number,
+    header_hash: S.String
+  }),
+  spent_at: S.NullOr(
+    S.Struct({
+      slot_no: S.Number,
+      header_hash: S.String
+    })
+  )
+})
+
+export interface UTxO extends S.Schema.Type<typeof UTxOSchema> {}
+
+export const ScriptSchema = S.NullOr(
+  S.Struct({
+    language: S.Literal("native", "plutus:v1", "plutus:v2", "plutus:v3"),
+    script: S.String
+  })
+)
+export type Script = S.Schema.Type<typeof ScriptSchema>
+
+export const DatumSchema = S.NullOr(S.Struct({ datum: S.String }))
+
+export type Datum = S.Schema.Type<typeof DatumSchema>
+
+export const DelegationSchema = S.NullOr(
+  S.Record({
+    key: S.String,
+    value: S.Struct({
+      delegate: S.Struct({ id: S.String }),
+      rewards: S.Struct({ ada: S.Struct({ lovelace: S.Number }) }),
+      deposit: S.Struct({ ada: S.Struct({ lovelace: S.Number }) })
+    })
+  })
+)
diff --git a/packages/evolution/src/sdk/provider/internal/Ogmios.ts b/packages/evolution/src/sdk/provider/internal/Ogmios.ts
new file mode 100644
index 00000000..57e052f4
--- /dev/null
+++ b/packages/evolution/src/sdk/provider/internal/Ogmios.ts
@@ -0,0 +1,204 @@
+import type * as CoreType from "@evolution-sdk/core-types"
+import { applySingleCborEncoding, fromUnit } from "@evolution-sdk/utils"
+import type { Record } from "effect"
+import { Schema as S } from "effect"
+
+export const JSONRPCSchema = <A, I, R>(schema: S.Schema<A, I, R>) =>
+  S.Struct({
+    jsonrpc: S.String,
+    method: S.optional(S.String),
+    id: S.NullOr(S.Number),
+    result: schema
+  }).annotations({ identifier: "JSONRPCSchema" })
+
+const LovelaceAsset = S.Struct({
+  lovelace: S.Number
+})
+
+const TupleNumberFromString = S.compose(S.split("/"), S.Array(S.NumberFromString))
+
+export const ProtocolParametersSchema = S.Struct({
+  minFeeCoefficient: S.Number,
+  minFeeReferenceScripts: S.Struct({
+    base: S.Number,
+    range: S.Number,
+    multiplier: S.Number
+  }),
+  maxReferenceScriptsSize: S.Struct({
+    bytes: S.Number
+  }),
+  stakePoolVotingThresholds: S.Struct({
+    noConfidence: TupleNumberFromString,
+    constitutionalCommittee: S.Struct({
+      default: TupleNumberFromString,
+      stateOfNoConfidence: TupleNumberFromString
+    }),
+    hardForkInitiation: TupleNumberFromString,
+    protocolParametersUpdate: S.Struct({
+      security: TupleNumberFromString
+    })
+  }),
+  delegateRepresentativeVotingThresholds: S.Struct({
+    noConfidence: TupleNumberFromString,
+    constitutionalCommittee: S.Struct({
+      default: TupleNumberFromString,
+      stateOfNoConfidence: TupleNumberFromString
+    }),
+    constitution: TupleNumberFromString,
+    hardForkInitiation: TupleNumberFromString,
+    protocolParametersUpdate: S.Struct({
+      network: TupleNumberFromString,
+      economic: TupleNumberFromString,
+      technical: TupleNumberFromString,
+      governance: TupleNumberFromString
+    }),
+    treasuryWithdrawals: TupleNumberFromString
+  }),
+  constitutionalCommitteeMinSize: S.optional(S.Number),
+  constitutionalCommitteeMaxTermLength: S.Number,
+  governanceActionLifetime: S.Number,
+  governanceActionDeposit: S.Struct({
+    ada: LovelaceAsset
+  }),
+  delegateRepresentativeDeposit: S.Struct({
+    ada: LovelaceAsset
+  }),
+  delegateRepresentativeMaxIdleTime: S.Number,
+  minFeeConstant: S.Struct({ ada: LovelaceAsset }),
+  maxBlockBodySize: S.Struct({ bytes: S.Number }),
+  maxBlockHeaderSize: S.Struct({ bytes: S.Number }),
+  maxTransactionSize: S.Struct({ bytes: S.Number }),
+  stakeCredentialDeposit: S.Struct({ ada: LovelaceAsset }),
+  stakePoolDeposit: S.Struct({ ada: LovelaceAsset }),
+  stakePoolRetirementEpochBound: S.Number,
+  desiredNumberOfStakePools: S.Number,
+  stakePoolPledgeInfluence: TupleNumberFromString,
+  monetaryExpansion: TupleNumberFromString,
+  treasuryExpansion: TupleNumberFromString,
+  minStakePoolCost: S.Struct({ ada: LovelaceAsset }),
+  minUtxoDepositConstant: S.Struct({ ada: LovelaceAsset }),
+  minUtxoDepositCoefficient: S.Number,
+  plutusCostModels: S.Struct({
+    "plutus:v1": S.Array(S.Number),
+    "plutus:v2": S.Array(S.Number),
+    "plutus:v3": S.Array(S.Number)
+  }),
+  scriptExecutionPrices: S.Struct({
+    memory: TupleNumberFromString,
+    cpu: TupleNumberFromString
+  }),
+  maxExecutionUnitsPerTransaction: S.Struct({
+    memory: S.Number,
+    cpu: S.Number
+  }),
+  maxExecutionUnitsPerBlock: S.Struct({ memory: S.Number, cpu: S.Number }),
+  maxValueSize: S.Struct({ bytes: S.Number }),
+  collateralPercentage: S.Number,
+  maxCollateralInputs: S.Number,
+  version: S.Struct({ major: S.Number, minor: S.Number })
+}).annotations({ identifier: "ProtocolParametersSchema" })
+
+export interface ProtocolParameters extends S.Schema.Type<typeof ProtocolParametersSchema> {}
+
+export const Delegation = S.NullOr(
+  S.Record({
+    key: S.String,
+    value: S.Struct({
+      delegate: S.Struct({ id: S.String }),
+      rewards: S.Struct({ ada: S.Struct({ lovelace: S.Number }) }),
+      deposit: S.Struct({ ada: S.Struct({ lovelace: S.Number }) })
+    })
+  })
+)
+
+type Script = {
+  language: "plutus:v1" | "plutus:v2" | "plutus:v3"
+  cbor: string
+}
+
+export type Assets = Record<string, Record<string, number>>
+
+export type Value = {
+  ada: { lovelace: number }
+} & Assets
+
+export type UTxO = {
+  transaction: { id: string }
+  index: number
+  address: string
+  value: Value
+  datumHash?: string | null
+  datum?: string | null
+  script?: Script | null
+}
+
+export const RedeemerSchema = S.Struct({
+  validator: S.Struct({
+    purpose: S.Literal("spend", "mint", "publish", "withdraw", "vote", "propose"),
+    index: S.Int
+  }),
+  budget: S.Struct({
+    memory: S.Int,
+    cpu: S.Int
+  })
+}).annotations({ identifier: "RedeemerSchema" })
+
+export const toOgmiosUTxOs = (utxos: Array<CoreType.UTxO> | undefined): Array<UTxO> => {
+  // NOTE: Ogmios only works with single encoding, not double encoding.
+  // You will get the following error:
+  // "Invalid request: couldn't decode Plutus script."
+  // TODO: Ensure the CBOR script is sent with single encoding.
+  const toOgmiosScript = (scriptRef: CoreType.UTxO["scriptRef"]): UTxO["script"] | null => {
+    if (scriptRef) {
+      switch (scriptRef.type) {
+        case "PlutusV1":
+          return {
+            language: "plutus:v1",
+            cbor: applySingleCborEncoding(scriptRef.script)
+          }
+        case "PlutusV2":
+          return {
+            language: "plutus:v2",
+            cbor: applySingleCborEncoding(scriptRef.script)
+          }
+        case "PlutusV3":
+          return {
+            language: "plutus:v3",
+            cbor: applySingleCborEncoding(scriptRef.script)
+          }
+        default:
+          return null
+      }
+    }
+  }
+
+  const toOgmiosAssets = (assets: CoreType.Assets) => {
+    const newAssets: Assets = {}
+    Object.entries(assets).forEach(([unit, amount]) => {
+      if (unit == "lovelace") return
+      const { assetName, policyId } = fromUnit(unit)
+      if (!newAssets[policyId]) {
+        newAssets[policyId] = {}
+      }
+      return (newAssets[policyId][assetName ? assetName : ""] = Number(amount))
+    })
+    return newAssets
+  }
+
+  return (utxos || []).map(
+    (utxo): UTxO => ({
+      transaction: {
+        id: utxo.txHash
+      },
+      index: utxo.outputIndex,
+      address: utxo.address,
+      value: {
+        ada: { lovelace: Number(utxo.assets["lovelace"]) },
+        ...toOgmiosAssets(utxo.assets)
+      },
+      datumHash: utxo.datumHash,
+      datum: utxo.datum,
+      script: toOgmiosScript(utxo.scriptRef)
+    })
+  )
+}
diff --git a/packages/evolution/src/sdk/provider/types.ts b/packages/evolution/src/sdk/provider/types.ts
new file mode 100644
index 00000000..707fb8d7
--- /dev/null
+++ b/packages/evolution/src/sdk/provider/types.ts
@@ -0,0 +1,83 @@
+// Lightweight provider-facing types compatible with lucid-evolution
+
+export type TxHash = string
+export type Address = string
+export type RewardAddress = string
+export type Unit = string // policyId + assetName (hex)
+
+export type Assets = { readonly lovelace: bigint } & Record<string, bigint>
+
+export type OutRef = {
+  readonly txHash: TxHash
+  readonly outputIndex: number
+}
+
+export type ScriptRef =
+  | { readonly type: "Native"; readonly script: string }
+  | { readonly type: "PlutusV1" | "PlutusV2" | "PlutusV3"; readonly script: string }
+
+export type UTxO = {
+  readonly txHash: TxHash
+  readonly outputIndex: number
+  readonly address: Address
+  readonly assets: Assets
+  readonly datumHash?: string
+  readonly datum?: string
+  readonly scriptRef?: ScriptRef
+}
+
+export type Delegation = {
+  readonly poolId: string | null
+  readonly rewards: bigint
+}
+
+export type EvalRedeemer = {
+  readonly ex_units: { readonly mem: number; readonly steps: number }
+  readonly redeemer_index: number
+  readonly redeemer_tag: "spend" | "mint" | "publish" | "withdraw" | "vote" | "propose"
+}
+
+export type ProtocolParameters = {
+  readonly minFeeA: number
+  readonly minFeeB: number
+  readonly maxTxSize: number
+  readonly maxValSize: number
+  readonly keyDeposit: bigint
+  readonly poolDeposit: bigint
+  readonly drepDeposit: bigint
+  readonly govActionDeposit: bigint
+  readonly priceMem: number
+  readonly priceStep: number
+  readonly maxTxExMem: bigint
+  readonly maxTxExSteps: bigint
+  readonly coinsPerUtxoByte: bigint
+  readonly collateralPercentage: number
+  readonly maxCollateralInputs: number
+  readonly minFeeRefScriptCostPerByte: number
+  readonly costModels: {
+    readonly PlutusV1: Record<string, number>
+    readonly PlutusV2: Record<string, number>
+    readonly PlutusV3: Record<string, number>
+  }
+}
+
+export interface Provider {
+  getProtocolParameters(): Promise<ProtocolParameters>
+  getUtxos(addressOrCredential: Address | { hash: string }): Promise<Array<UTxO>>
+  getUtxosWithUnit(addressOrCredential: Address | { hash: string }, unit: Unit): Promise<Array<UTxO>>
+  getUtxoByUnit(unit: Unit): Promise<UTxO>
+  getUtxosByOutRef(outRefs: ReadonlyArray<OutRef>): Promise<Array<UTxO>>
+  getDelegation(rewardAddress: RewardAddress): Promise<Delegation>
+  getDatum(datumHash: string): Promise<string>
+  awaitTx(txHash: TxHash, checkInterval?: number): Promise<boolean>
+  submitTx(cbor: string): Promise<TxHash>
+  evaluateTx(tx: string, additionalUTxOs?: Array<UTxO>): Promise<Array<EvalRedeemer>>
+}
+
+// Helpers
+export const fromUnit = (unit: string): { policyId: string; assetName: string | null } => {
+  if (!unit || unit === "lovelace") return { policyId: "", assetName: null }
+  const policyId = unit.slice(0, 56)
+  const assetName = unit.slice(56)
+  return { policyId, assetName: assetName.length > 0 ? assetName : null }
+}
diff --git a/packages/evolution/src/sdk/wallet/Wallet.ts b/packages/evolution/src/sdk/wallet/Wallet.ts
new file mode 100644
index 00000000..93d2fadc
--- /dev/null
+++ b/packages/evolution/src/sdk/wallet/Wallet.ts
@@ -0,0 +1,83 @@
+import { mnemonicToEntropy } from "@scure/bip39"
+import { wordlist as English } from "@scure/bip39/wordlists/english"
+
+import * as Address from "../../core/AddressEras.js"
+import * as BaseAddress from "../../core/BaseAddress.js"
+import * as Bip32PrivateKey from "../../core/Bip32PrivateKey.js"
+import * as EnterpriseAddress from "../../core/EnterpriseAddress.js"
+import * as KeyHash from "../../core/KeyHash.js"
+import * as NetworkId from "../../core/NetworkId.js"
+import * as PrivateKey from "../../core/PrivateKey.js"
+import * as RewardAccount from "../../core/RewardAccount.js"
+
+export type Wallet = {
+  address: string
+  rewardAddress: string | null
+  paymentKey: string
+  stakeKey: string | null
+}
+
+export function walletFromSeed(
+  seed: string,
+  options: {
+    password?: string
+    addressType?: "Base" | "Enterprise"
+    accountIndex?: number
+    network?: "Mainnet" | "Testnet" | "Custom"
+  } = {}
+): Wallet {
+  //Set default options
+  const { accountIndex = 0, addressType = "Base", network = "Mainnet" } = options
+
+  // Derive extended root from BIP39 entropy using our ed25519-bip32 (V2) implementation
+  const entropy = mnemonicToEntropy(seed, English)
+  const rootXPrv = Bip32PrivateKey.fromBip39Entropy(entropy, options?.password ?? "")
+
+  // Derive child keys using CIP-1852 indices
+  const paymentIndices = Bip32PrivateKey.CardanoPath.paymentIndices(accountIndex, 0)
+  const stakeIndices = Bip32PrivateKey.CardanoPath.stakeIndices(accountIndex, 0)
+  const paymentNode = Bip32PrivateKey.derive(rootXPrv, paymentIndices)
+  const stakeNode = Bip32PrivateKey.derive(rootXPrv, stakeIndices)
+
+  // Convert to standard PrivateKey (64 bytes: scalar+iv)
+  const paymentKey = Bip32PrivateKey.toPrivateKey(paymentNode)
+  const stakeKey = Bip32PrivateKey.toPrivateKey(stakeNode)
+
+  const paymentKeyHash = KeyHash.fromPrivateKey(paymentKey)
+  const stakeKeyHash = KeyHash.fromPrivateKey(stakeKey)
+
+  const networkId = network === "Mainnet" ? 1 : 0
+
+  const address =
+    addressType === "Base"
+      ? Address.toBech32(
+          new BaseAddress.BaseAddress({
+            networkId: NetworkId.make(networkId),
+            paymentCredential: paymentKeyHash,
+            stakeCredential: stakeKeyHash
+          })
+        )
+      : Address.toBech32(
+          new EnterpriseAddress.EnterpriseAddress({
+            networkId: NetworkId.make(networkId),
+            paymentCredential: paymentKeyHash
+          })
+        )
+
+  const rewardAddress =
+    addressType === "Base"
+      ? Address.toBech32(
+          new RewardAccount.RewardAccount({
+            networkId,
+            stakeCredential: stakeKeyHash
+          })
+        )
+      : null
+
+  return {
+    address,
+    rewardAddress,
+    paymentKey: PrivateKey.toBech32(paymentKey),
+    stakeKey: addressType === "Base" ? PrivateKey.toBech32(stakeKey) : null
+  }
+}
diff --git a/packages/evolution/src/utils/Hash.ts b/packages/evolution/src/utils/Hash.ts
index eb03efcf..a1f1cb4c 100644
--- a/packages/evolution/src/utils/Hash.ts
+++ b/packages/evolution/src/utils/Hash.ts
@@ -1,16 +1,16 @@
 import { blake2b } from "@noble/hashes/blake2"
 import { Schema } from "effect"
 
-import * as AuxiliaryData from "../AuxiliaryData.js"
-import * as AuxiliaryDataHash from "../AuxiliaryDataHash.js"
-import * as CBOR from "../CBOR.js"
-import * as CostModel from "../CostModel.js"
-import * as Data from "../Data.js"
-import * as DatumOption from "../DatumOption.js"
-import * as Redeemer from "../Redeemer.js"
-import * as ScriptDataHash from "../ScriptDataHash.js"
-import * as TransactionBody from "../TransactionBody.js"
-import * as TransactionHash from "../TransactionHash.js"
+import * as AuxiliaryData from "../core/AuxiliaryData.js"
+import * as AuxiliaryDataHash from "../core/AuxiliaryDataHash.js"
+import * as CBOR from "../core/CBOR.js"
+import * as CostModel from "../core/CostModel.js"
+import * as Data from "../core/Data.js"
+import * as DatumOption from "../core/DatumOption.js"
+import * as Redeemer from "../core/Redeemer.js"
+import * as ScriptDataHash from "../core/ScriptDataHash.js"
+import * as TransactionBody from "../core/TransactionBody.js"
+import * as TransactionHash from "../core/TransactionHash.js"
 
 /**
  * Compute the transaction body hash (blake2b-256 over CBOR of body).
diff --git a/packages/evolution/test/Address.test.ts b/packages/evolution/test/Address.test.ts
index ebae78ae..9fc59227 100644
--- a/packages/evolution/test/Address.test.ts
+++ b/packages/evolution/test/Address.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from "@effect/vitest"
 import { FastCheck } from "effect"
 
-import { Address } from "../src/index.js"
+import * as Address from "../src/core/AddressEras.js"
 
 // Sample addresses for testing - organized by network and type as arrays with comments
 // MAINNET ADDRESSES
diff --git a/packages/evolution/test/AuxiliaryData.CML.test.ts b/packages/evolution/test/AuxiliaryData.CML.test.ts
index 7234875d..dab180f8 100644
--- a/packages/evolution/test/AuxiliaryData.CML.test.ts
+++ b/packages/evolution/test/AuxiliaryData.CML.test.ts
@@ -2,7 +2,7 @@ import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs"
 import { FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as AuxiliaryData from "../src/AuxiliaryData.js"
+import * as AuxiliaryData from "../src/core/AuxiliaryData.js"
 
 /**
  * CML compatibility test for AuxiliaryData CBOR serialization.
diff --git a/packages/evolution/test/Bip32PrivateKey.CML.test.ts b/packages/evolution/test/Bip32PrivateKey.CML.test.ts
index c05cb203..dc361fe5 100644
--- a/packages/evolution/test/Bip32PrivateKey.CML.test.ts
+++ b/packages/evolution/test/Bip32PrivateKey.CML.test.ts
@@ -2,7 +2,9 @@ import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs"
 import { mnemonicToEntropy } from "bip39"
 import { beforeEach, describe, expect, it } from "vitest"
 
-import { Bip32PrivateKey, Bip32PublicKey, PrivateKey } from "../src/index.js"
+import * as Bip32PrivateKey from "../src/core/Bip32PrivateKey.js"
+import * as Bip32PublicKey from "../src/core/Bip32PublicKey.js"
+import * as PrivateKey from "../src/core/PrivateKey.js"
 
 /**
  * Comprehensive CML compatibility tests for Bip32PrivateKey module.
diff --git a/packages/evolution/test/BootstrapWitness.CML.test.ts b/packages/evolution/test/BootstrapWitness.CML.test.ts
index b80daea9..3f9254e7 100644
--- a/packages/evolution/test/BootstrapWitness.CML.test.ts
+++ b/packages/evolution/test/BootstrapWitness.CML.test.ts
@@ -2,10 +2,10 @@ import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs"
 import { FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as BootstrapWitness from "../src/BootstrapWitness.js"
-import * as CBOR from "../src/CBOR.js"
-import * as Ed25519Signature from "../src/Ed25519Signature.js"
-import * as VKey from "../src/VKey.js"
+import * as BootstrapWitness from "../src/core/BootstrapWitness.js"
+import * as CBOR from "../src/core/CBOR.js"
+import * as Ed25519Signature from "../src/core/Ed25519Signature.js"
+import * as VKey from "../src/core/VKey.js"
 
 // CML compatibility tests for BootstrapWitness
 
diff --git a/packages/evolution/test/CBOR.test.ts b/packages/evolution/test/CBOR.test.ts
index 9b50bc6c..d76f98c3 100644
--- a/packages/evolution/test/CBOR.test.ts
+++ b/packages/evolution/test/CBOR.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "@effect/vitest"
 
-import * as CBOR from "../src/CBOR.js"
+import * as CBOR from "../src/core/CBOR.js"
 
 describe("CBOR Implementation Tests", () => {
   describe("Integer Encoding Boundaries", () => {
diff --git a/packages/evolution/test/Credential.CML.test.ts b/packages/evolution/test/Credential.CML.test.ts
index c54a6549..4dc9e025 100644
--- a/packages/evolution/test/Credential.CML.test.ts
+++ b/packages/evolution/test/Credential.CML.test.ts
@@ -2,7 +2,7 @@ import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs"
 import { FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as Credential from "../src/Credential.js"
+import * as Credential from "../src/core/Credential.js"
 
 describe("Credential CML Compatibility", () => {
   it("property: Evolution Credential CBOR is parseable by CML and roundtrips CBOR", () => {
diff --git a/packages/evolution/test/Data.golden.test.ts b/packages/evolution/test/Data.golden.test.ts
index 36379dad..6b419a63 100644
--- a/packages/evolution/test/Data.golden.test.ts
+++ b/packages/evolution/test/Data.golden.test.ts
@@ -28,7 +28,7 @@ import * as fs from "fs"
 import * as path from "path"
 import { fileURLToPath } from "url"
 
-import * as Data from "../src/Data.js"
+import * as Data from "../src/core/Data.js"
 
 // ES module equivalent of __dirname
 const __filename = fileURLToPath(import.meta.url)
diff --git a/packages/evolution/test/Data.prop.test.ts b/packages/evolution/test/Data.prop.test.ts
index 00839176..d6d64483 100644
--- a/packages/evolution/test/Data.prop.test.ts
+++ b/packages/evolution/test/Data.prop.test.ts
@@ -1,7 +1,7 @@
 import { FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as Data from "../src/Data.js"
+import * as Data from "../src/core/Data.js"
 
 /**
  * Property-based tests for Data module
diff --git a/packages/evolution/test/Data.test.ts b/packages/evolution/test/Data.test.ts
index ffd4c743..7f7a50c1 100644
--- a/packages/evolution/test/Data.test.ts
+++ b/packages/evolution/test/Data.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "@effect/vitest"
 
-import * as Data from "../src/Data.js"
+import * as Data from "../src/core/Data.js"
 
 describe("Data Module Tests", () => {
   describe("Basic Types", () => {
diff --git a/packages/evolution/test/GovernanceAction.CML.prop.test.ts b/packages/evolution/test/GovernanceAction.CML.prop.test.ts
index 0d72b43f..8be3fb98 100644
--- a/packages/evolution/test/GovernanceAction.CML.prop.test.ts
+++ b/packages/evolution/test/GovernanceAction.CML.prop.test.ts
@@ -2,9 +2,9 @@ import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs"
 import { FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as GovernanceAction from "../src/GovernanceAction.js"
-import * as ProtocolParams from "../src/ProtocolParamUpdate.js"
-import * as ScriptHash from "../src/ScriptHash.js"
+import * as GovernanceAction from "../src/core/GovernanceAction.js"
+import * as ProtocolParams from "../src/core/ProtocolParamUpdate.js"
+import * as ScriptHash from "../src/core/ScriptHash.js"
 
 describe("GovernanceAction CML Compatibility (property)", () => {
   it("Evolution GovernanceAction CBOR is parseable by CML GovAction and roundtrips CBOR", () => {
diff --git a/packages/evolution/test/Metadata.CML.test.ts b/packages/evolution/test/Metadata.CML.test.ts
index c81bbc8d..bf47f655 100644
--- a/packages/evolution/test/Metadata.CML.test.ts
+++ b/packages/evolution/test/Metadata.CML.test.ts
@@ -1,8 +1,8 @@
 import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs"
 import { describe, expect, it } from "vitest"
 
-import * as AuxiliaryData from "../src/AuxiliaryData.js"
-import * as TransactionMetadatum from "../src/TransactionMetadatum.js"
+import * as AuxiliaryData from "../src/core/AuxiliaryData.js"
+import * as TransactionMetadatum from "../src/core/TransactionMetadatum.js"
 
 describe("Metadata CML Compatibility", () => {
   it("validates metadata CBOR parity when embedded in Conway AuxiliaryData", () => {
diff --git a/packages/evolution/test/MultiAsset.equals.test.ts b/packages/evolution/test/MultiAsset.equals.test.ts
index 899fb98b..cf61e438 100644
--- a/packages/evolution/test/MultiAsset.equals.test.ts
+++ b/packages/evolution/test/MultiAsset.equals.test.ts
@@ -1,7 +1,7 @@
 import { FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as MultiAsset from "../src/MultiAsset.js"
+import * as MultiAsset from "../src/core/MultiAsset.js"
 
 describe("MultiAsset property tests", () => {
   it("round-trips via CBOR and preserves equality", () => {
diff --git a/packages/evolution/test/NativeScripts.CML.test.ts b/packages/evolution/test/NativeScripts.CML.test.ts
index 0a0a2814..d33b11f3 100644
--- a/packages/evolution/test/NativeScripts.CML.test.ts
+++ b/packages/evolution/test/NativeScripts.CML.test.ts
@@ -1,7 +1,7 @@
 import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs"
 import { describe, expect, it } from "vitest"
 
-import * as NativeScripts from "../src/NativeScripts.js"
+import * as NativeScripts from "../src/core/NativeScripts.js"
 
 describe("NativeScripts CML Compatibility", () => {
   it("validates native script sig compatibility", () => {
diff --git a/packages/evolution/test/ParameterChangeAction.CML.test.ts b/packages/evolution/test/ParameterChangeAction.CML.test.ts
index c120faf6..3fad85f6 100644
--- a/packages/evolution/test/ParameterChangeAction.CML.test.ts
+++ b/packages/evolution/test/ParameterChangeAction.CML.test.ts
@@ -2,12 +2,12 @@ import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs"
 import { FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as Anchor from "../src/Anchor.js"
-import * as Coin from "../src/Coin.js"
-import * as GovernanceAction from "../src/GovernanceAction.js"
-import * as ProposalProcedure from "../src/ProposalProcedure.js"
-import * as ProtocolParams from "../src/ProtocolParamUpdate.js"
-import * as RewardAccount from "../src/RewardAccount.js"
+import * as Anchor from "../src/core/Anchor.js"
+import * as Coin from "../src/core/Coin.js"
+import * as GovernanceAction from "../src/core/GovernanceAction.js"
+import * as ProposalProcedure from "../src/core/ProposalProcedure.js"
+import * as ProtocolParams from "../src/core/ProtocolParamUpdate.js"
+import * as RewardAccount from "../src/core/RewardAccount.js"
 
 // Deterministic helper copied from other CML tests
 const generateTestRewardAccount = (seed: number = 42): RewardAccount.RewardAccount =>
diff --git a/packages/evolution/test/PrivateKey.CML.test.ts b/packages/evolution/test/PrivateKey.CML.test.ts
index 12429064..26e994b6 100644
--- a/packages/evolution/test/PrivateKey.CML.test.ts
+++ b/packages/evolution/test/PrivateKey.CML.test.ts
@@ -1,8 +1,8 @@
 import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs"
 import { describe, expect, it } from "vitest"
 
-import * as PrivateKey from "../src/PrivateKey"
-import * as VKey from "../src/VKey"
+import * as PrivateKey from "../src/core/PrivateKey"
+import * as VKey from "../src/core/VKey"
 
 // Test compatibility with CML (Cardano Multiplatform Library)
 describe("PrivateKey CML Compatibility", () => {
diff --git a/packages/evolution/test/ProposalProcedures.CML.test.ts b/packages/evolution/test/ProposalProcedures.CML.test.ts
index ff979cfe..09e518f7 100644
--- a/packages/evolution/test/ProposalProcedures.CML.test.ts
+++ b/packages/evolution/test/ProposalProcedures.CML.test.ts
@@ -2,10 +2,10 @@ import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs"
 import { FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as Anchor from "../src/Anchor.js"
-import * as GovernanceAction from "../src/GovernanceAction.js"
-import * as ProposalProcedure from "../src/ProposalProcedure.js"
-import * as RewardAccount from "../src/RewardAccount.js"
+import * as Anchor from "../src/core/Anchor.js"
+import * as GovernanceAction from "../src/core/GovernanceAction.js"
+import * as ProposalProcedure from "../src/core/ProposalProcedure.js"
+import * as RewardAccount from "../src/core/RewardAccount.js"
 
 /**
  * CML compatibility test for ProposalProcedures CBOR serialization.
diff --git a/packages/evolution/test/ProtocolParamUpdate.CML.test.ts b/packages/evolution/test/ProtocolParamUpdate.CML.test.ts
index 03821024..ae97de23 100644
--- a/packages/evolution/test/ProtocolParamUpdate.CML.test.ts
+++ b/packages/evolution/test/ProtocolParamUpdate.CML.test.ts
@@ -2,7 +2,7 @@ import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs"
 import { FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as ProtocolParamUpdate from "../src/ProtocolParamUpdate.js"
+import * as ProtocolParamUpdate from "../src/core/ProtocolParamUpdate.js"
 
 describe("ProtocolParamUpdate CML Compatibility", () => {
   it("Empty ProtocolParamUpdate works with CML", () => {
diff --git a/packages/evolution/test/Redeemer.CML.prop.test.ts b/packages/evolution/test/Redeemer.CML.prop.test.ts
index 521ecd50..1c58de10 100644
--- a/packages/evolution/test/Redeemer.CML.prop.test.ts
+++ b/packages/evolution/test/Redeemer.CML.prop.test.ts
@@ -2,8 +2,8 @@ import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs"
 import { FastCheck, Schema } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as CBOR from "../src/CBOR.js"
-import * as Redeemer from "../src/Redeemer.js"
+import * as CBOR from "../src/core/CBOR.js"
+import * as Redeemer from "../src/core/Redeemer.js"
 
 describe("Redeemer CML Compatibility (property)", () => {
   it("Array of Redeemers encoded via Evolution CDDL is parseable by CML.Redeemers and roundtrips", () => {
diff --git a/packages/evolution/test/RewardAccount.CML.test.ts b/packages/evolution/test/RewardAccount.CML.test.ts
index 7ea20fac..a420cf9e 100644
--- a/packages/evolution/test/RewardAccount.CML.test.ts
+++ b/packages/evolution/test/RewardAccount.CML.test.ts
@@ -1,9 +1,9 @@
 import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs"
 import { describe, expect, it } from "vitest"
 
-import * as KeyHash from "../src/KeyHash.js"
-import * as NetworkId from "../src/NetworkId.js"
-import * as RewardAccount from "../src/RewardAccount.js"
+import * as KeyHash from "../src/core/KeyHash.js"
+import * as NetworkId from "../src/core/NetworkId.js"
+import * as RewardAccount from "../src/core/RewardAccount.js"
 
 describe("RewardAccount CML Compatibility", () => {
   it("validates hex compatibility with CML", () => {
diff --git a/packages/evolution/test/Script.CML.test.ts b/packages/evolution/test/Script.CML.test.ts
new file mode 100644
index 00000000..32e40028
--- /dev/null
+++ b/packages/evolution/test/Script.CML.test.ts
@@ -0,0 +1,217 @@
+import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs"
+import { FastCheck } from "effect"
+import { describe, expect, it } from "vitest"
+
+import * as PlutusV1 from "../src/core/PlutusV1.js"
+import * as PlutusV2 from "../src/core/PlutusV2.js"
+import * as PlutusV3 from "../src/core/PlutusV3.js"
+import * as Script from "../src/core/Script.js"
+import * as ScriptHash from "../src/core/ScriptHash.js"
+
+/**
+ * CML compatibility test for Script CBOR serialization.
+ *
+ * This test ensures CBOR hex compatibility between the Evolution SDK and the
+ * Cardano Multiplatform Library (CML). The purpose is to prove that both libraries
+ * generate identical CBOR hex for the same script object.
+ */
+describe("Script CML Compatibility", () => {
+  it("validates CBOR hex compatibility for PlutusV1 scripts", () => {
+    // 1. Generate deterministic test data
+    const testScriptBytes = new Uint8Array([0x59, 0x01, 0x35, 0x59, 0x01, 0x32, 0x01, 0x00, 0x00, 0x32, 0x32])
+
+    // 2. Create Evolution SDK object
+    const evolutionPlutusV1 = new PlutusV1.PlutusV1({ bytes: testScriptBytes })
+    const evolutionScript: Script.Script = evolutionPlutusV1
+
+    // 3. Create equivalent CML object
+    const cmlPlutusV1Script = CML.PlutusV1Script.from_raw_bytes(testScriptBytes)
+    const cmlScript = CML.Script.new_plutus_v1(cmlPlutusV1Script)
+
+    // 4. Compare CBOR hex outputs
+    const evolutionCbor = Script.toCBORHex(evolutionScript)
+    const cmlCbor = cmlScript.to_cbor_hex()
+
+    expect(evolutionCbor).toBe(cmlCbor)
+  })
+
+  it("validates CBOR hex compatibility for PlutusV2 scripts", () => {
+    // 1. Generate deterministic test data
+    const testScriptBytes = new Uint8Array([0x49, 0x48, 0x01, 0x00, 0x00, 0x22, 0x21, 0x20, 0x01, 0x01])
+
+    // 2. Create Evolution SDK object
+    const evolutionPlutusV2 = new PlutusV2.PlutusV2({ bytes: testScriptBytes })
+    const evolutionScript: Script.Script = evolutionPlutusV2
+
+    // 3. Create equivalent CML object
+    const cmlPlutusV2Script = CML.PlutusV2Script.from_raw_bytes(testScriptBytes)
+    const cmlScript = CML.Script.new_plutus_v2(cmlPlutusV2Script)
+
+    // 4. Compare CBOR hex outputs
+    const evolutionCbor = Script.toCBORHex(evolutionScript)
+    const cmlCbor = cmlScript.to_cbor_hex()
+
+    expect(evolutionCbor).toBe(cmlCbor)
+  })
+
+  it("validates CBOR hex compatibility for PlutusV3 scripts", () => {
+    // 1. Generate deterministic test data
+    const testScriptBytes = new Uint8Array([0x49, 0x48, 0x01, 0x00, 0x00, 0x22, 0x21, 0x20, 0x01, 0x01])
+
+    // 2. Create Evolution SDK object
+    const evolutionPlutusV3 = new PlutusV3.PlutusV3({ bytes: testScriptBytes })
+    const evolutionScript: Script.Script = evolutionPlutusV3
+
+    // 3. Create equivalent CML object
+    const cmlPlutusV3Script = CML.PlutusV3Script.from_raw_bytes(testScriptBytes)
+    const cmlScript = CML.Script.new_plutus_v3(cmlPlutusV3Script)
+
+    // 4. Compare CBOR hex outputs
+    const evolutionCbor = Script.toCBORHex(evolutionScript)
+    const cmlCbor = cmlScript.to_cbor_hex()
+
+    expect(evolutionCbor).toBe(cmlCbor)
+  })
+
+  it("validates CBOR hex compatibility for deterministic scripts", () => {
+    // 1. Generate deterministic test data using FastCheck
+    const testData = FastCheck.sample(Script.arbitrary, { seed: 42, numRuns: 1 })[0]
+
+    // 2. Create Evolution SDK object
+    const evolutionScript = testData
+
+    // 3. Create equivalent CML object (match ALL properties and handle union types)
+    const cmlScript = createEquivalentCMLScript(evolutionScript)
+
+    // 4. Compare CBOR hex outputs
+    const evolutionCbor = Script.toCBORHex(evolutionScript)
+    const cmlCbor = cmlScript.to_cbor_hex()
+
+    expect(evolutionCbor).toBe(cmlCbor)
+  })
+
+  // TODO: Investigate script hash differences between Evolution SDK and CML
+  // The CBOR serialization matches perfectly, but script hash computation differs.
+  // This needs further investigation of CML's script hash algorithm.
+  it("validates script hash compatibility with CML", () => {
+    // Test that script hashes match between Evolution SDK and CML
+    const testScriptBytes = new Uint8Array([0x49, 0x48, 0x01, 0x00, 0x00, 0x22, 0x21, 0x20, 0x01, 0x01])
+
+    // Create Evolution SDK PlutusV2 script
+    const evolutionPlutusV2 = new PlutusV2.PlutusV2({ bytes: testScriptBytes })
+    const evolutionScript: Script.Script = evolutionPlutusV2
+
+    // Create equivalent CML script
+    const cmlPlutusV2Script = CML.PlutusV2Script.from_raw_bytes(testScriptBytes)
+    const cmlScript = CML.Script.new_plutus_v2(cmlPlutusV2Script)
+
+    // Compare script hashes using ScriptHash module
+    const evolutionScriptHash = ScriptHash.fromScript(evolutionScript)
+    const cmlScriptHash = cmlScript.hash()
+
+    // Convert Evolution hash to hex for comparison
+    const evolutionHashHex = ScriptHash.toHex(evolutionScriptHash)
+
+    // Convert CML hash to hex for comparison
+    const cmlHashHex = cmlScriptHash.to_hex()
+
+    // Current results show different hashes:
+    // Evolution: '53582d8da6eee8751044cd2a3ffa34b22baa429728fd7be8334ad3e2'
+    // CML:       'f14241393964259a53ca546af364e7f5688ca5aaa35f1e0da0f951b2'
+    // This indicates different hash computation algorithms or input formatting
+
+    expect(evolutionHashHex).toBe(cmlHashHex)
+  })
+})
+
+/**
+ * Helper function to create equivalent CML Script objects from Evolution SDK scripts.
+ * Handles all union types by checking _tag properties and script types.
+ */
+function createEquivalentCMLScript(evolutionScript: Script.Script): CML.Script {
+  // Handle native scripts (no _tag property, has type property)
+  if ("type" in evolutionScript) {
+    const cmlNativeScript = createEquivalentCMLNativeScript(evolutionScript)
+    return CML.Script.new_native(cmlNativeScript)
+  }
+
+  // Handle Plutus scripts (with _tag property)
+  if ("_tag" in evolutionScript) {
+    switch (evolutionScript._tag) {
+      case "PlutusV1":
+        return CML.Script.new_plutus_v1(CML.PlutusV1Script.from_raw_bytes(evolutionScript.bytes))
+      case "PlutusV2":
+        return CML.Script.new_plutus_v2(CML.PlutusV2Script.from_raw_bytes(evolutionScript.bytes))
+      case "PlutusV3":
+        return CML.Script.new_plutus_v3(CML.PlutusV3Script.from_raw_bytes(evolutionScript.bytes))
+      default:
+        throw new Error(`Unknown Plutus script type: ${(evolutionScript as any)._tag}`)
+    }
+  }
+
+  throw new Error("Invalid script structure")
+}
+
+/**
+ * Helper function to create equivalent CML NativeScript objects.
+ * Handles all native script types: sig, all, any, n_of_k, after, before.
+ */
+function createEquivalentCMLNativeScript(evolutionNativeScript: any): CML.NativeScript {
+  switch (evolutionNativeScript.type) {
+    case "sig": {
+      // Convert hex string to bytes for Ed25519KeyHash
+      const keyHashBytes = new Uint8Array(
+        evolutionNativeScript.keyHash.match(/.{1,2}/g)?.map((byte: string) => parseInt(byte, 16)) || []
+      )
+      const ed25519KeyHash = CML.Ed25519KeyHash.from_raw_bytes(keyHashBytes)
+      return CML.NativeScript.new_script_pubkey(ed25519KeyHash)
+    }
+
+    case "all": {
+      const nativeScriptList = CML.NativeScriptList.new()
+      if (evolutionNativeScript.scripts) {
+        for (const script of evolutionNativeScript.scripts) {
+          const cmlSubScript = createEquivalentCMLNativeScript(script)
+          nativeScriptList.add(cmlSubScript)
+        }
+      }
+      return CML.NativeScript.new_script_all(nativeScriptList)
+    }
+
+    case "any": {
+      const nativeScriptList = CML.NativeScriptList.new()
+      if (evolutionNativeScript.scripts) {
+        for (const script of evolutionNativeScript.scripts) {
+          const cmlSubScript = createEquivalentCMLNativeScript(script)
+          nativeScriptList.add(cmlSubScript)
+        }
+      }
+      return CML.NativeScript.new_script_any(nativeScriptList)
+    }
+
+    case "n_of_k": {
+      const nativeScriptList = CML.NativeScriptList.new()
+      if (evolutionNativeScript.scripts) {
+        for (const script of evolutionNativeScript.scripts) {
+          const cmlSubScript = createEquivalentCMLNativeScript(script)
+          nativeScriptList.add(cmlSubScript)
+        }
+      }
+      const n = evolutionNativeScript.required || 0
+      return CML.NativeScript.new_script_n_of_k(n, nativeScriptList)
+    }
+
+    case "after": {
+      const slot = BigInt(evolutionNativeScript.slot || 0)
+      return CML.NativeScript.new_script_invalid_before(slot)
+    }
+
+    case "before": {
+      const slot = BigInt(evolutionNativeScript.slot || 0)
+      return CML.NativeScript.new_script_invalid_hereafter(slot)
+    }
+
+    default:
+      throw new Error(`Unknown native script type: ${evolutionNativeScript.type}`)
+  }
+}
diff --git a/packages/evolution/test/TSchema.test.ts b/packages/evolution/test/TSchema.test.ts
index cb074d1d..e011b5e7 100644
--- a/packages/evolution/test/TSchema.test.ts
+++ b/packages/evolution/test/TSchema.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from "vitest"
 
-import * as Data from "../src/Data.js"
-import * as TSchema from "../src/TSchema.js"
+import * as Data from "../src/core/Data.js"
+import * as TSchema from "../src/core/TSchema.js"
 
 /**
  * Tests for TypeTaggedSchema module functionality -
diff --git a/packages/evolution/test/TransactionBody.CML.test.ts b/packages/evolution/test/TransactionBody.CML.test.ts
index 969f708b..b2dc6026 100644
--- a/packages/evolution/test/TransactionBody.CML.test.ts
+++ b/packages/evolution/test/TransactionBody.CML.test.ts
@@ -3,11 +3,11 @@ import { FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
 // diagnoseTransactionBody is optional during lint/type-check; load only on failure
-import * as Coin from "../src/Coin.js"
-import * as NetworkId from "../src/NetworkId.js"
-import * as TransactionBody from "../src/TransactionBody.js"
-import * as TransactionHash from "../src/TransactionHash.js"
-import * as TransactionInput from "../src/TransactionInput.js"
+import * as Coin from "../src/core/Coin.js"
+import * as NetworkId from "../src/core/NetworkId.js"
+import * as TransactionBody from "../src/core/TransactionBody.js"
+import * as TransactionHash from "../src/core/TransactionHash.js"
+import * as TransactionInput from "../src/core/TransactionInput.js"
 
 /**
  * CML compatibility test for TransactionBody CBOR serialization.
diff --git a/packages/evolution/test/TransactionMetadatum.CML.test.ts b/packages/evolution/test/TransactionMetadatum.CML.test.ts
index 6989c258..1f944184 100644
--- a/packages/evolution/test/TransactionMetadatum.CML.test.ts
+++ b/packages/evolution/test/TransactionMetadatum.CML.test.ts
@@ -1,7 +1,7 @@
 import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs"
 import { describe, expect, it } from "vitest"
 
-import * as TransactionMetadatum from "../src/TransactionMetadatum.js"
+import * as TransactionMetadatum from "../src/core/TransactionMetadatum.js"
 
 describe("TransactionMetadatum CML Compatibility", () => {
   it("validates text metadatum compatibility", () => {
diff --git a/packages/evolution/test/TransactionOutput.CML.test.ts b/packages/evolution/test/TransactionOutput.CML.test.ts
index 819d4dea..49c8a5ef 100644
--- a/packages/evolution/test/TransactionOutput.CML.test.ts
+++ b/packages/evolution/test/TransactionOutput.CML.test.ts
@@ -2,7 +2,7 @@ import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs"
 import { FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as TransactionOutput from "../src/TransactionOutput.js"
+import * as TransactionOutput from "../src/core/TransactionOutput.js"
 
 describe("TransactionOutput CML Compatibility", () => {
   it("property: Evolution SDK CBOR matches CML CBOR for any generated TransactionOutput", () => {
diff --git a/packages/evolution/test/TransactionWitnessSet.CML.test.ts b/packages/evolution/test/TransactionWitnessSet.CML.test.ts
index 150f31a3..adbde9b8 100644
--- a/packages/evolution/test/TransactionWitnessSet.CML.test.ts
+++ b/packages/evolution/test/TransactionWitnessSet.CML.test.ts
@@ -2,12 +2,12 @@ import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs"
 import { FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as Ed25519Signature from "../src/Ed25519Signature.js"
-import * as NativeScripts from "../src/NativeScripts.js"
-import * as PlutusV1 from "../src/PlutusV1.js"
-import * as PlutusV2 from "../src/PlutusV2.js"
-import * as TransactionWitnessSet from "../src/TransactionWitnessSet.js"
-import * as VKey from "../src/VKey.js"
+import * as Ed25519Signature from "../src/core/Ed25519Signature.js"
+import * as NativeScripts from "../src/core/NativeScripts.js"
+import * as PlutusV1 from "../src/core/PlutusV1.js"
+import * as PlutusV2 from "../src/core/PlutusV2.js"
+import * as TransactionWitnessSet from "../src/core/TransactionWitnessSet.js"
+import * as VKey from "../src/core/VKey.js"
 
 /**
  * CML compatibility test for TransactionWitnessSet CBOR serialization.
diff --git a/packages/evolution/test/UtilsHash.CML.test.ts b/packages/evolution/test/UtilsHash.CML.test.ts
index c36774cf..35de2fb6 100644
--- a/packages/evolution/test/UtilsHash.CML.test.ts
+++ b/packages/evolution/test/UtilsHash.CML.test.ts
@@ -2,15 +2,15 @@ import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs"
 import { FastCheck, Schema } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as AuxiliaryData from "../src/AuxiliaryData.js"
-import * as AuxiliaryDataHash from "../src/AuxiliaryDataHash.js"
-import * as CBOR from "../src/CBOR.js"
-import * as CostModel from "../src/CostModel.js"
-import * as Data from "../src/Data.js"
-import * as Redeemer from "../src/Redeemer.js"
-import * as ScriptDataHash from "../src/ScriptDataHash.js"
-import * as TransactionBody from "../src/TransactionBody.js"
-import * as TransactionHash from "../src/TransactionHash.js"
+import * as AuxiliaryData from "../src/core/AuxiliaryData.js"
+import * as AuxiliaryDataHash from "../src/core/AuxiliaryDataHash.js"
+import * as CBOR from "../src/core/CBOR.js"
+import * as CostModel from "../src/core/CostModel.js"
+import * as Data from "../src/core/Data.js"
+import * as Redeemer from "../src/core/Redeemer.js"
+import * as ScriptDataHash from "../src/core/ScriptDataHash.js"
+import * as TransactionBody from "../src/core/TransactionBody.js"
+import * as TransactionHash from "../src/core/TransactionHash.js"
 import * as UtilsHash from "../src/utils/Hash.js"
 
 // Local helper to hex-encode bytes for assertions
diff --git a/packages/evolution/test/VotingProcedures.CML.test.ts b/packages/evolution/test/VotingProcedures.CML.test.ts
index aef0bd2a..70050bcf 100644
--- a/packages/evolution/test/VotingProcedures.CML.test.ts
+++ b/packages/evolution/test/VotingProcedures.CML.test.ts
@@ -2,13 +2,13 @@ import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs"
 import { FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as Anchor from "../src/Anchor.js"
-import * as DRep from "../src/DRep.js"
-import * as GovernanceAction from "../src/GovernanceAction.js"
-import * as KeyHash from "../src/KeyHash.js"
-import * as ScriptHash from "../src/ScriptHash.js"
-import * as TransactionHash from "../src/TransactionHash.js"
-import * as VotingProcedures from "../src/VotingProcedures.js"
+import * as Anchor from "../src/core/Anchor.js"
+import * as DRep from "../src/core/DRep.js"
+import * as GovernanceAction from "../src/core/GovernanceAction.js"
+import * as KeyHash from "../src/core/KeyHash.js"
+import * as ScriptHash from "../src/core/ScriptHash.js"
+import * as TransactionHash from "../src/core/TransactionHash.js"
+import * as VotingProcedures from "../src/core/VotingProcedures.js"
 
 /**
  * CML compatibility test for VotingProcedures CBOR serialization.
diff --git a/packages/evolution/test/WalletFromSeed.test.ts b/packages/evolution/test/WalletFromSeed.test.ts
new file mode 100644
index 00000000..60f29753
--- /dev/null
+++ b/packages/evolution/test/WalletFromSeed.test.ts
@@ -0,0 +1,94 @@
+import { expect, test } from "vitest"
+
+import { walletFromSeed } from "../src/sdk/wallet/Wallet.js"
+
+const seedPhrase =
+  "zebra short room flavor rival capital fortune hip profit trust melody office depend adapt visa cycle february link tornado whisper physical kiwi film voyage"
+
+test("WalletFromSeed - Defaults options", () => {
+  const expectedFromSeed = {
+    address: "addr1q98wl3hnya9l94rt58ky533deyqe9t8zz5n9su26k8e5g23yar4q0adtaax9q9g0kphpv2ws7vxqwu6ln6pqx7j29nfqsfy9mg",
+    rewardAddress: "stake1uyjw36s87k477nzsz58mqmsk98g0xrq8wd0eaqsr0f9ze5s48wtl9",
+    paymentKey:
+      "ed25519e_sk1krszcw3ujfs3qnsjwl6wynw7dwudgnq69w9lrrtdf46yqnd25dgv4f5ttaqxr2v6n6azee489c7mryudvhu8n4x4tcvd5hvhtwswsuc4s4c2d",
+    stakeKey:
+      "ed25519e_sk19q4d6fguvncszk6f46fvvep5y5w3877y77t3n3dc446wgja25dg968hm8jxkc9d7p982uls6k8uq0srs69e44lay43hxmdx4nc3rttsn0h2f5"
+  }
+  expect(expectedFromSeed).toStrictEqual(
+    walletFromSeed(seedPhrase, {
+      addressType: "Base",
+      accountIndex: 0,
+      network: "Mainnet"
+    })
+  )
+  expect(expectedFromSeed).toStrictEqual(walletFromSeed(seedPhrase))
+})
+
+test("WalletFromSeed - accountIndex 1", () => {
+  const expectedFromSeed = {
+    address: "addr1q8833yrnksyq3v3u582g8pkzzdmg9yge7lftvu8lj6lakmp7e5x8vl3sqdtxra9z9p95k27kx2njgqux86d5mtfc2t8sa7jy78",
+    rewardAddress: "stake1uylv6rrk0ccqx4np7j3zsj6t90tr9feyqwrrax6d45u99nce2rkhr",
+    paymentKey:
+      "ed25519e_sk1tzqvdwc8kr9zk4fmlwhexzpgcgx8t35zls2ckeswehpdsja25dg9j998sp9s2xy0aeyrdquhpljwfgghz9e78wqux8xj9t2p8z59ahc75nyyr",
+    stakeKey:
+      "ed25519e_sk1trauywg7p9x2hg3jgaw2adeyg5ujhax4jfd6exs6hpzakn925dggyvhgrh8kwc9h9n7nh75nwhge9gyxg7vavcwk7mq3r2t03664drcrdegzx"
+  }
+  expect(expectedFromSeed).toStrictEqual(
+    walletFromSeed(seedPhrase, {
+      addressType: "Base",
+      accountIndex: 1,
+      network: "Mainnet"
+    })
+  )
+  expect(expectedFromSeed).toStrictEqual(
+    walletFromSeed(seedPhrase, {
+      accountIndex: 1
+    })
+  )
+})
+
+test("WalletFromSeed - Custom Network", () => {
+  const expectedFromSeed = {
+    address:
+      "addr_test1qp8wl3hnya9l94rt58ky533deyqe9t8zz5n9su26k8e5g23yar4q0adtaax9q9g0kphpv2ws7vxqwu6ln6pqx7j29nfqnle9hh",
+    rewardAddress: "stake_test1uqjw36s87k477nzsz58mqmsk98g0xrq8wd0eaqsr0f9ze5sjdyfmc",
+    paymentKey:
+      "ed25519e_sk1krszcw3ujfs3qnsjwl6wynw7dwudgnq69w9lrrtdf46yqnd25dgv4f5ttaqxr2v6n6azee489c7mryudvhu8n4x4tcvd5hvhtwswsuc4s4c2d",
+    stakeKey:
+      "ed25519e_sk19q4d6fguvncszk6f46fvvep5y5w3877y77t3n3dc446wgja25dg968hm8jxkc9d7p982uls6k8uq0srs69e44lay43hxmdx4nc3rttsn0h2f5"
+  }
+  expect(expectedFromSeed).toStrictEqual(
+    walletFromSeed(seedPhrase, {
+      addressType: "Base",
+      accountIndex: 0,
+      network: "Custom"
+    })
+  )
+  expect(expectedFromSeed).toStrictEqual(
+    walletFromSeed(seedPhrase, {
+      network: "Custom"
+    })
+  )
+})
+
+test("WalletFromSeed - Address Enterprise", () => {
+  const expectedFromSeed = {
+    address: "addr1v98wl3hnya9l94rt58ky533deyqe9t8zz5n9su26k8e5g2srcn4hd",
+    rewardAddress: null,
+    paymentKey:
+      "ed25519e_sk1krszcw3ujfs3qnsjwl6wynw7dwudgnq69w9lrrtdf46yqnd25dgv4f5ttaqxr2v6n6azee489c7mryudvhu8n4x4tcvd5hvhtwswsuc4s4c2d",
+    stakeKey: null
+  }
+  expect(expectedFromSeed).toStrictEqual(
+    walletFromSeed(seedPhrase, {
+      addressType: "Enterprise",
+      accountIndex: 0,
+      network: "Mainnet"
+    })
+  )
+  expect(expectedFromSeed).toStrictEqual(
+    walletFromSeed(seedPhrase, {
+      addressType: "Enterprise"
+    })
+  )
+})
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6d01a55e..4b81ba65 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -147,6 +147,9 @@ importers:
 
   packages/evolution:
     dependencies:
+      '@effect/platform':
+        specifier: ^0.90.6
+        version: 0.90.6(effect@3.17.9)
       '@effect/platform-node':
         specifier: ^0.96.0
         version: 0.96.0(@effect/cluster@0.48.2(@effect/platform@0.90.6(effect@3.17.9))(@effect/rpc@0.69.1(@effect/platform@0.90.6(effect@3.17.9))(effect@3.17.9))(@effect/sql@0.44.2(@effect/experimental@0.54.6(@effect/platform@0.90.6(effect@3.17.9))(effect@3.17.9))(@effect/platform@0.90.6(effect@3.17.9))(effect@3.17.9))(@effect/workflow@0.9.2(@effect/platform@0.90.6(effect@3.17.9))(@effect/rpc@0.69.1(@effect/platform@0.90.6(effect@3.17.9))(effect@3.17.9))(effect@3.17.9))(effect@3.17.9))(@effect/platform@0.90.6(effect@3.17.9))(@effect/rpc@0.69.1(@effect/platform@0.90.6(effect@3.17.9))(effect@3.17.9))(@effect/sql@0.44.2(@effect/experimental@0.54.6(@effect/platform@0.90.6(effect@3.17.9))(effect@3.17.9))(@effect/platform@0.90.6(effect@3.17.9))(effect@3.17.9))(effect@3.17.9)