diff --git a/.changeset/lazy-pandas-design.md b/.changeset/lazy-pandas-design.md
new file mode 100644
index 00000000..f854c9f3
--- /dev/null
+++ b/.changeset/lazy-pandas-design.md
@@ -0,0 +1,30 @@
+---
+"@evolution-sdk/evolution": patch
+---
+
+**BREAKING CHANGE:** Remove `Core` namespace, flatten package structure
+
+### What changed
+- Moved all modules from `src/core/` to `src/`
+- Removed the `Core` namespace export
+- Added `Cardano` namespace for API discovery/exploration
+- Individual module exports remain available for tree-shaking
+
+### Migration
+
+**Before:**
+```typescript
+import { Core } from "@evolution-sdk/evolution"
+const address = Core.Address.fromBech32("addr...")
+```
+
+**After (namespace style):**
+```typescript
+import { Cardano } from "@evolution-sdk/evolution"
+const address = Cardano.Address.fromBech32("addr...")
+```
+
+**After (individual imports - recommended for production):**
+```typescript
+import { Address } from "@evolution-sdk/evolution"
+const address = Address.fromBech32("addr...")
diff --git a/docs/app/playground/page.tsx b/docs/app/playground/page.tsx
index 0088cc6f..d6db9e1d 100644
--- a/docs/app/playground/page.tsx
+++ b/docs/app/playground/page.tsx
@@ -28,12 +28,12 @@ const decodeCode = (encoded: string): string | null => {
 	}
 }
 
-const defaultCode = `import { Core } from "@evolution-sdk/evolution"
+const defaultCode = `import { Address } from "@evolution-sdk/evolution"
 
 const bech32 = "addr_test1qz2fxv2umyhttkxyxp8x0dlpdt3k6cwng5pxj3jhsydzer3jcu5d8ps7zex2k2xt3uqxgjqnnj83ws8lhrn648jjxtwq2ytjqp"
 
 // Parse from Bech32
-const address = Core.Address.fromBech32(bech32)
+const address = Address.fromBech32(bech32)
 
 console.log("Address:", address)
 console.log("Network ID:", address.networkId)
@@ -41,7 +41,7 @@ console.log("Payment credential:", address.paymentCredential)
 console.log("Has staking:", address.stakingCredential !== undefined)
 
 // Check if it's an enterprise address
-console.log("Is enterprise:", Core.Address.isEnterprise(address))`
+console.log("Is enterprise:", Address.isEnterprise(address))`
 
 export default function PlaygroundPage() {
 	const [code, setCode] = useState<string | undefined>()
diff --git a/docs/app/tools/tx-decoder/transaction-decoder.tsx b/docs/app/tools/tx-decoder/transaction-decoder.tsx
index c3b4bc0e..716ba6b1 100644
--- a/docs/app/tools/tx-decoder/transaction-decoder.tsx
+++ b/docs/app/tools/tx-decoder/transaction-decoder.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import { useState } from 'react'
-import { Core, Schema } from "@evolution-sdk/evolution"
+import { Transaction, TransactionWitnessSet, Data, Schema } from "@evolution-sdk/evolution"
 
 type DecodeType = 'transaction' | 'witnessSet' | 'data'
 
@@ -24,16 +24,16 @@ export function TransactionDecoder() {
       }
       
       if (decodeType === 'transaction') {
-        const tx = Core.Transaction.fromCBORHex(cleanHex)
-        const json = Schema.encodeSync(Schema.parseJson(Core.Transaction.Transaction, {space: 2}))(tx)
+        const tx = Transaction.fromCBORHex(cleanHex)
+        const json = Schema.encodeSync(Schema.parseJson(Transaction.Transaction, {space: 2}))(tx)
         setDecodedJson(json)
       } else if (decodeType === 'witnessSet') {
-        const witnessSet = Core.TransactionWitnessSet.fromCBORHex(cleanHex)
-        const json = Schema.encodeSync(Schema.parseJson(Core.TransactionWitnessSet.TransactionWitnessSet, {space: 2}))(witnessSet)
+        const witnessSet = TransactionWitnessSet.fromCBORHex(cleanHex)
+        const json = Schema.encodeSync(Schema.parseJson(TransactionWitnessSet.TransactionWitnessSet, {space: 2}))(witnessSet)
         setDecodedJson(json)
       } else {
-        const data = Core.Data.fromCBORHex(cleanHex)
-        const json = Schema.encodeSync(Schema.parseJson(Core.Data.DataSchema, {space: 2}))(data)
+        const data = Data.fromCBORHex(cleanHex)
+        const json = Schema.encodeSync(Schema.parseJson(Data.DataSchema, {space: 2}))(data)
         setDecodedJson(json)
       }
     } catch (err) {
diff --git a/docs/app/tools/uplc-decoder/uplc-decoder.tsx b/docs/app/tools/uplc-decoder/uplc-decoder.tsx
index 99136672..8a783579 100644
--- a/docs/app/tools/uplc-decoder/uplc-decoder.tsx
+++ b/docs/app/tools/uplc-decoder/uplc-decoder.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import { useState } from 'react'
-import { Core } from "@evolution-sdk/evolution"
+import { UPLC } from "@evolution-sdk/evolution"
 import JsonView from 'react18-json-view'
 import 'react18-json-view/src/style.css'
 
@@ -50,13 +50,13 @@ export function UplcDecoder() {
       }
       
       // Decode using fromCborHexToProgram which handles all encoding levels
-      const program = Core.UPLC.fromCborHexToProgram(cleanHex)
+      const program = UPLC.fromCborHexToProgram(cleanHex)
       
       // Get encoding level
-      const encodingLevel = Core.UPLC.getCborEncodingLevel(cleanHex)
+      const encodingLevel = UPLC.getCborEncodingLevel(cleanHex)
       
       // Get flat hex representation
-      const flatHex = Core.UPLC.toFlatHex(program)
+      const flatHex = UPLC.toFlatHex(program)
       
       // Convert to JSON object
       const jsonData = program.toJSON()
diff --git a/docs/content/docs/addresses/address-types/base.mdx b/docs/content/docs/addresses/address-types/base.mdx
index 6c47ea2b..ca3ea0f6 100644
--- a/docs/content/docs/addresses/address-types/base.mdx
+++ b/docs/content/docs/addresses/address-types/base.mdx
@@ -23,20 +23,20 @@ Both credentials are typically derived from the same wallet, but can come from d
 Create base addresses by instantiating the `BaseAddress` class:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { AddressEras, BaseAddress, KeyHash, ScriptHash } from "@evolution-sdk/evolution";
 
-const address = new Core.BaseAddress.BaseAddress({
+const address = new BaseAddress.BaseAddress({
   networkId: 1, // mainnet
-  paymentCredential: new Core.KeyHash.KeyHash({
+  paymentCredential: new KeyHash.KeyHash({
     hash: new Uint8Array(28)
   }),
-  stakeCredential: new Core.KeyHash.KeyHash({
+  stakeCredential: new KeyHash.KeyHash({
     hash: new Uint8Array(28)
   })
 });
 
 // Convert to Bech32 string
-const bech32 = Core.AddressEras.toBech32(address);
+const bech32 = AddressEras.toBech32(address);
 console.log(bech32); // "addr1..."
 ```
 
@@ -45,11 +45,11 @@ console.log(bech32); // "addr1..."
 Parse a Bech32 address string into a `BaseAddress` instance:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { AddressEras, BaseAddress, KeyHash, ScriptHash } from "@evolution-sdk/evolution";
 
 const bech32 = "addr1qx2kd28nq8ac5prwg32hhvudlwggpgfp8utlyqxu6wqgz62f79qsdmm5dsknt9ecr5w468r9ey0fxwkdrwh08ly3tu9sy0f4qd";
 
-const address = Core.AddressEras.fromBech32(bech32) as Core.BaseAddress.BaseAddress;
+const address = AddressEras.fromBech32(bech32) as BaseAddress.BaseAddress;
 
 console.log("Network ID:", address.networkId);
 console.log("Payment:", address.paymentCredential);
@@ -61,20 +61,20 @@ console.log("Stake:", address.stakeCredential);
 Base addresses can use script hashes for payment and/or staking credentials:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { AddressEras, BaseAddress, KeyHash, ScriptHash } from "@evolution-sdk/evolution";
 
 // Address with script credentials
-const scriptAddress = new Core.BaseAddress.BaseAddress({
+const scriptAddress = new BaseAddress.BaseAddress({
   networkId: 1, // mainnet
-  paymentCredential: new Core.ScriptHash.ScriptHash({
+  paymentCredential: new ScriptHash.ScriptHash({
     hash: new Uint8Array(28) // 28-byte payment script hash
   }),
-  stakeCredential: new Core.ScriptHash.ScriptHash({
+  stakeCredential: new ScriptHash.ScriptHash({
     hash: new Uint8Array(28) // 28-byte stake script hash
   })
 });
 
-const bech32 = Core.AddressEras.toBech32(scriptAddress);
+const bech32 = AddressEras.toBech32(scriptAddress);
 console.log("Script-based address:", bech32);
 ```
 
diff --git a/docs/content/docs/addresses/address-types/enterprise.mdx b/docs/content/docs/addresses/address-types/enterprise.mdx
index 4a8d0e20..f439f340 100644
--- a/docs/content/docs/addresses/address-types/enterprise.mdx
+++ b/docs/content/docs/addresses/address-types/enterprise.mdx
@@ -21,17 +21,17 @@ Enterprise Address = Payment Credential Only
 Create enterprise addresses by instantiating the `EnterpriseAddress` class:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { AddressEras, EnterpriseAddress, KeyHash, ScriptHash } from "@evolution-sdk/evolution";
 
-const address = new Core.EnterpriseAddress.EnterpriseAddress({
+const address = new EnterpriseAddress.EnterpriseAddress({
   networkId: 1, // mainnet
-  paymentCredential: new Core.KeyHash.KeyHash({
+  paymentCredential: new KeyHash.KeyHash({
     hash: new Uint8Array(28)
   })
 });
 
 // Convert to Bech32 string
-const bech32 = Core.AddressEras.toBech32(address);
+const bech32 = AddressEras.toBech32(address);
 console.log(bech32); // "addr1..."
 ```
 
@@ -40,11 +40,11 @@ console.log(bech32); // "addr1..."
 Parse a Bech32 address string into an `EnterpriseAddress` instance:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { AddressEras, EnterpriseAddress, KeyHash, ScriptHash } from "@evolution-sdk/evolution";
 
 const bech32 = "addr1vx2kd28nq8ac5prwg32hhvudlwggpgfp8utlyqxu6wqgz6cevnrgl";
 
-const address = Core.AddressEras.fromBech32(bech32) as Core.EnterpriseAddress.EnterpriseAddress;
+const address = AddressEras.fromBech32(bech32) as EnterpriseAddress.EnterpriseAddress;
 
 console.log("Network ID:", address.networkId);
 console.log("Payment:", address.paymentCredential);
@@ -55,18 +55,18 @@ console.log("Payment:", address.paymentCredential);
 Enterprise addresses can use script hashes as payment credentials:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { AddressEras, EnterpriseAddress, KeyHash, ScriptHash } from "@evolution-sdk/evolution";
 
 // Script address example
-const scriptAddr = new Core.EnterpriseAddress.EnterpriseAddress({
+const scriptAddr = new EnterpriseAddress.EnterpriseAddress({
   networkId: 1, // mainnet
-  paymentCredential: new Core.ScriptHash.ScriptHash({
+  paymentCredential: new ScriptHash.ScriptHash({
     hash: new Uint8Array(28) // 28-byte script hash
   })
 });
 
 // Convert to Bech32 string
-const bech32 = Core.AddressEras.toBech32(scriptAddr);
+const bech32 = AddressEras.toBech32(scriptAddr);
 console.log("Script enterprise address:", bech32);
 ```
 
diff --git a/docs/content/docs/addresses/address-types/index.mdx b/docs/content/docs/addresses/address-types/index.mdx
index 15e0e233..ed284cfb 100644
--- a/docs/content/docs/addresses/address-types/index.mdx
+++ b/docs/content/docs/addresses/address-types/index.mdx
@@ -11,13 +11,13 @@ The Evolution SDK implements all Cardano address formats as defined in the ledge
 
 Evolution SDK provides two interfaces for working with addresses:
 
-**Core Address Module (`Core.Address`)**: A unified API for common address operations.
+**Core Address Module (`Address`)**: A unified API for common address operations.
 - Handles `Payment Credential + Optional Staking Credential`
 - Automatically serializes as Base Address (with staking) or Enterprise Address (without staking)
 - Simplifies most serialization tasks
 
 **Type-Specific Modules**: Complete implementations for protocol compliance.
-- `Core.BaseAddress`, `Core.EnterpriseAddress`, `Core.RewardAddress`, `Core.PointerAddress`, `Core.ByronAddress`
+- `BaseAddress`, `EnterpriseAddress`, `RewardAddress`, `PointerAddress`, `ByronAddress`
 - Required for exact CBOR encoding/decoding
 - Used for protocol-level operations and blockchain tooling
 
diff --git a/docs/content/docs/addresses/address-types/pointer.mdx b/docs/content/docs/addresses/address-types/pointer.mdx
index e9cb5ce3..e48a491c 100644
--- a/docs/content/docs/addresses/address-types/pointer.mdx
+++ b/docs/content/docs/addresses/address-types/pointer.mdx
@@ -41,15 +41,15 @@ Pointer Address = Payment Credential + Pointer (slot, txIndex, certIndex)
 
 ## Parsing Pointer Addresses (Legacy)
 
-> **Note**: `Core.Address` does not support pointer addresses as they are deprecated. Use `Core.AddressEras` for historical parsing.
+> **Note**: `Address` does not support pointer addresses as they are deprecated. Use `AddressEras` for historical parsing.
 
 If you encounter a pointer address in historical data, you can parse it using `AddressEras`:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { AddressEras, KeyHash, Pointer, PointerAddress } from "@evolution-sdk/evolution";
 
 // Parse a pointer address from Bech32 using AddressEras (legacy support)
-const address = Core.AddressEras.fromBech32("addr_test1gz2n8fvzgmyhnqlpnv2340v09943nr7pz5af2rwqrra8ncsm0tdz8");
+const address = AddressEras.fromBech32("addr_test1gz2n8fvzgmyhnqlpnv2340v09943nr7pz5af2rwqrra8ncsm0tdz8");
 
 if (address._tag === "PointerAddress") {
   // Type narrowed to PointerAddress - access pointer-specific properties
@@ -87,16 +87,16 @@ If any of these fail, the address is invalid.
 This example shows the structure for completeness. **Do not use in production**:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { AddressEras, KeyHash, Pointer, PointerAddress } from "@evolution-sdk/evolution";
 
 // Create payment credential (key hash)
-const paymentCred = new Core.KeyHash.KeyHash({
+const paymentCred = new KeyHash.KeyHash({
   hash: new Uint8Array(28).fill(0)
 });
 
 // Create pointer to stake registration certificate
 // Note: Pointer uses numbers, not bigint
-const pointer = new Core.Pointer.Pointer({
+const pointer = new Pointer.Pointer({
   slot: 12345,
   txIndex: 2,
   certIndex: 0
@@ -104,7 +104,7 @@ const pointer = new Core.Pointer.Pointer({
 
 // Construct pointer address (rarely used in practice)
 // PointerAddress is a separate class from regular Address
-const pointerAddr = new Core.PointerAddress.PointerAddress({
+const pointerAddr = new PointerAddress.PointerAddress({
   networkId: 0,
   paymentCredential: paymentCred,
   pointer: pointer
diff --git a/docs/content/docs/addresses/address-types/reward.mdx b/docs/content/docs/addresses/address-types/reward.mdx
index 0e81a6a8..73d22ed0 100644
--- a/docs/content/docs/addresses/address-types/reward.mdx
+++ b/docs/content/docs/addresses/address-types/reward.mdx
@@ -21,17 +21,17 @@ Reward Address = Staking Credential Only
 Create reward addresses by instantiating the `RewardAccount` class:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { KeyHash, RewardAccount, ScriptHash } from "@evolution-sdk/evolution";
 
-const rewardAccount = new Core.RewardAccount.RewardAccount({
+const rewardAccount = new RewardAccount.RewardAccount({
   networkId: 1, // mainnet
-  stakeCredential: new Core.KeyHash.KeyHash({
+  stakeCredential: new KeyHash.KeyHash({
     hash: new Uint8Array(28)
   })
 });
 
 // Convert to Bech32 string
-const bech32 = Core.RewardAccount.toBech32(rewardAccount);
+const bech32 = RewardAccount.toBech32(rewardAccount);
 console.log(bech32); // "stake1..."
 ```
 
@@ -40,11 +40,11 @@ console.log(bech32); // "stake1..."
 Parse a Bech32 stake address string into a `RewardAccount` instance:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { KeyHash, RewardAccount, ScriptHash } from "@evolution-sdk/evolution";
 
 const bech32 = "stake1uyehkck0lajq8gr28t9uxnuvgcqrc6070x3k9r8048z8y5gh6ffgw";
 
-const address = Core.RewardAccount.fromBech32(bech32);
+const address = RewardAccount.fromBech32(bech32);
 
 console.log("Network ID:", address.networkId);
 console.log("Stake credential:", address.stakeCredential);
@@ -55,17 +55,17 @@ console.log("Stake credential:", address.stakeCredential);
 Reward addresses can use script hashes for the staking credential:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { KeyHash, RewardAccount, ScriptHash } from "@evolution-sdk/evolution";
 
 // Reward address with script credential
-const scriptRewardAccount = new Core.RewardAccount.RewardAccount({
+const scriptRewardAccount = new RewardAccount.RewardAccount({
   networkId: 1, // mainnet
-  stakeCredential: new Core.ScriptHash.ScriptHash({
+  stakeCredential: new ScriptHash.ScriptHash({
     hash: new Uint8Array(28) // 28-byte stake script hash
   })
 });
 
-const bech32 = Core.RewardAccount.toBech32(scriptRewardAccount);
+const bech32 = RewardAccount.toBech32(scriptRewardAccount);
 console.log("Script-based reward address:", bech32);
 ```
 
diff --git a/docs/content/docs/addresses/address.mdx b/docs/content/docs/addresses/address.mdx
index 875bf25d..f59ea720 100644
--- a/docs/content/docs/addresses/address.mdx
+++ b/docs/content/docs/addresses/address.mdx
@@ -1,11 +1,11 @@
 ---
 title: Address
-description: Working with Cardano addresses using Core.Address
+description: Working with Cardano addresses using Address
 ---
 
 # Address
 
-The Evolution SDK provides `Core.Address` for working with modern Cardano addresses. This module handles parsing, validation, inspection, and conversion between formats.
+The Evolution SDK provides `Address` for working with modern Cardano addresses. This module handles parsing, validation, inspection, and conversion between formats.
 
 ## Modern Address Types
 
@@ -21,15 +21,15 @@ Legacy formats (Byron, Pointer) exist for historical compatibility but are no lo
 ### Parsing Addresses
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { Address, KeyHash } from "@evolution-sdk/evolution";
 
 // Parse from Bech32 (most common format)
-const address = Core.Address.fromBech32(
+const address = Address.fromBech32(
   "addr1qx2kd28nq8ac5prwg32hhvudlwggpgfp8utlyqxu6wqgz62f79qsdmm5dsknt9ecr5w468r9ey0fxwkdrwh08ly3tu9sy0f4qd"
 );
 
 // Parse from hex
-const address2 = Core.Address.fromHex(
+const address2 = Address.fromHex(
   "01195a6a8c607b8a0237109aab5e31b7c8828509fb17e4019cd381021a4f8a081b7bd1b0d35972c0e8eaba8e5c923c99d66a3bbe78ff23c5855"
 );
 ```
@@ -37,26 +37,26 @@ const address2 = Core.Address.fromHex(
 ### Converting Formats
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { Address, KeyHash } from "@evolution-sdk/evolution";
 
-const address = Core.Address.fromBech32(
+const address = Address.fromBech32(
   "addr1qx2kd28nq8ac5prwg32hhvudlwggpgfp8utlyqxu6wqgz62f79qsdmm5dsknt9ecr5w468r9ey0fxwkdrwh08ly3tu9sy0f4qd"
 );
 
 // Convert to different formats
-const bech32 = Core.Address.toBech32(address);  // "addr1qx2k..."
-const hex = Core.Address.toHex(address);        // "01195a6a..."
-const bytes = Core.Address.toBytes(address);    // Uint8Array
+const bech32 = Address.toBech32(address);  // "addr1qx2k..."
+const hex = Address.toHex(address);        // "01195a6a..."
+const bytes = Address.toBytes(address);    // Uint8Array
 ```
 
 ### Validating User Input
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { Address, KeyHash } from "@evolution-sdk/evolution";
 
-function validateAddress(input: string): Core.Address.Address | null {
+function validateAddress(input: string): Address.Address | null {
   try {
-    const address = Core.Address.fromBech32(input);
+    const address = Address.fromBech32(input);
     
     // Check network (0 = testnet, 1 = mainnet)
     if (address.networkId !== 1) {
@@ -76,16 +76,16 @@ function validateAddress(input: string): Core.Address.Address | null {
 ### Type Checking
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { Address, KeyHash } from "@evolution-sdk/evolution";
 
-const address = Core.Address.fromBech32(
+const address = Address.fromBech32(
   "addr1qx2kd28nq8ac5prwg32hhvudlwggpgfp8utlyqxu6wqgz62f79qsdmm5dsknt9ecr5w468r9ey0fxwkdrwh08ly3tu9sy0f4qd"
 );
 
 // Check address type
-const details = Core.Address.getAddressDetails(Core.Address.toBech32(address));
-const isEnterprise = Core.Address.isEnterprise(address); // false
-const hasStaking = Core.Address.hasStakingCredential(address); // true
+const details = Address.getAddressDetails(Address.toBech32(address));
+const isEnterprise = Address.isEnterprise(address); // false
+const hasStaking = Address.hasStakingCredential(address); // true
 
 if (details?.type === "Base") {
   console.log("Base address with staking capability");
@@ -99,9 +99,9 @@ if (details?.type === "Base") {
 For comprehensive information about an address:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { Address, KeyHash } from "@evolution-sdk/evolution";
 
-const details = Core.Address.getAddressDetails(
+const details = Address.getAddressDetails(
   "addr1qx2kd28nq8ac5prwg32hhvudlwggpgfp8utlyqxu6wqgz62f79qsdmm5dsknt9ecr5w468r9ey0fxwkdrwh08ly3tu9sy0f4qd"
 );
 
@@ -118,31 +118,31 @@ if (details) {
 For advanced use cases, you can construct addresses from credentials:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { Address, KeyHash } from "@evolution-sdk/evolution";
 
 // Create payment credential from key hash
-const paymentCred = new Core.KeyHash.KeyHash({
+const paymentCred = new KeyHash.KeyHash({
   hash: new Uint8Array(28) // 28-byte key hash
 });
 
 // Create staking credential  
-const stakeCred = new Core.KeyHash.KeyHash({
+const stakeCred = new KeyHash.KeyHash({
   hash: new Uint8Array(28) // 28-byte key hash
 });
 
 // Construct base address directly
-const address = new Core.Address.Address({
+const address = new Address.Address({
   networkId: 1, // mainnet
   paymentCredential: paymentCred,
   stakingCredential: stakeCred
 });
 
-const bech32 = Core.Address.toBech32(address);
+const bech32 = Address.toBech32(address);
 ```
 
 ## Legacy Address Types
 
-For historical compatibility, Evolution SDK supports legacy address formats via `Core.AddressEras`:
+For historical compatibility, Evolution SDK supports legacy address formats via `AddressEras`:
 
 - **Byron addresses** - Legacy Byron-era format (no longer used)
 - **Pointer addresses** - Reference stake credentials via on-chain pointers (deprecated)
diff --git a/docs/content/docs/addresses/conversion.mdx b/docs/content/docs/addresses/conversion.mdx
index 862ce630..9ac3e385 100644
--- a/docs/content/docs/addresses/conversion.mdx
+++ b/docs/content/docs/addresses/conversion.mdx
@@ -30,19 +30,19 @@ Binary format (Uint8Array), used internally and for serialization.
 ### Bech32 ↔ Address
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { Address, KeyHash } from "@evolution-sdk/evolution";
 
 const bech32 = "addr1qx2kd28nq8ac5prwg32hhvudlwggpgfp8utlyqxu6wqgz62f79qsdmm5dsknt9ecr5w468r9ey0fxwkdrwh08ly3tu9sy0f4qd";
 
 // Parse Bech32 string to address
-const address = Core.Address.fromBech32(bech32);
+const address = Address.fromBech32(bech32);
 
 console.log("Network ID:", address.networkId);
 console.log("Payment credential:", address.paymentCredential);
 console.log("Staking credential:", address.stakingCredential);
 
 // Convert address back to Bech32
-const encoded = Core.Address.toBech32(address);
+const encoded = Address.toBech32(address);
 console.log("Bech32:", encoded);
 // Same as original: addr1qx2kd28nq8ac5prwg32hhvudlwggpgfp8utlyqxu6wqgz62f79qsdmm5dsknt9ecr5w468r9ey0fxwkdrwh08ly3tu9sy0f4qd
 ```
@@ -50,42 +50,42 @@ console.log("Bech32:", encoded);
 ### Hex ↔ Address
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { Address, KeyHash } from "@evolution-sdk/evolution";
 
 const hexAddress = "019493315cd92eb5d8c4304e67b7e16ae36d61d34502694657811a2c8e32c728d3861e164cab28cb8f006448139c8f1740ffb8e7aa9e5232dc";
 
 // Parse hex to address
-const address = Core.Address.fromHex(hexAddress);
+const address = Address.fromHex(hexAddress);
 
 console.log("Parsed from hex:", address);
 
 // Convert address to hex
-const hex = Core.Address.toHex(address);
+const hex = Address.toHex(address);
 console.log("Hex:", hex);
 ```
 
 ### Bytes ↔ Address
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { Address, KeyHash } from "@evolution-sdk/evolution";
 
 // Create an address structure
-const address = new Core.Address.Address({
+const address = new Address.Address({
   networkId: 1,
-  paymentCredential: new Core.KeyHash.KeyHash({
+  paymentCredential: new KeyHash.KeyHash({
     hash: new Uint8Array(28)
   }),
-  stakingCredential: new Core.KeyHash.KeyHash({
+  stakingCredential: new KeyHash.KeyHash({
     hash: new Uint8Array(28)
   })
 });
 
 // Convert to raw bytes
-const bytes = Core.Address.toBytes(address);
+const bytes = Address.toBytes(address);
 console.log("Bytes length:", bytes.length); // 57 for base address
 
 // Parse from bytes
-const decoded = Core.Address.fromBytes(bytes);
+const decoded = Address.fromBytes(bytes);
 console.log("Decoded:", decoded);
 ```
 
@@ -94,13 +94,13 @@ console.log("Decoded:", decoded);
 Conversions can fail with invalid input:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { Address, KeyHash } from "@evolution-sdk/evolution";
 
 const invalidBech32 = "invalid_address";
 
 // Error handling with try-catch
 try {
-  const address = Core.Address.fromBech32(invalidBech32);
+  const address = Address.fromBech32(invalidBech32);
   console.log("Parsed address:", address);
 } catch (error) {
   console.error("Failed to parse address:", error);
@@ -111,4 +111,4 @@ try {
 
 - **[Address Validation](/docs/addresses/validation)** - Verify address correctness and handle errors
 - **[Address Types](/docs/addresses/address-types)** - Overview of all Cardano address types
-- **[Core.Address](/docs/addresses/address)** - Parse, validate, and convert addresses
+- **[Address](/docs/addresses/address)** - Parse, validate, and convert addresses
diff --git a/docs/content/docs/addresses/franken.mdx b/docs/content/docs/addresses/franken.mdx
index 7ad44a76..99813389 100644
--- a/docs/content/docs/addresses/franken.mdx
+++ b/docs/content/docs/addresses/franken.mdx
@@ -52,21 +52,21 @@ This flexibility makes the pattern ideal for complex custody arrangements, DeFi
 Build directly from two independent key hashes using the Core `Address` class:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { Address, KeyHash } from "@evolution-sdk/evolution";
 
 // Create Franken address with payment from Wallet A, stake from Wallet B
-const frankenAddress = new Core.Address.Address({
+const frankenAddress = new Address.Address({
   networkId: 1, // mainnet
-  paymentCredential: new Core.KeyHash.KeyHash({
+  paymentCredential: new KeyHash.KeyHash({
     hash: new Uint8Array(28) // Wallet A's payment key hash
   }),
-  stakingCredential: new Core.KeyHash.KeyHash({
+  stakingCredential: new KeyHash.KeyHash({
     hash: new Uint8Array(28) // Wallet B's stake key hash (different!)
   })
 });
 
 // Convert to Bech32
-const bech32 = Core.Address.toBech32(frankenAddress);
+const bech32 = Address.toBech32(frankenAddress);
 console.log("Franken address:", bech32);
 ```
 
@@ -75,7 +75,7 @@ console.log("Franken address:", bech32);
 A common use case is a custodial platform where the platform controls fund management, but users retain control over staking delegation:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { Address, KeyHash } from "@evolution-sdk/evolution";
 
 // Platform controls spending (payment credential)
 // User controls delegation (stake credential)
@@ -83,12 +83,12 @@ function createCustodialAddress(
   platformPaymentHash: Uint8Array,
   userStakeHash: Uint8Array
 ) {
-  return new Core.Address.Address({
+  return new Address.Address({
     networkId: 1,
-    paymentCredential: new Core.KeyHash.KeyHash({
+    paymentCredential: new KeyHash.KeyHash({
       hash: platformPaymentHash
     }),
-    stakingCredential: new Core.KeyHash.KeyHash({
+    stakingCredential: new KeyHash.KeyHash({
       hash: userStakeHash
     })
   });
diff --git a/docs/content/docs/addresses/index.mdx b/docs/content/docs/addresses/index.mdx
index 4b1d5ef1..2e3c4c43 100644
--- a/docs/content/docs/addresses/index.mdx
+++ b/docs/content/docs/addresses/index.mdx
@@ -5,11 +5,11 @@ description: Working with Cardano addresses in Evolution SDK
 
 # Address Overview
 
-Cardano addresses identify where funds can be sent and who controls them. The Evolution SDK provides `Core.Address` for working with payment credentials and optional staking credentials, handling the complexity of different address formats.
+Cardano addresses identify where funds can be sent and who controls them. The Evolution SDK provides `Address` for working with payment credentials and optional staking credentials, handling the complexity of different address formats.
 
 ## The Core Address Model
 
-Instead of dealing with multiple address types (BaseAddress, EnterpriseAddress, etc.), Evolution SDK uses a unified `Core.Address` structure:
+Instead of dealing with multiple address types (BaseAddress, EnterpriseAddress, etc.), Evolution SDK uses a unified `Address` structure:
 
 ```typescript
 Address = Payment Credential + Optional Staking Credential
@@ -26,22 +26,22 @@ You can import address functionality in two ways:
 ### Option 1: From the Main Package (Recommended)
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { Address, KeyHash } from "@evolution-sdk/evolution";
 
 // Example: Create an address with both payment and stake credentials
-const paymentCred = new Core.KeyHash.KeyHash({ hash: new Uint8Array(28) });
-const address = new Core.Address.Address({
+const paymentCred = new KeyHash.KeyHash({ hash: new Uint8Array(28) });
+const address = new Address.Address({
   networkId: 1,
   paymentCredential: paymentCred
 });
 ```
-**Note:** The double naming (e.g., `Core.Address.Address`) is intentional - the first is the module namespace, the second is the class constructor.
+**Note:** The double naming (e.g., `Address.Address`) is intentional - the first is the module namespace, the second is the class constructor.
 
 ### Option 2: Direct Module Imports
 
 ```typescript twoslash
-import { Address } from "@evolution-sdk/evolution/core/Address";
-import { KeyHash } from "@evolution-sdk/evolution/core/KeyHash";
+import { Address } from "@evolution-sdk/evolution/Address";
+import { KeyHash } from "@evolution-sdk/evolution/KeyHash";
 
 // Same functionality, imported directly from modules
 const paymentCred = new KeyHash({ hash: new Uint8Array(28) });
@@ -56,12 +56,12 @@ const address = new Address({
 ### Parse and Inspect Addresses
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Address, KeyHash } from "@evolution-sdk/evolution"
 
 const bech32 = "addr1qx2kd28nq8ac5prwg32hhvudlwggpgfp8utlyqxu6wqgz62f79qsdmm5dsknt9ecr5w468r9ey0fxwkdrwh08ly3tu9sy0f4qd"
 
 // Parse from Bech32
-const address = Core.Address.fromBech32(bech32)
+const address = Address.fromBech32(bech32)
 
 // Inspect properties
 console.log("Network:", address.networkId === 1 ? "mainnet" : "testnet")
@@ -76,35 +76,35 @@ console.log("Supports staking:", hasStaking)
 ### Create New Addresses
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Address, KeyHash } from "@evolution-sdk/evolution"
 
 // Example credentials (in real code, derive from keys)
-const paymentCred = new Core.KeyHash.KeyHash({ 
+const paymentCred = new KeyHash.KeyHash({ 
   hash: new Uint8Array(28) // Your payment key hash
 })
-const stakeCred = new Core.KeyHash.KeyHash({ 
+const stakeCred = new KeyHash.KeyHash({ 
   hash: new Uint8Array(28) // Your stake key hash
 })
 
 // Address with staking (like Base Address)
-const stakingAddress = new Core.Address.Address({
+const stakingAddress = new Address.Address({
   networkId: 1, // mainnet
   paymentCredential: paymentCred,
   stakingCredential: stakeCred
 })
 
 // Address without staking (like Enterprise Address)
-const paymentOnlyAddress = new Core.Address.Address({
+const paymentOnlyAddress = new Address.Address({
   networkId: 1,
   paymentCredential: paymentCred
   // No stakingCredential = enterprise-like behavior
 })
 
 // Convert to Bech32 string
-const bech32String = Core.Address.toBech32(stakingAddress)
+const bech32String = Address.toBech32(stakingAddress)
 ```
 
-[Learn about the Core.Address module →](/docs/addresses/address)
+[Learn about the Address module →](/docs/addresses/address)
 
 ## When to Use Each Pattern
 
@@ -119,12 +119,12 @@ const bech32String = Core.Address.toBech32(stakingAddress)
 **Equivalent to:** Base Address in Cardano specification
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { Address, KeyHash } from "@evolution-sdk/evolution";
 
-const paymentCred = new Core.KeyHash.KeyHash({ hash: new Uint8Array(28) });
-const stakeCred = new Core.KeyHash.KeyHash({ hash: new Uint8Array(28) });
+const paymentCred = new KeyHash.KeyHash({ hash: new Uint8Array(28) });
+const stakeCred = new KeyHash.KeyHash({ hash: new Uint8Array(28) });
 
-const address = new Core.Address.Address({
+const address = new Address.Address({
   networkId: 1,
   paymentCredential: paymentCred,
   stakingCredential: stakeCred // ← Enables staking
@@ -142,11 +142,11 @@ const address = new Core.Address.Address({
 **Equivalent to:** Enterprise Address in Cardano specification
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { Address, KeyHash } from "@evolution-sdk/evolution";
 
-const paymentCred = new Core.KeyHash.KeyHash({ hash: new Uint8Array(28) });
+const paymentCred = new KeyHash.KeyHash({ hash: new Uint8Array(28) });
 
-const address = new Core.Address.Address({
+const address = new Address.Address({
   networkId: 1,
   paymentCredential: paymentCred
   // No stakingCredential = payment only
@@ -197,9 +197,9 @@ Addresses use different Bech32 prefixes based on network:
 
 ## Understanding Address Eras
 
-While `Core.Address` covers most use cases, Cardano's ledger specification defines several specific address types. These are called **Address Eras**:
+While `Address` covers most use cases, Cardano's ledger specification defines several specific address types. These are called **Address Eras**:
 
-| Era Type | Core.Address Equivalent | When to Learn More |
+| Era Type | Address Equivalent | When to Learn More |
 |----------|----------------------|-------------------|
 | **Base** | Address with staking credential | Standard addresses |
 | **Enterprise** | Address without staking credential | Exchange/contract addresses |
@@ -253,7 +253,7 @@ Verify address format and network:
 ## Next Steps
 
 **Core Concepts:**
-- [Core.Address](/docs/addresses/address) - How to parse, validate, and convert addresses
+- [Address](/docs/addresses/address) - How to parse, validate, and convert addresses
 - [Address Types](/docs/addresses/address-types) - Comprehensive coverage of all address types
 
 **Advanced Patterns:**
diff --git a/docs/content/docs/addresses/validation.mdx b/docs/content/docs/addresses/validation.mdx
index b98d2633..3837586d 100644
--- a/docs/content/docs/addresses/validation.mdx
+++ b/docs/content/docs/addresses/validation.mdx
@@ -12,11 +12,11 @@ Validating addresses is critical before using them in transactions. The SDK prov
 Create a helper function for safe address validation:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { Address } from "@evolution-sdk/evolution";
 
 function validateAddress(addressString: string) {
   try {
-    const address = Core.Address.fromBech32(addressString);
+    const address = Address.fromBech32(addressString);
     return { success: true, address } as const;
   } catch (error) {
     return { success: false, error } as const;
@@ -37,14 +37,14 @@ if (result.success) {
 Verify an address belongs to the expected network:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { Address } from "@evolution-sdk/evolution";
 
 function validateNetwork(
   addressString: string,
   expectedNetwork: "mainnet" | "testnet"
 ): boolean {
   try {
-    const address = Core.Address.fromBech32(addressString);
+    const address = Address.fromBech32(addressString);
     const expectedNetworkId = expectedNetwork === "mainnet" ? 1 : 0;
     
     if (address.networkId !== expectedNetworkId) {
@@ -71,12 +71,12 @@ const isInvalid = validateNetwork("addr_test1qz...", "mainnet"); // false
 Check if an address has staking credentials:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { Address } from "@evolution-sdk/evolution";
 
 function hasStakingCredential(addressString: string): boolean {
   try {
-    const address = Core.Address.fromBech32(addressString);
-    return Core.Address.hasStakingCredential(address);
+    const address = Address.fromBech32(addressString);
+    return Address.hasStakingCredential(address);
   } catch {
     return false;
   }
@@ -84,8 +84,8 @@ function hasStakingCredential(addressString: string): boolean {
 
 function isEnterpriseAddress(addressString: string): boolean {
   try {
-    const address = Core.Address.fromBech32(addressString);
-    return Core.Address.isEnterprise(address);
+    const address = Address.fromBech32(addressString);
+    return Address.isEnterprise(address);
   } catch {
     return false;
   }
@@ -101,13 +101,13 @@ console.log(isEnterpriseAddress("addr1vx...")); // true for enterprise addresses
 ### User Input Validation
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { Address } from "@evolution-sdk/evolution";
 
 function validateUserInput(input: string): string | null {
   const trimmed = input.trim();
   
   try {
-    Core.Address.fromBech32(trimmed);
+    Address.fromBech32(trimmed);
     return trimmed;
   } catch (error) {
     alert("Invalid address format. Please check and try again.");
@@ -119,7 +119,7 @@ function validateUserInput(input: string): string | null {
 ### Bulk Validation
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { Address } from "@evolution-sdk/evolution";
 
 function validateMany(addresses: string[]): {
   valid: string[];
@@ -130,7 +130,7 @@ function validateMany(addresses: string[]): {
   
   for (const addr of addresses) {
     try {
-      Core.Address.fromBech32(addr);
+      Address.fromBech32(addr);
       valid.push(addr);
     } catch (error) {
       invalid.push({ address: addr, error: String(error) });
@@ -145,4 +145,4 @@ function validateMany(addresses: string[]): {
 
 - **[Address Conversion](/docs/addresses/conversion)** - Transform between Bech32, hex, and byte formats
 - **[Address Types](/docs/addresses/address-types)** - Overview of all Cardano address types
-- **[Core.Address](/docs/addresses/address)** - Parse, validate, and convert addresses
+- **[Address](/docs/addresses/address)** - Parse, validate, and convert addresses
diff --git a/docs/content/docs/clients/architecture.mdx b/docs/content/docs/clients/architecture.mdx
index 955d15ca..f4bae19e 100644
--- a/docs/content/docs/clients/architecture.mdx
+++ b/docs/content/docs/clients/architecture.mdx
@@ -32,7 +32,7 @@ interface ReadOnlyWalletConfig {
 ### Backend Transaction Building
 
 ```typescript twoslash
-import { createClient, Core } from "@evolution-sdk/evolution";
+import { Address, Assets, Transaction, createClient } from "@evolution-sdk/evolution";
 
 // Backend: Create provider client, then attach read-only wallet
 const providerClient = createClient({
@@ -53,14 +53,14 @@ const backendClient = providerClient.attachWallet({
 // Build unsigned transaction
 const builder = backendClient.newTx();
 builder.payToAddress({
-  address: Core.Address.fromBech32("addr1qz8eg0aknl96hd3v6x3qfmmz5zhtrq5hn8hmq0x4qd6m2qdppx88rnw3eumv9zv2ctjns05c8jhsqwg98qaxcz2qh45qhjv39c"),
-  assets: Core.Assets.fromLovelace(5_000_000n)
+  address: Address.fromBech32("addr1qz8eg0aknl96hd3v6x3qfmmz5zhtrq5hn8hmq0x4qd6m2qdppx88rnw3eumv9zv2ctjns05c8jhsqwg98qaxcz2qh45qhjv39c"),
+  assets: Assets.fromLovelace(5_000_000n)
 });
 
 // Build returns result, get transaction and serialize
 const result = await builder.build();
 const unsignedTx = await result.toTransaction();
-const txCbor = Core.Transaction.toCBORHex(unsignedTx);
+const txCbor = Transaction.toCBORHex(unsignedTx);
 
 // Return to frontend for signing
 // Frontend: wallet.signTx(txCbor) → wallet.submitTx(signedTxCbor)
@@ -87,7 +87,7 @@ Frontend applications connect to user wallets through CIP-30 but never have prov
 ### Implementation
 
 ```typescript
-import { createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, Transaction, createClient } from "@evolution-sdk/evolution";
 
 // 1. Connect wallet
 declare const cardano: any;
@@ -138,7 +138,7 @@ Backend services use read-only wallets configured with user addresses to build u
 ### Implementation
 
 ```typescript
-import { createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, Transaction, createClient } from "@evolution-sdk/evolution";
 
 // Backend endpoint
 export async function buildTransaction(userAddress: string) {
@@ -159,8 +159,8 @@ export async function buildTransaction(userAddress: string) {
   // Build unsigned transaction
   const builder = client.newTx();
   builder.payToAddress({
-    address: Core.Address.fromBech32("addr1qz8eg0aknl96hd3v6x3qfmmz5zhtrq5hn8hmq0x4qd6m2qdppx88rnw3eumv9zv2ctjns05c8jhsqwg98qaxcz2qh45qhjv39c"),
-    assets: Core.Assets.fromLovelace(5_000_000n)
+    address: Address.fromBech32("addr1qz8eg0aknl96hd3v6x3qfmmz5zhtrq5hn8hmq0x4qd6m2qdppx88rnw3eumv9zv2ctjns05c8jhsqwg98qaxcz2qh45qhjv39c"),
+    assets: Assets.fromLovelace(5_000_000n)
   });
 
   // Returns unsigned transaction
@@ -193,7 +193,7 @@ export type BuildPaymentResponse = { txCbor: string };
 
 // @filename: frontend.ts
 // ===== Frontend (Browser) =====
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, Transaction, createClient } from "@evolution-sdk/evolution";
 import type { BuildPaymentResponse } from "./shared";
 
 declare const cardano: any;
@@ -207,7 +207,7 @@ async function sendPayment(recipientAddress: string, lovelace: bigint) {
   });
 
   // 2. Get user address (returns Core Address, convert to bech32 for backend)
-  const userAddress = Core.Address.toBech32(await walletClient.address());
+  const userAddress = Address.toBech32(await walletClient.address());
 
   // 3. Request backend to build transaction
   const response = await fetch("/api/build-payment", {
@@ -232,7 +232,7 @@ async function sendPayment(recipientAddress: string, lovelace: bigint) {
 
 // @filename: backend.ts
 // ===== Backend (Server) =====
-import { createClient, Core } from "@evolution-sdk/evolution";
+import { Address, Assets, Transaction, createClient } from "@evolution-sdk/evolution";
 
 export async function buildPayment(
   userAddressBech32: string,
@@ -240,7 +240,7 @@ export async function buildPayment(
   lovelace: bigint
 ) {
   // Convert bech32 addresses from frontend to Core Address
-  const recipientAddress = Core.Address.fromBech32(recipientAddressBech32);
+  const recipientAddress = Address.fromBech32(recipientAddressBech32);
 
   // Create provider client first, then attach read-only wallet
   const providerClient = createClient({
@@ -262,13 +262,13 @@ export async function buildPayment(
   const builder = client.newTx();
   builder.payToAddress({
     address: recipientAddress,
-    assets: Core.Assets.fromLovelace(lovelace)
+    assets: Assets.fromLovelace(lovelace)
   });
 
   // Return unsigned CBOR for frontend to sign
   const result = await builder.build();
   const unsignedTx = await result.toTransaction();
-  const txCbor = Core.Transaction.toCBORHex(unsignedTx);
+  const txCbor = Transaction.toCBORHex(unsignedTx);
 
   return { txCbor };
 }
diff --git a/docs/content/docs/clients/architecture/frontend-backend.mdx b/docs/content/docs/clients/architecture/frontend-backend.mdx
index 6eafda19..168bd616 100644
--- a/docs/content/docs/clients/architecture/frontend-backend.mdx
+++ b/docs/content/docs/clients/architecture/frontend-backend.mdx
@@ -32,7 +32,7 @@ Frontend applications use API wallet clients (CIP-30) for signing only. They hav
 **Cannot Do**: Build transactions, query blockchain, fee calculation
 
 ```typescript twoslash
-import { createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, Transaction, createClient } from "@evolution-sdk/evolution";
 
 declare const cardano: any;
 
@@ -81,7 +81,7 @@ Backend services use read-only clients configured with user addresses to build u
 **Cannot Do**: Sign transactions, access private keys
 
 ```typescript twoslash
-import { createClient, Core } from "@evolution-sdk/evolution";
+import { Address, Assets, Transaction, createClient } from "@evolution-sdk/evolution";
 
 export async function buildTransaction(userAddressBech32: string) {
   // Create read-only client with user's address (bech32 string)
@@ -101,14 +101,14 @@ export async function buildTransaction(userAddressBech32: string) {
   // Build unsigned transaction
   const builder = client.newTx();
   builder.payToAddress({
-    address: Core.Address.fromBech32("addr1qz8eg0aknl96hd3v6x3qfmmz5zhtrq5hn8hmq0x4qd6m2qdppx88rnw3eumv9zv2ctjns05c8jhsqwg98qaxcz2qh45qhjv39c"),
-    assets: Core.Assets.fromLovelace(5000000n)
+    address: Address.fromBech32("addr1qz8eg0aknl96hd3v6x3qfmmz5zhtrq5hn8hmq0x4qd6m2qdppx88rnw3eumv9zv2ctjns05c8jhsqwg98qaxcz2qh45qhjv39c"),
+    assets: Assets.fromLovelace(5000000n)
   });
 
   // Build and return unsigned transaction
   const result = await builder.build();
   const unsignedTx = await result.toTransaction();
-  const txCbor = Core.Transaction.toCBORHex(unsignedTx);
+  const txCbor = Transaction.toCBORHex(unsignedTx);
 
   return { txCbor };
 }
@@ -142,7 +142,7 @@ export type BuildPaymentResponse = {
 
 // @filename: frontend.ts
 // ===== Frontend (Browser) =====
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, Transaction, createClient } from "@evolution-sdk/evolution";
 import type { BuildPaymentRequest, BuildPaymentResponse } from "./shared";
 
 declare const cardano: any;
@@ -158,7 +158,7 @@ async function sendPayment(recipientAddress: string, lovelace: bigint) {
   });
 
   // 3. Get user address (returns Core Address, convert to bech32 for backend)
-  const userAddress = Core.Address.toBech32(await walletClient.address());
+  const userAddress = Address.toBech32(await walletClient.address());
 
   // 4. Request backend to build transaction
   const requestBody: BuildPaymentRequest = {
@@ -186,7 +186,7 @@ async function sendPayment(recipientAddress: string, lovelace: bigint) {
 
 // @filename: backend.ts
 // ===== Backend (Server) =====
-import { createClient, Core } from "@evolution-sdk/evolution";
+import { Address, Assets, Transaction, createClient } from "@evolution-sdk/evolution";
 import type { BuildPaymentResponse } from "./shared";
 
 export async function buildPayment(
@@ -195,7 +195,7 @@ export async function buildPayment(
   lovelace: bigint
 ): Promise<BuildPaymentResponse> {
   // Convert recipient to Core Address for payToAddress
-  const recipientAddress = Core.Address.fromBech32(recipientAddressBech32);
+  const recipientAddress = Address.fromBech32(recipientAddressBech32);
 
   // Create read-only client with user's address (bech32 string)
   const client = createClient({
@@ -215,13 +215,13 @@ export async function buildPayment(
   const builder = client.newTx();
   builder.payToAddress({
     address: recipientAddress,
-    assets: Core.Assets.fromLovelace(lovelace)
+    assets: Assets.fromLovelace(lovelace)
   });
 
   // Return unsigned CBOR for frontend to sign
   const result = await builder.build();
   const unsignedTx = await result.toTransaction();
-  const txCbor = Core.Transaction.toCBORHex(unsignedTx);
+  const txCbor = Transaction.toCBORHex(unsignedTx);
 
   return { txCbor };
 }
@@ -340,7 +340,7 @@ const result = await builder.build();
 const unsignedTx = await result.toTransaction();
 
 // Return to frontend for signing
-return { txCbor: Core.Transaction.toCBORHex(unsignedTx) };
+return { txCbor: Transaction.toCBORHex(unsignedTx) };
 ```
 
 ---
diff --git a/docs/content/docs/clients/client-basics.mdx b/docs/content/docs/clients/client-basics.mdx
index 32d4de6a..3c7efbd5 100644
--- a/docs/content/docs/clients/client-basics.mdx
+++ b/docs/content/docs/clients/client-basics.mdx
@@ -14,7 +14,7 @@ Think of the client as your persistent connection: configure it once with your n
 Configure your client with three essential pieces: the network (mainnet/preprod/preview), your blockchain provider, and the wallet for signing:
 
 ```ts twoslash
-import { createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "preprod",
@@ -40,7 +40,7 @@ Evolution SDK follows a three-stage pattern: build, sign, submit. Each stage ret
 Start with `client.newTx()` and chain operations to specify outputs, metadata, or validity ranges:
 
 ```ts twoslash
-import { createClient, Core } from "@evolution-sdk/evolution";
+import { Address, Assets, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "preprod",
@@ -51,8 +51,8 @@ const client = createClient({
 const builder = client.newTx();
 
 builder.payToAddress({
-  address: Core.Address.fromBech32("addr_test1qzx9hu8j4ah3auytk0mwcupd69hpc52t0cw39a65ndrah86djs784u92a3m5w475w3w35tyd6v3qumkze80j8a6h5tuqq5xe8y"),
-  assets: Core.Assets.fromLovelace(2000000n)
+  address: Address.fromBech32("addr_test1qzx9hu8j4ah3auytk0mwcupd69hpc52t0cw39a65ndrah86djs784u92a3m5w475w3w35tyd6v3qumkze80j8a6h5tuqq5xe8y"),
+  assets: Assets.fromLovelace(2000000n)
 });
 
 const signBuilder = await builder.build();
@@ -63,7 +63,7 @@ const signBuilder = await builder.build();
 Call `.sign()` on the built transaction to create signatures with your wallet:
 
 ```ts twoslash
-import { createClient, Core } from "@evolution-sdk/evolution";
+import { Address, Assets, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "preprod",
@@ -72,7 +72,7 @@ const client = createClient({
 });
 
 const builder = client.newTx();
-builder.payToAddress({ address: Core.Address.fromBech32("addr_test1qzx9hu8j4ah3auytk0mwcupd69hpc52t0cw39a65ndrah86djs784u92a3m5w475w3w35tyd6v3qumkze80j8a6h5tuqq5xe8y"), assets: Core.Assets.fromLovelace(2000000n) });
+builder.payToAddress({ address: Address.fromBech32("addr_test1qzx9hu8j4ah3auytk0mwcupd69hpc52t0cw39a65ndrah86djs784u92a3m5w475w3w35tyd6v3qumkze80j8a6h5tuqq5xe8y"), assets: Assets.fromLovelace(2000000n) });
 const signBuilder = await builder.build();
 
 const submitBuilder = await signBuilder.sign();
@@ -83,7 +83,7 @@ const submitBuilder = await signBuilder.sign();
 Finally, `.submit()` broadcasts the signed transaction to the blockchain and returns the transaction hash:
 
 ```ts twoslash
-import { createClient, Core } from "@evolution-sdk/evolution";
+import { Address, Assets, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "preprod",
@@ -92,7 +92,7 @@ const client = createClient({
 });
 
 const builder = client.newTx();
-builder.payToAddress({ address: Core.Address.fromBech32("addr_test1qzx9hu8j4ah3auytk0mwcupd69hpc52t0cw39a65ndrah86djs784u92a3m5w475w3w35tyd6v3qumkze80j8a6h5tuqq5xe8y"), assets: Core.Assets.fromLovelace(2000000n) });
+builder.payToAddress({ address: Address.fromBech32("addr_test1qzx9hu8j4ah3auytk0mwcupd69hpc52t0cw39a65ndrah86djs784u92a3m5w475w3w35tyd6v3qumkze80j8a6h5tuqq5xe8y"), assets: Assets.fromLovelace(2000000n) });
 const signBuilder = await builder.build();
 const submitBuilder = await signBuilder.sign();
 
@@ -105,7 +105,7 @@ console.log("Transaction submitted:", txId);
 Here's the complete workflow in a single example—from client creation through transaction submission:
 
 ```ts twoslash
-import { createClient, Core } from "@evolution-sdk/evolution";
+import { Address, Assets, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "preprod",
@@ -124,8 +124,8 @@ const client = createClient({
 // Build transaction
 const builder = client.newTx();
 builder.payToAddress({
-  address: Core.Address.fromBech32("addr_test1qzx9hu8j4ah3auytk0mwcupd69hpc52t0cw39a65ndrah86djs784u92a3m5w475w3w35tyd6v3qumkze80j8a6h5tuqq5xe8y"),
-  assets: Core.Assets.fromLovelace(2000000n)
+  address: Address.fromBech32("addr_test1qzx9hu8j4ah3auytk0mwcupd69hpc52t0cw39a65ndrah86djs784u92a3m5w475w3w35tyd6v3qumkze80j8a6h5tuqq5xe8y"),
+  assets: Assets.fromLovelace(2000000n)
 });
 
 // Build, sign, and submit
diff --git a/docs/content/docs/devnet/configuration.mdx b/docs/content/docs/devnet/configuration.mdx
index 575385b0..327ce5be 100644
--- a/docs/content/docs/devnet/configuration.mdx
+++ b/docs/content/docs/devnet/configuration.mdx
@@ -23,7 +23,7 @@ Addresses must be provided in hexadecimal format. Convert Bech32 addresses using
 
 ```typescript twoslash
 import { Cluster, Config } from "@evolution-sdk/devnet";
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 // Create a client to generate an address
 const client = createClient({
@@ -39,7 +39,7 @@ const client = createClient({
 const address = await client.address();
 
 // Convert to hex for genesis configuration
-const addressHex = Core.Address.toHex(address);
+const addressHex = Address.toHex(address);
 
 // Create custom genesis with funded address
 const genesisConfig = {
@@ -71,7 +71,7 @@ Fund multiple addresses by adding additional entries to `initialFunds`. Each add
 
 ```typescript twoslash
 import { Cluster, Config } from "@evolution-sdk/devnet";
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 const client1 = createClient({
   network: 0,
@@ -91,8 +91,8 @@ const client2 = createClient({
   }
 });
 
-const address1 = Core.Address.toHex(await client1.address());
-const address2 = Core.Address.toHex(await client2.address());
+const address1 = Address.toHex(await client1.address());
+const address2 = Address.toHex(await client2.address());
 
 const genesisConfig = {
   ...Config.DEFAULT_SHELLEY_GENESIS,
@@ -121,7 +121,7 @@ After creating a genesis configuration, calculate the resulting UTxOs to verify
 
 ```typescript twoslash
 import { Config, Genesis } from "@evolution-sdk/devnet";
-import { Core } from "@evolution-sdk/evolution";
+import { Address, TransactionHash } from "@evolution-sdk/evolution";
 declare const addressHex: string;
 
 const genesisConfig = {
@@ -136,9 +136,9 @@ const genesisUtxos = await Genesis.calculateUtxosFromConfig(genesisConfig);
 
 console.log("Genesis UTxOs:", genesisUtxos.length);
 genesisUtxos.forEach(utxo => {
-  console.log("Address:", Core.Address.toBech32(utxo.address));
+  console.log("Address:", Address.toBech32(utxo.address));
   console.log("Amount:", utxo.assets.lovelace, "lovelace");
-  console.log("TxHash:", Core.TransactionHash.toHex(utxo.transactionId));
+  console.log("TxHash:", TransactionHash.toHex(utxo.transactionId));
   console.log("OutputIndex:", utxo.index);
 });
 ```
@@ -304,7 +304,7 @@ Combining all customization options for a comprehensive devnet:
 
 ```typescript twoslash
 import { Cluster, Config, Genesis } from "@evolution-sdk/devnet";
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 // Generate funded addresses
 const wallet1 = createClient({
@@ -325,8 +325,8 @@ const wallet2 = createClient({
   }
 });
 
-const addr1 = Core.Address.toHex(await wallet1.address());
-const addr2 = Core.Address.toHex(await wallet2.address());
+const addr1 = Address.toHex(await wallet1.address());
+const addr2 = Address.toHex(await wallet2.address());
 
 // Custom genesis configuration
 const genesisConfig = {
@@ -454,7 +454,7 @@ With custom genesis configuration, you can now:
 
 ## Troubleshooting
 
-**Address format errors**: Ensure addresses are in hexadecimal format, not Bech32. Use `Core.Address.toHex(address)` to convert from an Address object.
+**Address format errors**: Ensure addresses are in hexadecimal format, not Bech32. Use `Address.toHex(address)` to convert from an Address object.
 
 **Genesis UTxO not found**: Wait 3-5 seconds after cluster start for full initialization. Query timing matters for fast block configurations.
 
diff --git a/docs/content/docs/devnet/integration.mdx b/docs/content/docs/devnet/integration.mdx
index c15f497e..ad2b7973 100644
--- a/docs/content/docs/devnet/integration.mdx
+++ b/docs/content/docs/devnet/integration.mdx
@@ -28,7 +28,7 @@ This example shows the full cycle from cluster creation to confirmed transaction
 
 ```typescript twoslash
 import { Cluster, Config, Genesis } from "@evolution-sdk/devnet";
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 const MNEMONIC = "your twenty-four word mnemonic phrase here";
 
@@ -40,7 +40,7 @@ async function completeWorkflow() {
   });
 
   const senderAddress = await wallet.address();
-  const senderAddressHex = Core.Address.toHex(senderAddress);
+  const senderAddressHex = Address.toHex(senderAddress);
 
   console.log("Sender address:", senderAddress);
 
@@ -98,7 +98,7 @@ async function completeWorkflow() {
   console.log("Initial balance:", genesisUtxos[0]?.assets.lovelace, "lovelace");
 
   // Step 7: Build transaction
-  const receiverAddress = Core.Address.fromBech32(
+  const receiverAddress = Address.fromBech32(
     "addr_test1qz2fxv2umyhttkxyxp8x0dlpdt3k6cwng5pxj3jhsydzer3n0d3vllmyqwsx5wktcd8cc3sq835lu7drv2xwl2wywfgs68faae"
   );
 
@@ -106,7 +106,7 @@ async function completeWorkflow() {
     .newTx()
     .payToAddress({
       address: receiverAddress,
-      assets: Core.Assets.fromLovelace(10_000_000n) // Send 10 ADA
+      assets: Assets.fromLovelace(10_000_000n) // Send 10 ADA
     })
     .build({ availableUtxos: genesisUtxos });
 
@@ -169,7 +169,7 @@ Not all workflows require a wallet. Query blockchain state using a provider-only
 
 ```typescript twoslash
 import { Cluster, Config, Genesis } from "@evolution-sdk/devnet";
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 // Start devnet with funded address
 const cluster = await Cluster.make({
@@ -200,7 +200,7 @@ const providerClient = createClient({
 
 // Query any address on the devnet
 const utxos = await providerClient.getUtxos(
-  Core.Address.fromBech32("addr_test1qz2fxv2umyhttkxyxp8x0dlpdt3k6cwng5pxj3jhsydzer3n0d3vllmyqwsx5wktcd8cc3sq835lu7drv2xwl2wywfgs68faae")
+  Address.fromBech32("addr_test1qz2fxv2umyhttkxyxp8x0dlpdt3k6cwng5pxj3jhsydzer3n0d3vllmyqwsx5wktcd8cc3sq835lu7drv2xwl2wywfgs68faae")
 );
 console.log("UTxOs at address:", utxos.length);
 
@@ -221,7 +221,7 @@ Provider-only clients are ideal for blockchain explorers, monitoring tools, and
 ```typescript twoslash
 import { describe, it, beforeAll, afterAll, expect } from "vitest";
 import { Cluster, Config } from "@evolution-sdk/devnet";
-import { Core, createClient, type SigningClient } from "@evolution-sdk/evolution";
+import { Address, Assets, TransactionHash, createClient, type SigningClient } from "@evolution-sdk/evolution";
 
 describe("Transaction Tests", () => {
   let cluster: Cluster.Cluster;
@@ -236,7 +236,7 @@ describe("Transaction Tests", () => {
       wallet: { type: "seed", mnemonic, accountIndex: 0 }
     });
 
-    const addressHex = Core.Address.toHex(await wallet.address());
+    const addressHex = Address.toHex(await wallet.address());
 
     const genesisConfig = {
       ...Config.DEFAULT_SHELLEY_GENESIS,
@@ -276,8 +276,8 @@ describe("Transaction Tests", () => {
     const signBuilder = await client
       .newTx()
       .payToAddress({
-        address: Core.Address.fromBech32("addr_test1qz2fxv2umyhttkxyxp8x0dlpdt3k6cwng5pxj3jhsydzer3n0d3vllmyqwsx5wktcd8cc3sq835lu7drv2xwl2wywfgs68faae"),
-        assets: Core.Assets.fromLovelace(5_000_000n)
+        address: Address.fromBech32("addr_test1qz2fxv2umyhttkxyxp8x0dlpdt3k6cwng5pxj3jhsydzer3n0d3vllmyqwsx5wktcd8cc3sq835lu7drv2xwl2wywfgs68faae"),
+        assets: Assets.fromLovelace(5_000_000n)
       })
       .build();
 
@@ -292,12 +292,12 @@ describe("Transaction Tests", () => {
     const signBuilder = await client
       .newTx()
       .payToAddress({
-        address: Core.Address.fromBech32("addr_test1qz2fxv2umyhttkxyxp8x0dlpdt3k6cwng5pxj3jhsydzer3n0d3vllmyqwsx5wktcd8cc3sq835lu7drv2xwl2wywfgs68faae"),
-        assets: Core.Assets.fromLovelace(2_000_000n)
+        address: Address.fromBech32("addr_test1qz2fxv2umyhttkxyxp8x0dlpdt3k6cwng5pxj3jhsydzer3n0d3vllmyqwsx5wktcd8cc3sq835lu7drv2xwl2wywfgs68faae"),
+        assets: Assets.fromLovelace(2_000_000n)
       })
       .payToAddress({
-        address: Core.Address.fromBech32("addr_test1qpq6xvp5y4fw0wfgxfqmn78qqagkpv4q7qpqyz8s8x3snp5n0d3vllmyqwsx5wktcd8cc3sq835lu7drv2xwl2wywfgsc3z7t3"),
-        assets: Core.Assets.fromLovelace(3_000_000n)
+        address: Address.fromBech32("addr_test1qpq6xvp5y4fw0wfgxfqmn78qqagkpv4q7qpqyz8s8x3snp5n0d3vllmyqwsx5wktcd8cc3sq835lu7drv2xwl2wywfgsc3z7t3"),
+        assets: Assets.fromLovelace(3_000_000n)
       })
       .build();
 
@@ -318,7 +318,7 @@ Test multi-party protocols by funding multiple addresses in genesis:
 
 ```typescript twoslash
 import { Cluster, Config } from "@evolution-sdk/devnet";
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 async function multiWalletExample() {
   // Create two wallets
@@ -341,8 +341,8 @@ async function multiWalletExample() {
   });
 
   // Get addresses as hex for genesis config
-  const addr1Hex = Core.Address.toHex(await wallet1.address());
-  const addr2Hex = Core.Address.toHex(await wallet2.address());
+  const addr1Hex = Address.toHex(await wallet1.address());
+  const addr2Hex = Address.toHex(await wallet2.address());
 
 // Fund both in genesis
 const genesisConfig = {
@@ -400,7 +400,7 @@ const client2 = createClient({
     .newTx()
     .payToAddress({
       address: wallet2Address,
-      assets: Core.Assets.fromLovelace(50_000_000n)
+      assets: Assets.fromLovelace(50_000_000n)
     })
     .build();
 
@@ -410,7 +410,7 @@ const client2 = createClient({
   // Verify Wallet 2 received funds
   const wallet2Utxos = await client2.getWalletUtxos();
   const receivedUtxo = wallet2Utxos.find(
-    u => Core.TransactionHash.toHex(u.transactionId) === Core.TransactionHash.toHex(txHash)
+    u => TransactionHash.toHex(u.transactionId) === TransactionHash.toHex(txHash)
   );
 
   if (receivedUtxo) {
diff --git a/docs/content/docs/encoding/data.mdx b/docs/content/docs/encoding/data.mdx
index 5b97dde3..10f82b2a 100644
--- a/docs/content/docs/encoding/data.mdx
+++ b/docs/content/docs/encoding/data.mdx
@@ -28,26 +28,26 @@ PlutusData consists of five primitive types:
 Create PlutusData using TypeScript primitives:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, Text } from "@evolution-sdk/evolution"
 
 // Integer (bigint)
-const lovelaceAmount: Core.Data.Data = 5000000n
+const lovelaceAmount: Data.Data = 5000000n
 
 // ByteArray (Uint8Array)
-const tokenName = Core.Text.toBytes("HOSKY")
-const policyId = Core.Bytes.fromHex("a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8")
+const tokenName = Text.toBytes("HOSKY")
+const policyId = Bytes.fromHex("a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8")
 
 // Constructor (variant with fields)
-const unlockAction = Core.Data.constr(0n, []) // variant 0, no fields
+const unlockAction = Data.constr(0n, []) // variant 0, no fields
 
 // Map (key-value pairs)
-const metadata = Core.Data.map([
-  [Core.Text.toBytes("name"), Core.Text.toBytes("My NFT")],
-  [Core.Text.toBytes("image"), Core.Text.toBytes("ipfs://Qm...")]
+const metadata = Data.map([
+  [Text.toBytes("name"), Text.toBytes("My NFT")],
+  [Text.toBytes("image"), Text.toBytes("ipfs://Qm...")]
 ])
 
 // List (array)
-const quantities: Core.Data.Data = [100n, 200n, 300n]
+const quantities: Data.Data = [100n, 200n, 300n]
 ```
 
 ## Integers
@@ -55,21 +55,21 @@ const quantities: Core.Data.Data = [100n, 200n, 300n]
 Use `bigint` directly—no wrapper needed:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, Text } from "@evolution-sdk/evolution"
 
 // Lovelace amounts
-const fee: Core.Data.Data = 170000n
-const deposit: Core.Data.Data = 2000000n
+const fee: Data.Data = 170000n
+const deposit: Data.Data = 2000000n
 
 // Token quantities  
-const nftQuantity: Core.Data.Data = 1n
-const ftQuantity: Core.Data.Data = 1000000n
+const nftQuantity: Data.Data = 1n
+const ftQuantity: Data.Data = 1000000n
 
 // Negative values supported
-const delta: Core.Data.Data = -500n
+const delta: Data.Data = -500n
 
 // Large numbers
-const totalSupply: Core.Data.Data = 45000000000000000n
+const totalSupply: Data.Data = 45000000000000000n
 ```
 
 ## Byte Arrays
@@ -77,20 +77,20 @@ const totalSupply: Core.Data.Data = 45000000000000000n
 Raw bytes for hashes, addresses, and binary data:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, Text } from "@evolution-sdk/evolution"
 
 // Transaction hash (32 bytes)
-const txHash = Core.Bytes.fromHex(
+const txHash = Bytes.fromHex(
   "a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2"
 )
 
 // Policy ID (28 bytes)
-const policyId = Core.Bytes.fromHex(
+const policyId = Bytes.fromHex(
   "1234567890abcdef1234567890abcdef1234567890abcdef12345678"
 )
 
 // Asset name (readable string)
-const assetName = Core.Text.toBytes("MyToken")
+const assetName = Text.toBytes("MyToken")
 
 // Empty byte array (ada-only policyId)
 const adaPolicyId = new Uint8Array()
@@ -106,24 +106,24 @@ const adaPolicyId = new Uint8Array()
 Tagged unions representing variants or structured data:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, Text } from "@evolution-sdk/evolution"
 
 // Simple variant (no data)
-const claimAction = Core.Data.constr(0n, [])
-const cancelAction = Core.Data.constr(1n, [])
+const claimAction = Data.constr(0n, [])
+const cancelAction = Data.constr(1n, [])
 
 // Variant with single field
-const verificationKeyCred = Core.Data.constr(0n, [
-  Core.Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de")
+const verificationKeyCred = Data.constr(0n, [
+  Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de")
 ])
 
-const scriptCred = Core.Data.constr(1n, [
-  Core.Bytes.fromHex("def456abc123def456abc123def456abc123def456abc123def456ab")
+const scriptCred = Data.constr(1n, [
+  Bytes.fromHex("def456abc123def456abc123def456abc123def456abc123def456ab")
 ])
 
 // Multiple fields
-const outputRef = Core.Data.constr(0n, [
-  Core.Bytes.fromHex("a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2"), // tx hash
+const outputRef = Data.constr(0n, [
+  Bytes.fromHex("a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2"), // tx hash
   2n // output index
 ])
 ```
@@ -135,23 +135,23 @@ const outputRef = Core.Data.constr(0n, [
 Key-value pairs where both keys and values are PlutusData:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, Text } from "@evolution-sdk/evolution"
 
 // NFT metadata
-const nftMetadata = Core.Data.map([
-  [Core.Text.toBytes("name"), Core.Text.toBytes("CryptoKitty #1234")],
-  [Core.Text.toBytes("image"), Core.Text.toBytes("ipfs://QmXoypizjW3WknFiJnKLwHCnL72vedxjQkDDP1mXWo6uco")],
-  [Core.Text.toBytes("description"), Core.Text.toBytes("A rare cryptokitty with rainbow fur")]
+const nftMetadata = Data.map([
+  [Text.toBytes("name"), Text.toBytes("CryptoKitty #1234")],
+  [Text.toBytes("image"), Text.toBytes("ipfs://QmXoypizjW3WknFiJnKLwHCnL72vedxjQkDDP1mXWo6uco")],
+  [Text.toBytes("description"), Text.toBytes("A rare cryptokitty with rainbow fur")]
 ])
 
 // Nested maps
-const tokenMetadata = Core.Data.map([
-  [Core.Text.toBytes("name"), Core.Text.toBytes("MyToken")],
-  [Core.Text.toBytes("ticker"), Core.Text.toBytes("MTK")],
-  [Core.Text.toBytes("decimals"), 6n],
-  [Core.Text.toBytes("properties"), Core.Data.map([
-    [Core.Text.toBytes("mintable"), 1n], // boolean as 0/1
-    [Core.Text.toBytes("burnable"), 1n]
+const tokenMetadata = Data.map([
+  [Text.toBytes("name"), Text.toBytes("MyToken")],
+  [Text.toBytes("ticker"), Text.toBytes("MTK")],
+  [Text.toBytes("decimals"), 6n],
+  [Text.toBytes("properties"), Data.map([
+    [Text.toBytes("mintable"), 1n], // boolean as 0/1
+    [Text.toBytes("burnable"), 1n]
   ])]
 ])
 ```
@@ -161,23 +161,23 @@ const tokenMetadata = Core.Data.map([
 Ordered arrays of PlutusData:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, Text } from "@evolution-sdk/evolution"
 
 // List of integers
-const prices: Core.Data.Data = [100n, 250n, 500n, 1000n]
+const prices: Data.Data = [100n, 250n, 500n, 1000n]
 
 // List of byte arrays (hashes)
-const approvedSigners: Core.Data.Data = [
-  Core.Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de"),
-  Core.Bytes.fromHex("def456abc123def456abc123def456abc123def456abc123def456ab"),
-  Core.Bytes.fromHex("123456789abc123456789abc123456789abc123456789abc12345678")
+const approvedSigners: Data.Data = [
+  Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de"),
+  Bytes.fromHex("def456abc123def456abc123def456abc123def456abc123def456ab"),
+  Bytes.fromHex("123456789abc123456789abc123456789abc123456789abc12345678")
 ]
 
 // List of constructors
-const actions: Core.Data.Data = [
-  Core.Data.constr(0n, []), // Claim
-  Core.Data.constr(1n, []), // Cancel
-  Core.Data.constr(2n, [5000000n]) // PartialClaim(amount)
+const actions: Data.Data = [
+  Data.constr(0n, []), // Claim
+  Data.constr(1n, []), // Cancel
+  Data.constr(2n, [5000000n]) // PartialClaim(amount)
 ]
 ```
 
@@ -186,27 +186,27 @@ const actions: Core.Data.Data = [
 Convert PlutusData to CBOR for blockchain submission:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, Text } from "@evolution-sdk/evolution"
 
-const datum = Core.Data.constr(0n, [
-  Core.Data.map([
-    [Core.Text.toBytes("beneficiary"), Core.Text.toBytes("addr1...")],
-    [Core.Text.toBytes("deadline"), 1735689600000n]
+const datum = Data.constr(0n, [
+  Data.map([
+    [Text.toBytes("beneficiary"), Text.toBytes("addr1...")],
+    [Text.toBytes("deadline"), 1735689600000n]
   ]),
   5000000n, // amount
   1n // version
 ])
 
 // Encode to hex string
-const cborHex = Core.Data.toCBORHex(datum)
+const cborHex = Data.toCBORHex(datum)
 // "d8799fa2646265..."
 
 // Encode to bytes  
-const cborBytes = Core.Data.toCBORBytes(datum)
+const cborBytes = Data.toCBORBytes(datum)
 // Uint8Array [216, 121, 159, ...]
 
 // Decode from CBOR
-const decoded = Core.Data.fromCBORHex(cborHex)
+const decoded = Data.fromCBORHex(cborHex)
 // Returns original PlutusData structure
 ```
 
@@ -215,20 +215,20 @@ const decoded = Core.Data.fromCBORHex(cborHex)
 Check if two PlutusData structures are equal:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, Text } from "@evolution-sdk/evolution"
 
-const map1 = Core.Data.map([
-  [Core.Text.toBytes("name"), Core.Text.toBytes("Alice")],
-  [Core.Text.toBytes("age"), 30n]
+const map1 = Data.map([
+  [Text.toBytes("name"), Text.toBytes("Alice")],
+  [Text.toBytes("age"), 30n]
 ])
 
-const map2 = Core.Data.map([
-  [Core.Text.toBytes("name"), Core.Text.toBytes("Alice")],
-  [Core.Text.toBytes("age"), 30n]
+const map2 = Data.map([
+  [Text.toBytes("name"), Text.toBytes("Alice")],
+  [Text.toBytes("age"), 30n]
 ])
 
 // Deep equality check
-const isEqual = Core.Data.equals(map1, map2)
+const isEqual = Data.equals(map1, map2)
 // true
 ```
 
@@ -237,36 +237,36 @@ const isEqual = Core.Data.equals(map1, map2)
 ### Escrow Datum
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, Text } from "@evolution-sdk/evolution"
 
 // Escrow locked until deadline
-const escrowDatum = Core.Data.constr(0n, [
-  Core.Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de"), // beneficiary
+const escrowDatum = Data.constr(0n, [
+  Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de"), // beneficiary
   1735689600000n, // deadline (Unix timestamp)
   10000000n // locked lovelace amount
 ])
 
-const cborHex = Core.Data.toCBORHex(escrowDatum)
+const cborHex = Data.toCBORHex(escrowDatum)
 // Attach to UTxO as inline datum
 ```
 
 ### CIP-68 NFT Metadata
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, Text } from "@evolution-sdk/evolution"
 
 // Reference NFT metadata (label 100)
-const metadata = Core.Data.map([
-  [Core.Text.toBytes("name"), Core.Text.toBytes("SpaceAce #4242")],
-  [Core.Text.toBytes("image"), Core.Text.toBytes("ipfs://QmXoypizjW3WknFiJnKLwHCnL72vedxjQkDDP1mXWo6uco")],
-  [Core.Text.toBytes("rarity"), Core.Text.toBytes("legendary")],
-  [Core.Text.toBytes("attributes"), Core.Data.map([
-    [Core.Text.toBytes("class"), Core.Text.toBytes("explorer")],
-    [Core.Text.toBytes("power"), 9000n]
+const metadata = Data.map([
+  [Text.toBytes("name"), Text.toBytes("SpaceAce #4242")],
+  [Text.toBytes("image"), Text.toBytes("ipfs://QmXoypizjW3WknFiJnKLwHCnL72vedxjQkDDP1mXWo6uco")],
+  [Text.toBytes("rarity"), Text.toBytes("legendary")],
+  [Text.toBytes("attributes"), Data.map([
+    [Text.toBytes("class"), Text.toBytes("explorer")],
+    [Text.toBytes("power"), 9000n]
   ])]
 ])
 
-const cip68Datum = Core.Data.constr(0n, [
+const cip68Datum = Data.constr(0n, [
   metadata,
   1n, // version
   [] // extra fields
@@ -276,12 +276,12 @@ const cip68Datum = Core.Data.constr(0n, [
 ### Redeemer with Multiple Actions
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, Text } from "@evolution-sdk/evolution"
 
 // Action variants
-const claim = Core.Data.constr(0n, [])
-const cancel = Core.Data.constr(1n, [])
-const update = Core.Data.constr(2n, [
+const claim = Data.constr(0n, [])
+const cancel = Data.constr(1n, [])
+const update = Data.constr(2n, [
   1735776000000n // new deadline
 ])
 
@@ -292,14 +292,14 @@ const redeemer = claim
 ### Multi-Sig Validator Redeemer
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, Text } from "@evolution-sdk/evolution"
 
-const multiSigRedeemer = Core.Data.constr(0n, [
+const multiSigRedeemer = Data.constr(0n, [
   // Required signers (list of key hashes)
   [
-    Core.Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de"),
-    Core.Bytes.fromHex("def456abc123def456abc123def456abc123def456abc123def456ab")
-  ] as Core.Data.Data,
+    Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de"),
+    Bytes.fromHex("def456abc123def456abc123def456abc123def456abc123def456ab")
+  ] as Data.Data,
   2n // threshold (2 of N)
 ])
 ```
diff --git a/docs/content/docs/encoding/plutus.mdx b/docs/content/docs/encoding/plutus.mdx
index 1270299b..b4c22d11 100644
--- a/docs/content/docs/encoding/plutus.mdx
+++ b/docs/content/docs/encoding/plutus.mdx
@@ -9,28 +9,28 @@ import { Card, Cards } from 'fumadocs-ui/components/card'
 
 Pre-built, battle-tested schemas for core Cardano data structures: credentials, addresses, values, output references, and CIP-68 metadata.
 
-These types are exported from `@evolution-sdk/evolution/core/plutus` and match the on-chain Plutus specification exactly—use them to eliminate encoding errors and ensure validator compatibility.
+These types are exported from `@evolution-sdk/evolution/plutus` and match the on-chain Plutus specification exactly—use them to eliminate encoding errors and ensure validator compatibility.
 
 ## Available Types
 
 | Type | Use Case | Import |
 |------|----------|--------|
-| **Credential** | Reference wallets or scripts | `import { Credential } from "@evolution-sdk/evolution/core/plutus"` |
-| **Address** | Payment destinations with optional staking | `import { Address } from "@evolution-sdk/evolution/core/plutus"` |
-| **Value** | ADA and native token quantities | `import { Value } from "@evolution-sdk/evolution/core/plutus"` |
-| **OutputReference** | Identify specific UTxOs | `import { OutputReference } from "@evolution-sdk/evolution/core/plutus"` |
-| **CIP68Metadata** | NFT/FT metadata following CIP-68 | `import { CIP68Metadata } from "@evolution-sdk/evolution/core/plutus"` |
+| **Credential** | Reference wallets or scripts | `import { Credential } from "@evolution-sdk/evolution/plutus"` |
+| **Address** | Payment destinations with optional staking | `import { Address } from "@evolution-sdk/evolution/plutus"` |
+| **Value** | ADA and native token quantities | `import { Value } from "@evolution-sdk/evolution/plutus"` |
+| **OutputReference** | Identify specific UTxOs | `import { OutputReference } from "@evolution-sdk/evolution/plutus"` |
+| **CIP68Metadata** | NFT/FT metadata following CIP-68 | `import { CIP68Metadata } from "@evolution-sdk/evolution/plutus"` |
 
 ## Quick Start
 
 ```typescript twoslash
-import { Credential } from "@evolution-sdk/evolution/core/plutus"
-import { Core } from "@evolution-sdk/evolution"
+import { Credential } from "@evolution-sdk/evolution/plutus"
+import { Bytes, Data } from "@evolution-sdk/evolution"
 
 // Use pre-built Credential type
 const cred: Credential.Credential = {
   VerificationKey: {
-    hash: Core.Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de")
+    hash: Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de")
   }
 }
 
@@ -50,13 +50,13 @@ All types provide codec methods for encoding and decoding. Choose based on your
 **When decoding**: Use `fromCBORHex()` or `fromCBORBytes()` with matching format
 
 ```typescript twoslash
-import { Address } from "@evolution-sdk/evolution/core/plutus"
-import { Core } from "@evolution-sdk/evolution"
+import { Address } from "@evolution-sdk/evolution/plutus"
+import { Bytes, Data } from "@evolution-sdk/evolution"
 
 const address: Address.Address = {
   payment_credential: {
     VerificationKey: {
-      hash: Core.Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de")
+      hash: Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de")
     }
   },
   stake_credential: undefined
@@ -82,20 +82,20 @@ Represents ownership—either a verification key (wallet) or script (smart contr
 **When to use**: Reference who can spend funds or participate in staking. Required in addresses, multi-sig validators, and authorization checks.
 
 ```typescript twoslash
-import { Credential } from "@evolution-sdk/evolution/core/plutus"
-import { Core } from "@evolution-sdk/evolution"
+import { Credential } from "@evolution-sdk/evolution/plutus"
+import { Bytes, Data } from "@evolution-sdk/evolution"
 
 // Wallet credential
 const walletCred: Credential.Credential = {
   VerificationKey: {
-    hash: Core.Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de")
+    hash: Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de")
   }
 }
 
 // Smart contract credential
 const scriptCred: Credential.Credential = {
   Script: {
-    hash: Core.Bytes.fromHex("def456abc123def456abc123def456abc123def456abc123def456ab")
+    hash: Bytes.fromHex("def456abc123def456abc123def456abc123def456abc123def456ab")
   }
 }
 ```
@@ -107,21 +107,21 @@ Cardano address with payment credential and optional stake credential.
 **When to use**: Specify transaction outputs, script addresses, or beneficiaries in datums.
 
 ```typescript twoslash
-import { Address } from "@evolution-sdk/evolution/core/plutus"
-import { Core } from "@evolution-sdk/evolution"
+import { Address } from "@evolution-sdk/evolution/plutus"
+import { Bytes, Data } from "@evolution-sdk/evolution"
 
 // Base address (with staking)
 const baseAddress: Address.Address = {
   payment_credential: {
     VerificationKey: {
-      hash: Core.Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de")
+      hash: Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de")
     }
   },
   stake_credential: {
     Inline: {
       credential: {
         VerificationKey: {
-          hash: Core.Bytes.fromHex("def456abc123def456abc123def456abc123def456abc123def456ab")
+          hash: Bytes.fromHex("def456abc123def456abc123def456abc123def456abc123def456ab")
         }
       }
     }
@@ -132,14 +132,14 @@ const baseAddress: Address.Address = {
 ### Address Variants
 
 ```typescript twoslash
-import { Address } from "@evolution-sdk/evolution/core/plutus"
-import { Core } from "@evolution-sdk/evolution"
+import { Address } from "@evolution-sdk/evolution/plutus"
+import { Bytes, Data } from "@evolution-sdk/evolution"
 
 // Enterprise address (no staking)
 const enterpriseAddress: Address.Address = {
   payment_credential: {
     Script: {
-      hash: Core.Bytes.fromHex("123456789abc123456789abc123456789abc123456789abc12345678")
+      hash: Bytes.fromHex("123456789abc123456789abc123456789abc123456789abc12345678")
     }
   },
   stake_credential: undefined
@@ -149,7 +149,7 @@ const enterpriseAddress: Address.Address = {
 const pointerAddress: Address.Address = {
   payment_credential: {
     VerificationKey: {
-      hash: Core.Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de")
+      hash: Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de")
     }
   },
   stake_credential: {
@@ -169,8 +169,9 @@ Multi-asset value representing ADA and native tokens as nested maps.
 **When to use**: Transaction outputs, locked funds in datums, token quantities in minting/burning.
 
 ```typescript twoslash
-import { Value } from "@evolution-sdk/evolution/core/plutus"
-import { Core } from "@evolution-sdk/evolution"
+import { Value } from "@evolution-sdk/evolution/plutus"
+import { Bytes, Data } from "@evolution-sdk/evolution"
+import * as Text from "@evolution-sdk/evolution/Text"
 
 // ADA only
 const adaOnly: Value.Value = new Map([
@@ -180,7 +181,7 @@ const adaOnly: Value.Value = new Map([
 ])
 
 // Multi-asset value (ADA + tokens)
-const policyId = Core.Bytes.fromHex("a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8")
+const policyId = Bytes.fromHex("a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8")
 
 const multiAsset: Value.Value = new Map([
   // ADA (empty policyId/assetName)
@@ -189,8 +190,8 @@ const multiAsset: Value.Value = new Map([
   ])],
   // Custom tokens
   [policyId, new Map([
-    [Core.Text.toBytes("MyToken"), 100n],
-    [Core.Text.toBytes("MyNFT"), 1n]
+    [Text.toBytes("MyToken"), 100n],
+    [Text.toBytes("MyNFT"), 1n]
   ])]
 ])
 ```
@@ -202,11 +203,11 @@ Uniquely identifies a UTxO by transaction hash and output index.
 **When to use**: Lock specific UTxOs in datums (escrow), prevent double-spending, reference the "original" UTxO in state updates.
 
 ```typescript twoslash
-import { OutputReference } from "@evolution-sdk/evolution/core/plutus"
-import { Core } from "@evolution-sdk/evolution"
+import { OutputReference } from "@evolution-sdk/evolution/plutus"
+import { Bytes, Data } from "@evolution-sdk/evolution"
 
 const utxoRef: OutputReference.OutputReference = {
-  transaction_id: Core.Bytes.fromHex(
+  transaction_id: Bytes.fromHex(
     "a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2"
   ),
   output_index: 0n
@@ -229,17 +230,18 @@ Reference token metadata following CIP-68 standard with versioning and extensibi
 | **444** | Reference RFT | Rich fungible token (advanced features) |
 
 ```typescript twoslash
-import { CIP68Metadata } from "@evolution-sdk/evolution/core/plutus"
-import { Core } from "@evolution-sdk/evolution"
+import { CIP68Metadata } from "@evolution-sdk/evolution/plutus"
+import { Bytes, Data } from "@evolution-sdk/evolution"
+import * as Text from "@evolution-sdk/evolution/Text"
 
 // NFT metadata (label 222)
-const nftMetadata = Core.Data.map([
-  [Core.Text.toBytes("name"), Core.Text.toBytes("SpaceAce #4242")],
-  [Core.Text.toBytes("image"), Core.Text.toBytes("ipfs://QmXoypizjW3WknFiJnKLwHCnL72vedxjQkDDP1mXWo6uco")],
-  [Core.Text.toBytes("rarity"), Core.Text.toBytes("legendary")],
-  [Core.Text.toBytes("attributes"), Core.Data.map([
-    [Core.Text.toBytes("class"), Core.Text.toBytes("explorer")],
-    [Core.Text.toBytes("power"), 9000n]
+const nftMetadata = Data.map([
+  [Text.toBytes("name"), Text.toBytes("SpaceAce #4242")],
+  [Text.toBytes("image"), Text.toBytes("ipfs://QmXoypizjW3WknFiJnKLwHCnL72vedxjQkDDP1mXWo6uco")],
+  [Text.toBytes("rarity"), Text.toBytes("legendary")],
+  [Text.toBytes("attributes"), Data.map([
+    [Text.toBytes("class"), Text.toBytes("explorer")],
+    [Text.toBytes("power"), 9000n]
   ])]
 ])
 
@@ -250,18 +252,18 @@ const datum: CIP68Metadata.CIP68Datum = {
 }
 
 // FT metadata (label 333) with decimals
-const ftMetadata = Core.Data.map([
-  [Core.Text.toBytes("name"), Core.Text.toBytes("MyToken")],
-  [Core.Text.toBytes("ticker"), Core.Text.toBytes("MTK")],
-  [Core.Text.toBytes("decimals"), 6n],
-  [Core.Text.toBytes("url"), Core.Text.toBytes("https://mytoken.io")]
+const ftMetadata = Data.map([
+  [Text.toBytes("name"), Text.toBytes("MyToken")],
+  [Text.toBytes("ticker"), Text.toBytes("MTK")],
+  [Text.toBytes("decimals"), 6n],
+  [Text.toBytes("url"), Text.toBytes("https://mytoken.io")]
 ])
 
 const ftDatum: CIP68Metadata.CIP68Datum = {
   metadata: ftMetadata,
   version: 1n,
   extra: [
-    Core.Data.map([[Core.Text.toBytes("mutable"), 1n]]) // custom extension
+    Data.map([[Text.toBytes("mutable"), 1n]]) // custom extension
   ]
 }
 ```
@@ -273,8 +275,8 @@ const ftDatum: CIP68Metadata.CIP68Datum = {
 Time-locked escrow that holds funds for a beneficiary until a deadline. The validator checks the deadline has passed and the beneficiary signed before releasing funds.
 
 ```typescript twoslash
-import { Address, Value, OutputReference } from "@evolution-sdk/evolution/core/plutus"
-import { Core } from "@evolution-sdk/evolution"
+import { Address, Value, OutputReference } from "@evolution-sdk/evolution/plutus"
+import { Bytes, Data } from "@evolution-sdk/evolution"
 
 interface EscrowDatum {
   beneficiary: Address.Address
@@ -287,7 +289,7 @@ const escrowDatum: EscrowDatum = {
   beneficiary: {
     payment_credential: {
       VerificationKey: {
-        hash: Core.Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de")
+        hash: Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de")
       }
     },
     stake_credential: undefined
@@ -297,7 +299,7 @@ const escrowDatum: EscrowDatum = {
     [new Uint8Array(), new Map([[new Uint8Array(), 10000000n]])] // 10 ADA
   ]),
   original_utxo: {
-    transaction_id: Core.Bytes.fromHex("a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2"),
+    transaction_id: Bytes.fromHex("a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2"),
     output_index: 2n
   }
 }
@@ -308,8 +310,8 @@ const escrowDatum: EscrowDatum = {
 Threshold signature validator requiring M-of-N signers. The redeemer specifies which credentials must sign and how many signatures are needed (e.g., 2 of 3).
 
 ```typescript twoslash
-import { Credential } from "@evolution-sdk/evolution/core/plutus"
-import { Core } from "@evolution-sdk/evolution"
+import { Credential } from "@evolution-sdk/evolution/plutus"
+import { Bytes, Data } from "@evolution-sdk/evolution"
 
 interface MultiSigRedeemer {
   required_signers: Credential.Credential[]
@@ -320,17 +322,17 @@ const redeemer: MultiSigRedeemer = {
   required_signers: [
     {
       VerificationKey: {
-        hash: Core.Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de")
+        hash: Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de")
       }
     },
     {
       VerificationKey: {
-        hash: Core.Bytes.fromHex("def456abc123def456abc123def456abc123def456abc123def456ab")
+        hash: Bytes.fromHex("def456abc123def456abc123def456abc123def456abc123def456ab")
       }
     },
     {
       VerificationKey: {
-        hash: Core.Bytes.fromHex("123456789abc123456789abc123456789abc123456789abc12345678")
+        hash: Bytes.fromHex("123456789abc123456789abc123456789abc123456789abc12345678")
       }
     }
   ],
@@ -343,17 +345,18 @@ const redeemer: MultiSigRedeemer = {
 Complete CIP-68 NFT mint creating both reference token (label 100, immutable metadata) and user token (label 222, transferable). Reference token stays locked at script address.
 
 ```typescript twoslash
-import { CIP68Metadata, Value } from "@evolution-sdk/evolution/core/plutus"
-import { Core } from "@evolution-sdk/evolution"
+import { CIP68Metadata, Value } from "@evolution-sdk/evolution/plutus"
+import { Bytes, Data } from "@evolution-sdk/evolution"
+import * as Text from "@evolution-sdk/evolution/Text"
 
 // Metadata for both reference and user tokens
-const metadata = Core.Data.map([
-  [Core.Text.toBytes("name"), Core.Text.toBytes("CryptoKitty #42")],
-  [Core.Text.toBytes("image"), Core.Text.toBytes("ipfs://Qm...")],
-  [Core.Text.toBytes("dna"), Core.Text.toBytes("0xabc123...")],
-  [Core.Text.toBytes("traits"), Core.Data.map([
-    [Core.Text.toBytes("fur"), Core.Text.toBytes("tabby")],
-    [Core.Text.toBytes("eyes"), Core.Text.toBytes("blue")]
+const metadata = Data.map([
+  [Text.toBytes("name"), Text.toBytes("CryptoKitty #42")],
+  [Text.toBytes("image"), Text.toBytes("ipfs://Qm...")],
+  [Text.toBytes("dna"), Text.toBytes("0xabc123...")],
+  [Text.toBytes("traits"), Data.map([
+    [Text.toBytes("fur"), Text.toBytes("tabby")],
+    [Text.toBytes("eyes"), Text.toBytes("blue")]
   ])]
 ])
 
@@ -364,8 +367,8 @@ const referenceDatum: CIP68Metadata.CIP68Datum = {
 }
 
 // Mint value: reference (100) + user token (222)
-const policyId = Core.Bytes.fromHex("a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8")
-const assetName = Core.Text.toBytes("CryptoKitty42")
+const policyId = Bytes.fromHex("a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8")
+const assetName = Text.toBytes("CryptoKitty42")
 
 // CIP-68 token name encoding: label prefix + asset name
 const referenceLabel = new Uint8Array([0x00, 0x0f, 0x42, 0x00]) // (100)
@@ -384,8 +387,9 @@ const mintValue: Value.Value = new Map([
 Decentralized exchange limit order specifying what assets are offered, what's requested in return, and whether partial fills are allowed. Owner can cancel anytime.
 
 ```typescript twoslash
-import { Credential, Value } from "@evolution-sdk/evolution/core/plutus"
-import { Core } from "@evolution-sdk/evolution"
+import { Credential, Value } from "@evolution-sdk/evolution/plutus"
+import { Bytes, Data } from "@evolution-sdk/evolution"
+import * as Text from "@evolution-sdk/evolution/Text"
 
 interface DexOrderDatum {
   owner: Credential.Credential
@@ -397,15 +401,15 @@ interface DexOrderDatum {
 const orderDatum: DexOrderDatum = {
   owner: {
     VerificationKey: {
-      hash: Core.Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de")
+      hash: Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de")
     }
   },
   offered_value: new Map([
     [new Uint8Array(), new Map([[new Uint8Array(), 100000000n]])] // 100 ADA
   ]),
   requested_value: new Map([
-    [Core.Bytes.fromHex("token_policy_id_28_bytes_hex_encoded_here_abcd"), new Map([
-      [Core.Text.toBytes("USDC"), 10000000n] // 10 USDC (6 decimals)
+    [Bytes.fromHex("token_policy_id_28_bytes_hex_encoded_here_abcd"), new Map([
+      [Text.toBytes("USDC"), 10000000n] // 10 USDC (6 decimals)
     ])]
   ]),
   partial_fill: true
diff --git a/docs/content/docs/encoding/tschema.mdx b/docs/content/docs/encoding/tschema.mdx
index 5b82bedc..8c652161 100644
--- a/docs/content/docs/encoding/tschema.mdx
+++ b/docs/content/docs/encoding/tschema.mdx
@@ -30,12 +30,12 @@ Define your schema once, get TypeScript types and CBOR encoding automatically.
 Define a schema, extract types, create codec:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, TSchema } from "@evolution-sdk/evolution"
 
 // Define schema
-const OutputReferenceSchema = Core.TSchema.Struct({
-  transaction_id: Core.TSchema.ByteArray,
-  output_index: Core.TSchema.Integer
+const OutputReferenceSchema = TSchema.Struct({
+  transaction_id: TSchema.ByteArray,
+  output_index: TSchema.Integer
 })
 
 // Extract TypeScript type
@@ -46,11 +46,11 @@ type OutputReference = typeof OutputReferenceSchema.Type
 // }
 
 // Create codec
-const OutputReferenceCodec = Core.Data.withSchema(OutputReferenceSchema)
+const OutputReferenceCodec = Data.withSchema(OutputReferenceSchema)
 
 // Use it
 const outRef: OutputReference = {
-  transaction_id: Core.Bytes.fromHex("a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2"),
+  transaction_id: Bytes.fromHex("a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2"),
   output_index: 0n
 }
 
@@ -65,14 +65,14 @@ const decoded = OutputReferenceCodec.fromCBORHex(cborHex)
 For hashes, policy IDs, addresses, and binary data:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, TSchema } from "@evolution-sdk/evolution"
 
-const HashSchema = Core.TSchema.ByteArray
+const HashSchema = TSchema.ByteArray
 
 type Hash = typeof HashSchema.Type
 // Uint8Array
 
-const txHash: Hash = Core.Bytes.fromHex(
+const txHash: Hash = Bytes.fromHex(
   "a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2"
 )
 ```
@@ -82,9 +82,9 @@ const txHash: Hash = Core.Bytes.fromHex(
 For amounts, quantities, timestamps, indices:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, TSchema } from "@evolution-sdk/evolution"
 
-const AmountSchema = Core.TSchema.Integer
+const AmountSchema = TSchema.Integer
 
 type Amount = typeof AmountSchema.Type
 // bigint
@@ -97,11 +97,11 @@ const lovelace: Amount = 5000000n
 For records with named fields (encoded as Plutus Constructor):
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, TSchema } from "@evolution-sdk/evolution"
 
-const AddressSchema = Core.TSchema.Struct({
-  payment_credential: Core.TSchema.ByteArray,
-  stake_credential: Core.TSchema.ByteArray
+const AddressSchema = TSchema.Struct({
+  payment_credential: TSchema.ByteArray,
+  stake_credential: TSchema.ByteArray
 })
 
 type Address = typeof AddressSchema.Type
@@ -110,11 +110,11 @@ type Address = typeof AddressSchema.Type
 //   stake_credential: Uint8Array
 // }
 
-const Codec = Core.Data.withSchema(AddressSchema)
+const Codec = Data.withSchema(AddressSchema)
 
 const addr: Address = {
-  payment_credential: Core.Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de"),
-  stake_credential: Core.Bytes.fromHex("def456abc123def456abc123def456abc123def456abc123def456ab")
+  payment_credential: Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de"),
+  stake_credential: Bytes.fromHex("def456abc123def456abc123def456abc123def456abc123def456ab")
 }
 
 const cbor = Codec.toCBORHex(addr)
@@ -125,14 +125,14 @@ const cbor = Codec.toCBORHex(addr)
 For sum types (multiple possible constructors):
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, TSchema } from "@evolution-sdk/evolution"
 
-const CredentialSchema = Core.TSchema.Variant({
+const CredentialSchema = TSchema.Variant({
   VerificationKey: {
-    hash: Core.TSchema.ByteArray
+    hash: TSchema.ByteArray
   },
   Script: {
-    hash: Core.TSchema.ByteArray
+    hash: TSchema.ByteArray
   }
 })
 
@@ -140,19 +140,19 @@ type Credential = typeof CredentialSchema.Type
 // | { VerificationKey: { hash: Uint8Array } }
 // | { Script: { hash: Uint8Array } }
 
-const Codec = Core.Data.withSchema(CredentialSchema)
+const Codec = Data.withSchema(CredentialSchema)
 
 // Verification key credential
 const vkeyCred: Credential = {
   VerificationKey: {
-    hash: Core.Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de")
+    hash: Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de")
   }
 }
 
 // Script credential
 const scriptCred: Credential = {
   Script: {
-    hash: Core.Bytes.fromHex("def456abc123def456abc123def456abc123def456abc123def456ab")
+    hash: Bytes.fromHex("def456abc123def456abc123def456abc123def456abc123def456ab")
   }
 }
 
@@ -165,14 +165,14 @@ const cbor2 = Codec.toCBORHex(scriptCred)
 For lists of values:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, TSchema } from "@evolution-sdk/evolution"
 
-const IntListSchema = Core.TSchema.Array(Core.TSchema.Integer)
+const IntListSchema = TSchema.Array(TSchema.Integer)
 
 type IntList = typeof IntListSchema.Type
 // ReadonlyArray<bigint>
 
-const Codec = Core.Data.withSchema(IntListSchema)
+const Codec = Data.withSchema(IntListSchema)
 
 const amounts: IntList = [100n, 200n, 300n]
 const cbor = Codec.toCBORHex(amounts)
@@ -183,21 +183,21 @@ const cbor = Codec.toCBORHex(amounts)
 For key-value mappings:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, TSchema } from "@evolution-sdk/evolution"
 
-const AssetsSchema = Core.TSchema.Map(
-  Core.TSchema.ByteArray, // AssetName
-  Core.TSchema.Integer    // Quantity
+const AssetsSchema = TSchema.Map(
+  TSchema.ByteArray, // AssetName
+  TSchema.Integer    // Quantity
 )
 
 type Assets = typeof AssetsSchema.Type
 // Map<Uint8Array, bigint>
 
-const Codec = Core.Data.withSchema(AssetsSchema)
+const Codec = Data.withSchema(AssetsSchema)
 
 const assets: Assets = new Map([
-  [Core.Bytes.fromHex("546f6b656e"), 100n], // "Token" in hex
-  [Core.Bytes.fromHex("4e4654"), 1n]        // "NFT" in hex
+  [Bytes.fromHex("546f6b656e"), 100n], // "Token" in hex
+  [Bytes.fromHex("4e4654"), 1n]        // "NFT" in hex
 ])
 
 const cbor = Codec.toCBORHex(assets)
@@ -208,11 +208,11 @@ const cbor = Codec.toCBORHex(assets)
 For optional fields (Maybe pattern):
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, TSchema } from "@evolution-sdk/evolution"
 
-const PersonSchema = Core.TSchema.Struct({
-  name: Core.TSchema.ByteArray,
-  nickname: Core.TSchema.UndefinedOr(Core.TSchema.ByteArray)
+const PersonSchema = TSchema.Struct({
+  name: TSchema.ByteArray,
+  nickname: TSchema.UndefinedOr(TSchema.ByteArray)
 })
 
 type Person = typeof PersonSchema.Type
@@ -221,16 +221,16 @@ type Person = typeof PersonSchema.Type
 //   nickname: Uint8Array | undefined
 // }
 
-const Codec = Core.Data.withSchema(PersonSchema)
+const Codec = Data.withSchema(PersonSchema)
 
 const person1: Person = {
-  name: Core.Bytes.fromHex("416c696365"), // "Alice"
+  name: Bytes.fromHex("416c696365"), // "Alice"
   nickname: undefined
 }
 
 const person2: Person = {
-  name: Core.Bytes.fromHex("426f62"), // "Bob"
-  nickname: Core.Bytes.fromHex("426f62627920") // "Bobby"
+  name: Bytes.fromHex("426f62"), // "Bob"
+  nickname: Bytes.fromHex("426f62627920") // "Bobby"
 }
 ```
 
@@ -239,14 +239,14 @@ const person2: Person = {
 Use `Data.withSchema()` to create a codec from any schema:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, TSchema } from "@evolution-sdk/evolution"
 
-const Schema = Core.TSchema.Struct({
-  id: Core.TSchema.ByteArray,
-  amount: Core.TSchema.Integer
+const Schema = TSchema.Struct({
+  id: TSchema.ByteArray,
+  amount: TSchema.Integer
 })
 
-const Codec = Core.Data.withSchema(Schema)
+const Codec = Data.withSchema(Schema)
 
 // Codec provides:
 // - toData(value) → PlutusData
@@ -262,25 +262,25 @@ const Codec = Core.Data.withSchema(Schema)
 ### Payment Credential
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, TSchema } from "@evolution-sdk/evolution"
 
-const PaymentCredentialSchema = Core.TSchema.Variant({
+const PaymentCredentialSchema = TSchema.Variant({
   VerificationKey: {
-    hash: Core.TSchema.ByteArray
+    hash: TSchema.ByteArray
   },
   Script: {
-    hash: Core.TSchema.ByteArray
+    hash: TSchema.ByteArray
   }
 })
 
 export type PaymentCredential = typeof PaymentCredentialSchema.Type
 
-export const PaymentCredentialCodec = Core.Data.withSchema(PaymentCredentialSchema)
+export const PaymentCredentialCodec = Data.withSchema(PaymentCredentialSchema)
 
 // Use in your app
 const cred: PaymentCredential = {
   VerificationKey: {
-    hash: Core.Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de")
+    hash: Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de")
   }
 }
 
@@ -290,21 +290,21 @@ const cbor = PaymentCredentialCodec.toCBORHex(cred)
 ### Escrow Datum
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, TSchema } from "@evolution-sdk/evolution"
 
-const EscrowDatumSchema = Core.TSchema.Struct({
-  beneficiary: Core.TSchema.ByteArray,
-  deadline: Core.TSchema.Integer,
-  amount: Core.TSchema.Integer
+const EscrowDatumSchema = TSchema.Struct({
+  beneficiary: TSchema.ByteArray,
+  deadline: TSchema.Integer,
+  amount: TSchema.Integer
 })
 
 export type EscrowDatum = typeof EscrowDatumSchema.Type
 
-export const EscrowDatumCodec = Core.Data.withSchema(EscrowDatumSchema)
+export const EscrowDatumCodec = Data.withSchema(EscrowDatumSchema)
 
 // Create datum
 const datum: EscrowDatum = {
-  beneficiary: Core.Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de"),
+  beneficiary: Bytes.fromHex("abc123def456abc123def456abc123def456abc123def456abc123de"),
   deadline: 1735689600000n,
   amount: 10000000n
 }
@@ -316,27 +316,27 @@ const datumCbor = EscrowDatumCodec.toCBORHex(datum)
 ### Multi-Action Redeemer
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, TSchema } from "@evolution-sdk/evolution"
 
-const RedeemerSchema = Core.TSchema.Variant({
+const RedeemerSchema = TSchema.Variant({
   Claim: {},
   Cancel: {},
   Update: {
-    new_beneficiary: Core.TSchema.ByteArray,
-    new_deadline: Core.TSchema.Integer
+    new_beneficiary: TSchema.ByteArray,
+    new_deadline: TSchema.Integer
   }
 })
 
 export type Redeemer = typeof RedeemerSchema.Type
 
-export const RedeemerCodec = Core.Data.withSchema(RedeemerSchema)
+export const RedeemerCodec = Data.withSchema(RedeemerSchema)
 
 // Different actions
 const claim: Redeemer = { Claim: {} }
 const cancel: Redeemer = { Cancel: {} }
 const update: Redeemer = {
   Update: {
-    new_beneficiary: Core.Bytes.fromHex("def456abc123def456abc123def456abc123def456abc123def456ab"),
+    new_beneficiary: Bytes.fromHex("def456abc123def456abc123def456abc123def456abc123def456ab"),
     new_deadline: 1735776000000n
   }
 }
@@ -353,32 +353,32 @@ For CIP-68 metadata with arbitrary PlutusData fields, you can build the schema m
 Schemas compose naturally:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, TSchema } from "@evolution-sdk/evolution"
 
 // Base schemas
-const CredentialSchema = Core.TSchema.Variant({
-  VerificationKey: { hash: Core.TSchema.ByteArray },
-  Script: { hash: Core.TSchema.ByteArray }
+const CredentialSchema = TSchema.Variant({
+  VerificationKey: { hash: TSchema.ByteArray },
+  Script: { hash: TSchema.ByteArray }
 })
 
-const StakeCredentialSchema = Core.TSchema.Variant({
+const StakeCredentialSchema = TSchema.Variant({
   Inline: { credential: CredentialSchema },
   Pointer: {
-    slot_number: Core.TSchema.Integer,
-    transaction_index: Core.TSchema.Integer,
-    certificate_index: Core.TSchema.Integer
+    slot_number: TSchema.Integer,
+    transaction_index: TSchema.Integer,
+    certificate_index: TSchema.Integer
   }
 })
 
 // Composed schema
-const AddressSchema = Core.TSchema.Struct({
+const AddressSchema = TSchema.Struct({
   payment_credential: CredentialSchema,
-  stake_credential: Core.TSchema.UndefinedOr(StakeCredentialSchema)
+  stake_credential: TSchema.UndefinedOr(StakeCredentialSchema)
 })
 
 export type Address = typeof AddressSchema.Type
 
-export const AddressCodec = Core.Data.withSchema(AddressSchema)
+export const AddressCodec = Data.withSchema(AddressSchema)
 ```
 
 ## Type Extraction
@@ -386,12 +386,12 @@ export const AddressCodec = Core.Data.withSchema(AddressSchema)
 Get TypeScript types from any schema:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, TSchema } from "@evolution-sdk/evolution"
 
-const Schema = Core.TSchema.Struct({
-  id: Core.TSchema.ByteArray,
-  amount: Core.TSchema.Integer,
-  metadata: Core.TSchema.UndefinedOr(Core.TSchema.ByteArray)
+const Schema = TSchema.Struct({
+  id: TSchema.ByteArray,
+  amount: TSchema.Integer,
+  metadata: TSchema.UndefinedOr(TSchema.ByteArray)
 })
 
 // Extract type
@@ -430,14 +430,14 @@ function process(data: MyType) {
 **Export types and codecs**: Make both the type and codec available:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution"
+import { Bytes, Data, TSchema } from "@evolution-sdk/evolution"
 
-const MyDatumSchema = Core.TSchema.Struct({
-  value: Core.TSchema.Integer
+const MyDatumSchema = TSchema.Struct({
+  value: TSchema.Integer
 })
 
 export type MyDatum = typeof MyDatumSchema.Type
-export const MyDatumCodec = Core.Data.withSchema(MyDatumSchema)
+export const MyDatumCodec = Data.withSchema(MyDatumSchema)
 ```
 
 ## Next Steps
diff --git a/docs/content/docs/introduction/getting-started.mdx b/docs/content/docs/introduction/getting-started.mdx
index 89a63d70..9c8350da 100644
--- a/docs/content/docs/introduction/getting-started.mdx
+++ b/docs/content/docs/introduction/getting-started.mdx
@@ -27,7 +27,7 @@ npm install @evolution-sdk/evolution
 ### 2. Create a Wallet
 Instantiate a wallet using your seed phrase or private keys:
 ```ts twoslash
-import { createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "preprod",
@@ -44,7 +44,7 @@ See [Creating Wallets](/docs/wallets) for all wallet types.
 ### 3. Attach a Provider
 Connect to the blockchain via a provider:
 ```ts twoslash
-import { createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "preprod",
@@ -66,7 +66,7 @@ Learn more in [Clients](/docs/clients) and [Providers](/docs/clients/providers).
 ### 4. Build a Transaction
 Construct your first payment:
 ```ts twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "preprod",
@@ -86,8 +86,8 @@ const client = createClient({
 const tx = await client
   .newTx()
   .payToAddress({ 
-    address: Core.Address.fromBech32("addr_test1qzrf9g3ea6hdc5vfujgrpjc0c0xq3qqkz8zkpwh3s6nqzhgey8k3eq73kr0gcqd7cyy75s0qqx0qqx0qqx0qqx0qx7e8pq"),
-    assets: Core.Assets.fromLovelace(2_000_000n)
+    address: Address.fromBech32("addr_test1qzrf9g3ea6hdc5vfujgrpjc0c0xq3qqkz8zkpwh3s6nqzhgey8k3eq73kr0gcqd7cyy75s0qqx0qqx0qqx0qqx0qx7e8pq"),
+    assets: Assets.fromLovelace(2_000_000n)
   })
   .build();
 ```
@@ -97,7 +97,7 @@ Details in [Transactions](/docs/transactions).
 ### 5. Sign & Submit
 Sign with your wallet and send to the network:
 ```ts twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "preprod",
@@ -115,8 +115,8 @@ const client = createClient({
 
 const tx = await client.newTx()
   .payToAddress({ 
-    address: Core.Address.fromBech32("addr_test1qzrf9g3ea6hdc5vfujgrpjc0c0xq3qqkz8zkpwh3s6nqzhgey8k3eq73kr0gcqd7cyy75s0qqx0qqx0qqx0qqx0qx7e8pq"),
-    assets: Core.Assets.fromLovelace(2_000_000n)
+    address: Address.fromBech32("addr_test1qzrf9g3ea6hdc5vfujgrpjc0c0xq3qqkz8zkpwh3s6nqzhgey8k3eq73kr0gcqd7cyy75s0qqx0qqx0qqx0qqx0qx7e8pq"),
+    assets: Assets.fromLovelace(2_000_000n)
   })
   .build();
 
diff --git a/docs/content/docs/introduction/migration-from-lucid.mdx b/docs/content/docs/introduction/migration-from-lucid.mdx
index ffec91ff..c54ea01a 100644
--- a/docs/content/docs/introduction/migration-from-lucid.mdx
+++ b/docs/content/docs/introduction/migration-from-lucid.mdx
@@ -36,7 +36,7 @@ const lucid = await Lucid.new(blockfrostProvider, "Preprod");
 
 **Evolution SDK:**
 ```ts twoslash
-import { createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "preprod",
@@ -65,7 +65,7 @@ lucid
 
 **Evolution SDK:**
 ```ts twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "preprod",
@@ -85,8 +85,8 @@ const client = createClient({
 const tx = await client
   .newTx()
   .payToAddress({ 
-    address: Core.Address.fromBech32("addr_test1qzrf9g3ea6hdc5vfujgrpjc0c0xq3qqkz8zkpwh3s6nqzhgey8k3eq73kr0gcqd7cyy75s0qqx0qqx0qqx0qqx0qx7e8pq"),
-    assets: Core.Assets.fromLovelace(2_000_000n)
+    address: Address.fromBech32("addr_test1qzrf9g3ea6hdc5vfujgrpjc0c0xq3qqkz8zkpwh3s6nqzhgey8k3eq73kr0gcqd7cyy75s0qqx0qqx0qqx0qqx0qx7e8pq"),
+    assets: Assets.fromLovelace(2_000_000n)
   })
   .build();
 ```
diff --git a/docs/content/docs/modules/core/Address.mdx b/docs/content/docs/modules/Address.mdx
similarity index 98%
rename from docs/content/docs/modules/core/Address.mdx
rename to docs/content/docs/modules/Address.mdx
index 714c7d3b..1c14e9c1 100644
--- a/docs/content/docs/modules/core/Address.mdx
+++ b/docs/content/docs/modules/Address.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/Address.ts
-nav_order: 4
+title: Address.ts
+nav_order: 1
 parent: Modules
 ---
 
@@ -225,7 +225,7 @@ export declare const getAddressDetails: (address: string) => AddressDetails | un
 **Example**
 
 ```typescript
-import * as Address from "@evolution-sdk/evolution/core/Address"
+import * as Address from "@evolution-sdk/evolution/Address"
 
 const details = Address.getAddressDetails("addr_test1qp...")
 if (details) {
diff --git a/docs/content/docs/modules/core/AddressEras.mdx b/docs/content/docs/modules/AddressEras.mdx
similarity index 99%
rename from docs/content/docs/modules/core/AddressEras.mdx
rename to docs/content/docs/modules/AddressEras.mdx
index b24a5c1c..4999cd7a 100644
--- a/docs/content/docs/modules/core/AddressEras.mdx
+++ b/docs/content/docs/modules/AddressEras.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/AddressEras.ts
-nav_order: 5
+title: AddressEras.ts
+nav_order: 2
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/AddressTag.mdx b/docs/content/docs/modules/AddressTag.mdx
similarity index 93%
rename from docs/content/docs/modules/core/AddressTag.mdx
rename to docs/content/docs/modules/AddressTag.mdx
index a1881353..a0d86808 100644
--- a/docs/content/docs/modules/core/AddressTag.mdx
+++ b/docs/content/docs/modules/AddressTag.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/AddressTag.ts
-nav_order: 6
+title: AddressTag.ts
+nav_order: 3
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/Anchor.mdx b/docs/content/docs/modules/Anchor.mdx
similarity index 99%
rename from docs/content/docs/modules/core/Anchor.mdx
rename to docs/content/docs/modules/Anchor.mdx
index eef2b9bf..d722260b 100644
--- a/docs/content/docs/modules/core/Anchor.mdx
+++ b/docs/content/docs/modules/Anchor.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/Anchor.ts
-nav_order: 7
+title: Anchor.ts
+nav_order: 4
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/AssetName.mdx b/docs/content/docs/modules/AssetName.mdx
similarity index 98%
rename from docs/content/docs/modules/core/AssetName.mdx
rename to docs/content/docs/modules/AssetName.mdx
index f4584de1..9dd3bb5c 100644
--- a/docs/content/docs/modules/core/AssetName.mdx
+++ b/docs/content/docs/modules/AssetName.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/AssetName.ts
-nav_order: 8
+title: AssetName.ts
+nav_order: 5
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/Assets/Label.mdx b/docs/content/docs/modules/Assets/Label.mdx
similarity index 86%
rename from docs/content/docs/modules/core/Assets/Label.mdx
rename to docs/content/docs/modules/Assets/Label.mdx
index 09e9f36a..d9c88bd3 100644
--- a/docs/content/docs/modules/core/Assets/Label.mdx
+++ b/docs/content/docs/modules/Assets/Label.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/Assets/Label.ts
-nav_order: 9
+title: Assets/Label.ts
+nav_order: 6
 parent: Modules
 ---
 
@@ -36,7 +36,7 @@ export declare const fromLabel: (label: string) => number | undefined
 **Example**
 
 ```typescript
-import * as Label from "@evolution-sdk/evolution/core/Assets/Label"
+import * as Label from "@evolution-sdk/evolution/Assets/Label"
 
 const num = Label.fromLabel("000de140")
 // => 222
@@ -63,7 +63,7 @@ export declare const toLabel: (num: number) => string
 **Example**
 
 ```typescript
-import * as Label from "@evolution-sdk/evolution/core/Assets/Label"
+import * as Label from "@evolution-sdk/evolution/Assets/Label"
 
 const label = Label.toLabel(222)
 // => "000de140"
@@ -91,7 +91,7 @@ export declare const LabelFromHex: Schema.transformOrFail<
 **Example**
 
 ```typescript
-import * as Label from "@evolution-sdk/evolution/core/Assets/Label"
+import * as Label from "@evolution-sdk/evolution/Assets/Label"
 import { Schema } from "effect"
 
 const decoded = Schema.decodeSync(Label.LabelFromHex)("000de140")
diff --git a/docs/content/docs/modules/core/Assets/Unit.mdx b/docs/content/docs/modules/Assets/Unit.mdx
similarity index 97%
rename from docs/content/docs/modules/core/Assets/Unit.mdx
rename to docs/content/docs/modules/Assets/Unit.mdx
index ea2d1dc5..dcc16d90 100644
--- a/docs/content/docs/modules/core/Assets/Unit.mdx
+++ b/docs/content/docs/modules/Assets/Unit.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/Assets/Unit.ts
-nav_order: 10
+title: Assets/Unit.ts
+nav_order: 7
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/AuxiliaryData.mdx b/docs/content/docs/modules/AuxiliaryData.mdx
similarity index 99%
rename from docs/content/docs/modules/core/AuxiliaryData.mdx
rename to docs/content/docs/modules/AuxiliaryData.mdx
index 2d41f35e..a02ec402 100644
--- a/docs/content/docs/modules/core/AuxiliaryData.mdx
+++ b/docs/content/docs/modules/AuxiliaryData.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/AuxiliaryData.ts
-nav_order: 11
+title: AuxiliaryData.ts
+nav_order: 8
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/AuxiliaryDataHash.mdx b/docs/content/docs/modules/AuxiliaryDataHash.mdx
similarity index 98%
rename from docs/content/docs/modules/core/AuxiliaryDataHash.mdx
rename to docs/content/docs/modules/AuxiliaryDataHash.mdx
index b3d10426..176b1825 100644
--- a/docs/content/docs/modules/core/AuxiliaryDataHash.mdx
+++ b/docs/content/docs/modules/AuxiliaryDataHash.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/AuxiliaryDataHash.ts
-nav_order: 12
+title: AuxiliaryDataHash.ts
+nav_order: 9
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/BaseAddress.mdx b/docs/content/docs/modules/BaseAddress.mdx
similarity index 98%
rename from docs/content/docs/modules/core/BaseAddress.mdx
rename to docs/content/docs/modules/BaseAddress.mdx
index 990c8733..d0dc96b5 100644
--- a/docs/content/docs/modules/core/BaseAddress.mdx
+++ b/docs/content/docs/modules/BaseAddress.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/BaseAddress.ts
-nav_order: 13
+title: BaseAddress.ts
+nav_order: 10
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/Bech32.mdx b/docs/content/docs/modules/Bech32.mdx
similarity index 96%
rename from docs/content/docs/modules/core/Bech32.mdx
rename to docs/content/docs/modules/Bech32.mdx
index 66366172..4f262d90 100644
--- a/docs/content/docs/modules/core/Bech32.mdx
+++ b/docs/content/docs/modules/Bech32.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/Bech32.ts
-nav_order: 14
+title: Bech32.ts
+nav_order: 11
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/BigInt.mdx b/docs/content/docs/modules/BigInt.mdx
similarity index 98%
rename from docs/content/docs/modules/core/BigInt.mdx
rename to docs/content/docs/modules/BigInt.mdx
index a9e961d2..f458dc88 100644
--- a/docs/content/docs/modules/core/BigInt.mdx
+++ b/docs/content/docs/modules/BigInt.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/BigInt.ts
-nav_order: 15
+title: BigInt.ts
+nav_order: 12
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/Bip32PrivateKey.mdx b/docs/content/docs/modules/Bip32PrivateKey.mdx
similarity index 99%
rename from docs/content/docs/modules/core/Bip32PrivateKey.mdx
rename to docs/content/docs/modules/Bip32PrivateKey.mdx
index b9b01aed..da385da5 100644
--- a/docs/content/docs/modules/core/Bip32PrivateKey.mdx
+++ b/docs/content/docs/modules/Bip32PrivateKey.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/Bip32PrivateKey.ts
-nav_order: 16
+title: Bip32PrivateKey.ts
+nav_order: 13
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/Bip32PublicKey.mdx b/docs/content/docs/modules/Bip32PublicKey.mdx
similarity index 99%
rename from docs/content/docs/modules/core/Bip32PublicKey.mdx
rename to docs/content/docs/modules/Bip32PublicKey.mdx
index c87287e8..685a56eb 100644
--- a/docs/content/docs/modules/core/Bip32PublicKey.mdx
+++ b/docs/content/docs/modules/Bip32PublicKey.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/Bip32PublicKey.ts
-nav_order: 17
+title: Bip32PublicKey.ts
+nav_order: 14
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/Block.mdx b/docs/content/docs/modules/Block.mdx
similarity index 96%
rename from docs/content/docs/modules/core/Block.mdx
rename to docs/content/docs/modules/Block.mdx
index eab956e7..d9454fcd 100644
--- a/docs/content/docs/modules/core/Block.mdx
+++ b/docs/content/docs/modules/Block.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/Block.ts
-nav_order: 18
+title: Block.ts
+nav_order: 15
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/BlockBodyHash.mdx b/docs/content/docs/modules/BlockBodyHash.mdx
similarity index 98%
rename from docs/content/docs/modules/core/BlockBodyHash.mdx
rename to docs/content/docs/modules/BlockBodyHash.mdx
index 5304cac4..6be659e2 100644
--- a/docs/content/docs/modules/core/BlockBodyHash.mdx
+++ b/docs/content/docs/modules/BlockBodyHash.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/BlockBodyHash.ts
-nav_order: 19
+title: BlockBodyHash.ts
+nav_order: 16
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/BlockHeaderHash.mdx b/docs/content/docs/modules/BlockHeaderHash.mdx
similarity index 98%
rename from docs/content/docs/modules/core/BlockHeaderHash.mdx
rename to docs/content/docs/modules/BlockHeaderHash.mdx
index 81b01fc1..48622e0f 100644
--- a/docs/content/docs/modules/core/BlockHeaderHash.mdx
+++ b/docs/content/docs/modules/BlockHeaderHash.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/BlockHeaderHash.ts
-nav_order: 20
+title: BlockHeaderHash.ts
+nav_order: 17
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/BootstrapWitness.mdx b/docs/content/docs/modules/BootstrapWitness.mdx
similarity index 99%
rename from docs/content/docs/modules/core/BootstrapWitness.mdx
rename to docs/content/docs/modules/BootstrapWitness.mdx
index da259864..bb66d15e 100644
--- a/docs/content/docs/modules/core/BootstrapWitness.mdx
+++ b/docs/content/docs/modules/BootstrapWitness.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/BootstrapWitness.ts
+title: BootstrapWitness.ts
 nav_order: 21
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/BoundedBytes.mdx b/docs/content/docs/modules/BoundedBytes.mdx
similarity index 97%
rename from docs/content/docs/modules/core/BoundedBytes.mdx
rename to docs/content/docs/modules/BoundedBytes.mdx
index 02cfaa16..0ac31f37 100644
--- a/docs/content/docs/modules/core/BoundedBytes.mdx
+++ b/docs/content/docs/modules/BoundedBytes.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/BoundedBytes.ts
+title: BoundedBytes.ts
 nav_order: 22
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/ByronAddress.mdx b/docs/content/docs/modules/ByronAddress.mdx
similarity index 98%
rename from docs/content/docs/modules/core/ByronAddress.mdx
rename to docs/content/docs/modules/ByronAddress.mdx
index c76327d9..e78357b5 100644
--- a/docs/content/docs/modules/core/ByronAddress.mdx
+++ b/docs/content/docs/modules/ByronAddress.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/ByronAddress.ts
+title: ByronAddress.ts
 nav_order: 23
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Bytes.mdx b/docs/content/docs/modules/Bytes.mdx
similarity index 99%
rename from docs/content/docs/modules/core/Bytes.mdx
rename to docs/content/docs/modules/Bytes.mdx
index 0889caac..8e14ca91 100644
--- a/docs/content/docs/modules/core/Bytes.mdx
+++ b/docs/content/docs/modules/Bytes.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Bytes.ts
+title: Bytes.ts
 nav_order: 24
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Bytes128.mdx b/docs/content/docs/modules/Bytes128.mdx
similarity index 98%
rename from docs/content/docs/modules/core/Bytes128.mdx
rename to docs/content/docs/modules/Bytes128.mdx
index 10314457..038cdb98 100644
--- a/docs/content/docs/modules/core/Bytes128.mdx
+++ b/docs/content/docs/modules/Bytes128.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Bytes128.ts
+title: Bytes128.ts
 nav_order: 25
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Bytes16.mdx b/docs/content/docs/modules/Bytes16.mdx
similarity index 98%
rename from docs/content/docs/modules/core/Bytes16.mdx
rename to docs/content/docs/modules/Bytes16.mdx
index 4c95b939..f3ee1db2 100644
--- a/docs/content/docs/modules/core/Bytes16.mdx
+++ b/docs/content/docs/modules/Bytes16.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Bytes16.ts
+title: Bytes16.ts
 nav_order: 26
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Bytes29.mdx b/docs/content/docs/modules/Bytes29.mdx
similarity index 98%
rename from docs/content/docs/modules/core/Bytes29.mdx
rename to docs/content/docs/modules/Bytes29.mdx
index d5e48e64..4876987f 100644
--- a/docs/content/docs/modules/core/Bytes29.mdx
+++ b/docs/content/docs/modules/Bytes29.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Bytes29.ts
+title: Bytes29.ts
 nav_order: 27
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Bytes32.mdx b/docs/content/docs/modules/Bytes32.mdx
similarity index 98%
rename from docs/content/docs/modules/core/Bytes32.mdx
rename to docs/content/docs/modules/Bytes32.mdx
index f1ff591d..735bb367 100644
--- a/docs/content/docs/modules/core/Bytes32.mdx
+++ b/docs/content/docs/modules/Bytes32.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Bytes32.ts
+title: Bytes32.ts
 nav_order: 28
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Bytes4.mdx b/docs/content/docs/modules/Bytes4.mdx
similarity index 98%
rename from docs/content/docs/modules/core/Bytes4.mdx
rename to docs/content/docs/modules/Bytes4.mdx
index 758f45e1..b60a6138 100644
--- a/docs/content/docs/modules/core/Bytes4.mdx
+++ b/docs/content/docs/modules/Bytes4.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Bytes4.ts
+title: Bytes4.ts
 nav_order: 29
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Bytes448.mdx b/docs/content/docs/modules/Bytes448.mdx
similarity index 98%
rename from docs/content/docs/modules/core/Bytes448.mdx
rename to docs/content/docs/modules/Bytes448.mdx
index f16ade7d..bd2873aa 100644
--- a/docs/content/docs/modules/core/Bytes448.mdx
+++ b/docs/content/docs/modules/Bytes448.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Bytes448.ts
+title: Bytes448.ts
 nav_order: 30
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Bytes57.mdx b/docs/content/docs/modules/Bytes57.mdx
similarity index 98%
rename from docs/content/docs/modules/core/Bytes57.mdx
rename to docs/content/docs/modules/Bytes57.mdx
index 4293cce8..ba37ad79 100644
--- a/docs/content/docs/modules/core/Bytes57.mdx
+++ b/docs/content/docs/modules/Bytes57.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Bytes57.ts
+title: Bytes57.ts
 nav_order: 31
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Bytes64.mdx b/docs/content/docs/modules/Bytes64.mdx
similarity index 98%
rename from docs/content/docs/modules/core/Bytes64.mdx
rename to docs/content/docs/modules/Bytes64.mdx
index dfa49b2f..6f073c62 100644
--- a/docs/content/docs/modules/core/Bytes64.mdx
+++ b/docs/content/docs/modules/Bytes64.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Bytes64.ts
+title: Bytes64.ts
 nav_order: 32
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Bytes80.mdx b/docs/content/docs/modules/Bytes80.mdx
similarity index 98%
rename from docs/content/docs/modules/core/Bytes80.mdx
rename to docs/content/docs/modules/Bytes80.mdx
index 06750a50..c1202c5f 100644
--- a/docs/content/docs/modules/core/Bytes80.mdx
+++ b/docs/content/docs/modules/Bytes80.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Bytes80.ts
+title: Bytes80.ts
 nav_order: 33
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Bytes96.mdx b/docs/content/docs/modules/Bytes96.mdx
similarity index 98%
rename from docs/content/docs/modules/core/Bytes96.mdx
rename to docs/content/docs/modules/Bytes96.mdx
index a42dc739..3e49dfeb 100644
--- a/docs/content/docs/modules/core/Bytes96.mdx
+++ b/docs/content/docs/modules/Bytes96.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Bytes96.ts
+title: Bytes96.ts
 nav_order: 34
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/CBOR.mdx b/docs/content/docs/modules/CBOR.mdx
similarity index 99%
rename from docs/content/docs/modules/core/CBOR.mdx
rename to docs/content/docs/modules/CBOR.mdx
index 017a92e9..f42af70b 100644
--- a/docs/content/docs/modules/core/CBOR.mdx
+++ b/docs/content/docs/modules/CBOR.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/CBOR.ts
+title: CBOR.ts
 nav_order: 35
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Certificate.mdx b/docs/content/docs/modules/Certificate.mdx
similarity index 99%
rename from docs/content/docs/modules/core/Certificate.mdx
rename to docs/content/docs/modules/Certificate.mdx
index 62da9cd0..aa946db5 100644
--- a/docs/content/docs/modules/core/Certificate.mdx
+++ b/docs/content/docs/modules/Certificate.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Certificate.ts
+title: Certificate.ts
 nav_order: 36
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Codec.mdx b/docs/content/docs/modules/Codec.mdx
similarity index 98%
rename from docs/content/docs/modules/core/Codec.mdx
rename to docs/content/docs/modules/Codec.mdx
index 584a9249..4c5bc896 100644
--- a/docs/content/docs/modules/core/Codec.mdx
+++ b/docs/content/docs/modules/Codec.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Codec.ts
+title: Codec.ts
 nav_order: 37
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Coin.mdx b/docs/content/docs/modules/Coin.mdx
similarity index 98%
rename from docs/content/docs/modules/core/Coin.mdx
rename to docs/content/docs/modules/Coin.mdx
index 91221ef3..8f0ac911 100644
--- a/docs/content/docs/modules/core/Coin.mdx
+++ b/docs/content/docs/modules/Coin.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Coin.ts
+title: Coin.ts
 nav_order: 38
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Combinator.mdx b/docs/content/docs/modules/Combinator.mdx
similarity index 97%
rename from docs/content/docs/modules/core/Combinator.mdx
rename to docs/content/docs/modules/Combinator.mdx
index 0c6ed680..61402691 100644
--- a/docs/content/docs/modules/core/Combinator.mdx
+++ b/docs/content/docs/modules/Combinator.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Combinator.ts
+title: Combinator.ts
 nav_order: 39
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/CommitteeColdCredential.mdx b/docs/content/docs/modules/CommitteeColdCredential.mdx
similarity index 98%
rename from docs/content/docs/modules/core/CommitteeColdCredential.mdx
rename to docs/content/docs/modules/CommitteeColdCredential.mdx
index 04cd26e5..26494b43 100644
--- a/docs/content/docs/modules/core/CommitteeColdCredential.mdx
+++ b/docs/content/docs/modules/CommitteeColdCredential.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/CommitteeColdCredential.ts
+title: CommitteeColdCredential.ts
 nav_order: 40
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/CommitteeHotCredential.mdx b/docs/content/docs/modules/CommitteeHotCredential.mdx
similarity index 98%
rename from docs/content/docs/modules/core/CommitteeHotCredential.mdx
rename to docs/content/docs/modules/CommitteeHotCredential.mdx
index dc3554d5..2c022b52 100644
--- a/docs/content/docs/modules/core/CommitteeHotCredential.mdx
+++ b/docs/content/docs/modules/CommitteeHotCredential.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/CommitteeHotCredential.ts
+title: CommitteeHotCredential.ts
 nav_order: 41
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Constitution.mdx b/docs/content/docs/modules/Constitution.mdx
similarity index 99%
rename from docs/content/docs/modules/core/Constitution.mdx
rename to docs/content/docs/modules/Constitution.mdx
index b4dd2b83..ce6e2567 100644
--- a/docs/content/docs/modules/core/Constitution.mdx
+++ b/docs/content/docs/modules/Constitution.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Constitution.ts
+title: Constitution.ts
 nav_order: 42
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/CostModel.mdx b/docs/content/docs/modules/CostModel.mdx
similarity index 99%
rename from docs/content/docs/modules/core/CostModel.mdx
rename to docs/content/docs/modules/CostModel.mdx
index 54a63c88..ab64cc04 100644
--- a/docs/content/docs/modules/core/CostModel.mdx
+++ b/docs/content/docs/modules/CostModel.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/CostModel.ts
+title: CostModel.ts
 nav_order: 43
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Credential.mdx b/docs/content/docs/modules/Credential.mdx
similarity index 99%
rename from docs/content/docs/modules/core/Credential.mdx
rename to docs/content/docs/modules/Credential.mdx
index 477a1422..a15596e8 100644
--- a/docs/content/docs/modules/core/Credential.mdx
+++ b/docs/content/docs/modules/Credential.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Credential.ts
+title: Credential.ts
 nav_order: 44
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/DRep.mdx b/docs/content/docs/modules/DRep.mdx
similarity index 99%
rename from docs/content/docs/modules/core/DRep.mdx
rename to docs/content/docs/modules/DRep.mdx
index 735fcd6f..132556d3 100644
--- a/docs/content/docs/modules/core/DRep.mdx
+++ b/docs/content/docs/modules/DRep.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/DRep.ts
+title: DRep.ts
 nav_order: 49
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/DRepCredential.mdx b/docs/content/docs/modules/DRepCredential.mdx
similarity index 94%
rename from docs/content/docs/modules/core/DRepCredential.mdx
rename to docs/content/docs/modules/DRepCredential.mdx
index 0f6a3288..6a284a52 100644
--- a/docs/content/docs/modules/core/DRepCredential.mdx
+++ b/docs/content/docs/modules/DRepCredential.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/DRepCredential.ts
+title: DRepCredential.ts
 nav_order: 50
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Data.mdx b/docs/content/docs/modules/Data.mdx
similarity index 99%
rename from docs/content/docs/modules/core/Data.mdx
rename to docs/content/docs/modules/Data.mdx
index b5dc5035..1db494cd 100644
--- a/docs/content/docs/modules/core/Data.mdx
+++ b/docs/content/docs/modules/Data.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Data.ts
+title: Data.ts
 nav_order: 45
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/DataJson.mdx b/docs/content/docs/modules/DataJson.mdx
similarity index 99%
rename from docs/content/docs/modules/core/DataJson.mdx
rename to docs/content/docs/modules/DataJson.mdx
index b3763ed7..dec2b144 100644
--- a/docs/content/docs/modules/core/DataJson.mdx
+++ b/docs/content/docs/modules/DataJson.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/DataJson.ts
+title: DataJson.ts
 nav_order: 46
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/DatumOption.mdx b/docs/content/docs/modules/DatumOption.mdx
similarity index 99%
rename from docs/content/docs/modules/core/DatumOption.mdx
rename to docs/content/docs/modules/DatumOption.mdx
index 1b092fd4..718cdf38 100644
--- a/docs/content/docs/modules/core/DatumOption.mdx
+++ b/docs/content/docs/modules/DatumOption.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/DatumOption.ts
+title: DatumOption.ts
 nav_order: 47
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/DnsName.mdx b/docs/content/docs/modules/DnsName.mdx
similarity index 99%
rename from docs/content/docs/modules/core/DnsName.mdx
rename to docs/content/docs/modules/DnsName.mdx
index ec1fccbb..bbd965fe 100644
--- a/docs/content/docs/modules/core/DnsName.mdx
+++ b/docs/content/docs/modules/DnsName.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/DnsName.ts
+title: DnsName.ts
 nav_order: 48
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Ed25519Signature.mdx b/docs/content/docs/modules/Ed25519Signature.mdx
similarity index 99%
rename from docs/content/docs/modules/core/Ed25519Signature.mdx
rename to docs/content/docs/modules/Ed25519Signature.mdx
index 9e668021..de2f5a7f 100644
--- a/docs/content/docs/modules/core/Ed25519Signature.mdx
+++ b/docs/content/docs/modules/Ed25519Signature.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Ed25519Signature.ts
+title: Ed25519Signature.ts
 nav_order: 51
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/EnterpriseAddress.mdx b/docs/content/docs/modules/EnterpriseAddress.mdx
similarity index 98%
rename from docs/content/docs/modules/core/EnterpriseAddress.mdx
rename to docs/content/docs/modules/EnterpriseAddress.mdx
index afa1dd9d..ddd87113 100644
--- a/docs/content/docs/modules/core/EnterpriseAddress.mdx
+++ b/docs/content/docs/modules/EnterpriseAddress.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/EnterpriseAddress.ts
+title: EnterpriseAddress.ts
 nav_order: 52
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/EpochNo.mdx b/docs/content/docs/modules/EpochNo.mdx
similarity index 98%
rename from docs/content/docs/modules/core/EpochNo.mdx
rename to docs/content/docs/modules/EpochNo.mdx
index aab2c33e..a72a4f18 100644
--- a/docs/content/docs/modules/core/EpochNo.mdx
+++ b/docs/content/docs/modules/EpochNo.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/EpochNo.ts
+title: EpochNo.ts
 nav_order: 53
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/FormatError.mdx b/docs/content/docs/modules/FormatError.mdx
similarity index 95%
rename from docs/content/docs/modules/core/FormatError.mdx
rename to docs/content/docs/modules/FormatError.mdx
index 75920996..10fe056e 100644
--- a/docs/content/docs/modules/core/FormatError.mdx
+++ b/docs/content/docs/modules/FormatError.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/FormatError.ts
+title: FormatError.ts
 nav_order: 54
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Function.mdx b/docs/content/docs/modules/Function.mdx
similarity index 99%
rename from docs/content/docs/modules/core/Function.mdx
rename to docs/content/docs/modules/Function.mdx
index 3a4ed88f..c47cacb6 100644
--- a/docs/content/docs/modules/core/Function.mdx
+++ b/docs/content/docs/modules/Function.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Function.ts
+title: Function.ts
 nav_order: 55
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/GovernanceAction.mdx b/docs/content/docs/modules/GovernanceAction.mdx
similarity index 99%
rename from docs/content/docs/modules/core/GovernanceAction.mdx
rename to docs/content/docs/modules/GovernanceAction.mdx
index c4eec951..7317a19f 100644
--- a/docs/content/docs/modules/core/GovernanceAction.mdx
+++ b/docs/content/docs/modules/GovernanceAction.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/GovernanceAction.ts
+title: GovernanceAction.ts
 nav_order: 56
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Hash28.mdx b/docs/content/docs/modules/Hash28.mdx
similarity index 98%
rename from docs/content/docs/modules/core/Hash28.mdx
rename to docs/content/docs/modules/Hash28.mdx
index 5d4b3f94..d32c73a7 100644
--- a/docs/content/docs/modules/core/Hash28.mdx
+++ b/docs/content/docs/modules/Hash28.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Hash28.ts
+title: Hash28.ts
 nav_order: 57
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Header.mdx b/docs/content/docs/modules/Header.mdx
similarity index 99%
rename from docs/content/docs/modules/core/Header.mdx
rename to docs/content/docs/modules/Header.mdx
index 985b246e..e74bb78f 100644
--- a/docs/content/docs/modules/core/Header.mdx
+++ b/docs/content/docs/modules/Header.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Header.ts
+title: Header.ts
 nav_order: 58
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/HeaderBody.mdx b/docs/content/docs/modules/HeaderBody.mdx
similarity index 99%
rename from docs/content/docs/modules/core/HeaderBody.mdx
rename to docs/content/docs/modules/HeaderBody.mdx
index ce5b07fb..7f17d00a 100644
--- a/docs/content/docs/modules/core/HeaderBody.mdx
+++ b/docs/content/docs/modules/HeaderBody.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/HeaderBody.ts
+title: HeaderBody.ts
 nav_order: 59
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/IPv4.mdx b/docs/content/docs/modules/IPv4.mdx
similarity index 99%
rename from docs/content/docs/modules/core/IPv4.mdx
rename to docs/content/docs/modules/IPv4.mdx
index 5f421515..edf96685 100644
--- a/docs/content/docs/modules/core/IPv4.mdx
+++ b/docs/content/docs/modules/IPv4.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/IPv4.ts
+title: IPv4.ts
 nav_order: 60
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/IPv6.mdx b/docs/content/docs/modules/IPv6.mdx
similarity index 99%
rename from docs/content/docs/modules/core/IPv6.mdx
rename to docs/content/docs/modules/IPv6.mdx
index 9916769d..370e3683 100644
--- a/docs/content/docs/modules/core/IPv6.mdx
+++ b/docs/content/docs/modules/IPv6.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/IPv6.ts
+title: IPv6.ts
 nav_order: 61
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/KESVkey.mdx b/docs/content/docs/modules/KESVkey.mdx
similarity index 99%
rename from docs/content/docs/modules/core/KESVkey.mdx
rename to docs/content/docs/modules/KESVkey.mdx
index 51ba437a..b0759aca 100644
--- a/docs/content/docs/modules/core/KESVkey.mdx
+++ b/docs/content/docs/modules/KESVkey.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/KESVkey.ts
+title: KESVkey.ts
 nav_order: 63
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/KesSignature.mdx b/docs/content/docs/modules/KesSignature.mdx
similarity index 99%
rename from docs/content/docs/modules/core/KesSignature.mdx
rename to docs/content/docs/modules/KesSignature.mdx
index 1b957bfa..2ec90970 100644
--- a/docs/content/docs/modules/core/KesSignature.mdx
+++ b/docs/content/docs/modules/KesSignature.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/KesSignature.ts
+title: KesSignature.ts
 nav_order: 62
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/KeyHash.mdx b/docs/content/docs/modules/KeyHash.mdx
similarity index 99%
rename from docs/content/docs/modules/core/KeyHash.mdx
rename to docs/content/docs/modules/KeyHash.mdx
index fdc8486d..096fbe62 100644
--- a/docs/content/docs/modules/core/KeyHash.mdx
+++ b/docs/content/docs/modules/KeyHash.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/KeyHash.ts
+title: KeyHash.ts
 nav_order: 64
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Language.mdx b/docs/content/docs/modules/Language.mdx
similarity index 98%
rename from docs/content/docs/modules/core/Language.mdx
rename to docs/content/docs/modules/Language.mdx
index 76f48536..d460ce92 100644
--- a/docs/content/docs/modules/core/Language.mdx
+++ b/docs/content/docs/modules/Language.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Language.ts
+title: Language.ts
 nav_order: 65
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Metadata.mdx b/docs/content/docs/modules/Metadata.mdx
similarity index 99%
rename from docs/content/docs/modules/core/Metadata.mdx
rename to docs/content/docs/modules/Metadata.mdx
index 98b13e59..1617978d 100644
--- a/docs/content/docs/modules/core/Metadata.mdx
+++ b/docs/content/docs/modules/Metadata.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Metadata.ts
+title: Metadata.ts
 nav_order: 73
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Mint.mdx b/docs/content/docs/modules/Mint.mdx
similarity index 99%
rename from docs/content/docs/modules/core/Mint.mdx
rename to docs/content/docs/modules/Mint.mdx
index 748b3d0b..2bca2c51 100644
--- a/docs/content/docs/modules/core/Mint.mdx
+++ b/docs/content/docs/modules/Mint.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Mint.ts
+title: Mint.ts
 nav_order: 74
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/MultiAsset.mdx b/docs/content/docs/modules/MultiAsset.mdx
similarity index 99%
rename from docs/content/docs/modules/core/MultiAsset.mdx
rename to docs/content/docs/modules/MultiAsset.mdx
index 366806e1..84716c96 100644
--- a/docs/content/docs/modules/core/MultiAsset.mdx
+++ b/docs/content/docs/modules/MultiAsset.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/MultiAsset.ts
+title: MultiAsset.ts
 nav_order: 75
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/MultiHostName.mdx b/docs/content/docs/modules/MultiHostName.mdx
similarity index 99%
rename from docs/content/docs/modules/core/MultiHostName.mdx
rename to docs/content/docs/modules/MultiHostName.mdx
index 4b257321..ba740a5a 100644
--- a/docs/content/docs/modules/core/MultiHostName.mdx
+++ b/docs/content/docs/modules/MultiHostName.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/MultiHostName.ts
+title: MultiHostName.ts
 nav_order: 76
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/NativeScriptJSON.mdx b/docs/content/docs/modules/NativeScriptJSON.mdx
similarity index 98%
rename from docs/content/docs/modules/core/NativeScriptJSON.mdx
rename to docs/content/docs/modules/NativeScriptJSON.mdx
index 6814056b..78dcd0ac 100644
--- a/docs/content/docs/modules/core/NativeScriptJSON.mdx
+++ b/docs/content/docs/modules/NativeScriptJSON.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/NativeScriptJSON.ts
+title: NativeScriptJSON.ts
 nav_order: 77
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/NativeScripts.mdx b/docs/content/docs/modules/NativeScripts.mdx
similarity index 99%
rename from docs/content/docs/modules/core/NativeScripts.mdx
rename to docs/content/docs/modules/NativeScripts.mdx
index 72e5baf0..1ae6c737 100644
--- a/docs/content/docs/modules/core/NativeScripts.mdx
+++ b/docs/content/docs/modules/NativeScripts.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/NativeScripts.ts
+title: NativeScripts.ts
 nav_order: 78
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/NativeScriptsOLD.mdx b/docs/content/docs/modules/NativeScriptsOLD.mdx
similarity index 99%
rename from docs/content/docs/modules/core/NativeScriptsOLD.mdx
rename to docs/content/docs/modules/NativeScriptsOLD.mdx
index 253750b1..b7097d84 100644
--- a/docs/content/docs/modules/core/NativeScriptsOLD.mdx
+++ b/docs/content/docs/modules/NativeScriptsOLD.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/NativeScriptsOLD.ts
+title: NativeScriptsOLD.ts
 nav_order: 79
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Natural.mdx b/docs/content/docs/modules/Natural.mdx
similarity index 98%
rename from docs/content/docs/modules/core/Natural.mdx
rename to docs/content/docs/modules/Natural.mdx
index 3e301968..f42dd0b9 100644
--- a/docs/content/docs/modules/core/Natural.mdx
+++ b/docs/content/docs/modules/Natural.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Natural.ts
+title: Natural.ts
 nav_order: 80
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Network.mdx b/docs/content/docs/modules/Network.mdx
similarity index 98%
rename from docs/content/docs/modules/core/Network.mdx
rename to docs/content/docs/modules/Network.mdx
index 189169d0..2921a848 100644
--- a/docs/content/docs/modules/core/Network.mdx
+++ b/docs/content/docs/modules/Network.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Network.ts
+title: Network.ts
 nav_order: 81
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/NetworkId.mdx b/docs/content/docs/modules/NetworkId.mdx
similarity index 97%
rename from docs/content/docs/modules/core/NetworkId.mdx
rename to docs/content/docs/modules/NetworkId.mdx
index efe71205..71bc9ed4 100644
--- a/docs/content/docs/modules/core/NetworkId.mdx
+++ b/docs/content/docs/modules/NetworkId.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/NetworkId.ts
+title: NetworkId.ts
 nav_order: 82
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/NonZeroInt64.mdx b/docs/content/docs/modules/NonZeroInt64.mdx
similarity index 99%
rename from docs/content/docs/modules/core/NonZeroInt64.mdx
rename to docs/content/docs/modules/NonZeroInt64.mdx
index 67220497..c4327f0c 100644
--- a/docs/content/docs/modules/core/NonZeroInt64.mdx
+++ b/docs/content/docs/modules/NonZeroInt64.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/NonZeroInt64.ts
+title: NonZeroInt64.ts
 nav_order: 84
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/NonnegativeInterval.mdx b/docs/content/docs/modules/NonnegativeInterval.mdx
similarity index 99%
rename from docs/content/docs/modules/core/NonnegativeInterval.mdx
rename to docs/content/docs/modules/NonnegativeInterval.mdx
index 1bd37fd6..4335fb7d 100644
--- a/docs/content/docs/modules/core/NonnegativeInterval.mdx
+++ b/docs/content/docs/modules/NonnegativeInterval.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/NonnegativeInterval.ts
+title: NonnegativeInterval.ts
 nav_order: 83
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Numeric.mdx b/docs/content/docs/modules/Numeric.mdx
similarity index 99%
rename from docs/content/docs/modules/core/Numeric.mdx
rename to docs/content/docs/modules/Numeric.mdx
index 6d593bf2..a034292f 100644
--- a/docs/content/docs/modules/core/Numeric.mdx
+++ b/docs/content/docs/modules/Numeric.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Numeric.ts
+title: Numeric.ts
 nav_order: 85
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/OperationalCert.mdx b/docs/content/docs/modules/OperationalCert.mdx
similarity index 99%
rename from docs/content/docs/modules/core/OperationalCert.mdx
rename to docs/content/docs/modules/OperationalCert.mdx
index dbf531e9..84f203e7 100644
--- a/docs/content/docs/modules/core/OperationalCert.mdx
+++ b/docs/content/docs/modules/OperationalCert.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/OperationalCert.ts
+title: OperationalCert.ts
 nav_order: 86
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/PaymentAddress.mdx b/docs/content/docs/modules/PaymentAddress.mdx
similarity index 97%
rename from docs/content/docs/modules/core/PaymentAddress.mdx
rename to docs/content/docs/modules/PaymentAddress.mdx
index a43999fe..ca3d1d98 100644
--- a/docs/content/docs/modules/core/PaymentAddress.mdx
+++ b/docs/content/docs/modules/PaymentAddress.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/PaymentAddress.ts
+title: PaymentAddress.ts
 nav_order: 87
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/PlutusV1.mdx b/docs/content/docs/modules/PlutusV1.mdx
similarity index 98%
rename from docs/content/docs/modules/core/PlutusV1.mdx
rename to docs/content/docs/modules/PlutusV1.mdx
index 9bd998aa..a044b08c 100644
--- a/docs/content/docs/modules/core/PlutusV1.mdx
+++ b/docs/content/docs/modules/PlutusV1.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/PlutusV1.ts
+title: PlutusV1.ts
 nav_order: 93
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/PlutusV2.mdx b/docs/content/docs/modules/PlutusV2.mdx
similarity index 98%
rename from docs/content/docs/modules/core/PlutusV2.mdx
rename to docs/content/docs/modules/PlutusV2.mdx
index 5e70dd13..c2d35267 100644
--- a/docs/content/docs/modules/core/PlutusV2.mdx
+++ b/docs/content/docs/modules/PlutusV2.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/PlutusV2.ts
+title: PlutusV2.ts
 nav_order: 94
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/PlutusV3.mdx b/docs/content/docs/modules/PlutusV3.mdx
similarity index 98%
rename from docs/content/docs/modules/core/PlutusV3.mdx
rename to docs/content/docs/modules/PlutusV3.mdx
index 60a210dd..feea769a 100644
--- a/docs/content/docs/modules/core/PlutusV3.mdx
+++ b/docs/content/docs/modules/PlutusV3.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/PlutusV3.ts
+title: PlutusV3.ts
 nav_order: 95
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Pointer.mdx b/docs/content/docs/modules/Pointer.mdx
similarity index 98%
rename from docs/content/docs/modules/core/Pointer.mdx
rename to docs/content/docs/modules/Pointer.mdx
index 5b5a8862..f0143da2 100644
--- a/docs/content/docs/modules/core/Pointer.mdx
+++ b/docs/content/docs/modules/Pointer.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Pointer.ts
+title: Pointer.ts
 nav_order: 96
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/PointerAddress.mdx b/docs/content/docs/modules/PointerAddress.mdx
similarity index 99%
rename from docs/content/docs/modules/core/PointerAddress.mdx
rename to docs/content/docs/modules/PointerAddress.mdx
index 98152128..fbc03d16 100644
--- a/docs/content/docs/modules/core/PointerAddress.mdx
+++ b/docs/content/docs/modules/PointerAddress.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/PointerAddress.ts
+title: PointerAddress.ts
 nav_order: 97
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/PolicyId.mdx b/docs/content/docs/modules/PolicyId.mdx
similarity index 99%
rename from docs/content/docs/modules/core/PolicyId.mdx
rename to docs/content/docs/modules/PolicyId.mdx
index 511079c4..2c1cc532 100644
--- a/docs/content/docs/modules/core/PolicyId.mdx
+++ b/docs/content/docs/modules/PolicyId.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/PolicyId.ts
+title: PolicyId.ts
 nav_order: 98
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/PoolKeyHash.mdx b/docs/content/docs/modules/PoolKeyHash.mdx
similarity index 99%
rename from docs/content/docs/modules/core/PoolKeyHash.mdx
rename to docs/content/docs/modules/PoolKeyHash.mdx
index b2b58134..537d0943 100644
--- a/docs/content/docs/modules/core/PoolKeyHash.mdx
+++ b/docs/content/docs/modules/PoolKeyHash.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/PoolKeyHash.ts
+title: PoolKeyHash.ts
 nav_order: 99
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/PoolMetadata.mdx b/docs/content/docs/modules/PoolMetadata.mdx
similarity index 99%
rename from docs/content/docs/modules/core/PoolMetadata.mdx
rename to docs/content/docs/modules/PoolMetadata.mdx
index ce1c3066..6cfa0493 100644
--- a/docs/content/docs/modules/core/PoolMetadata.mdx
+++ b/docs/content/docs/modules/PoolMetadata.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/PoolMetadata.ts
+title: PoolMetadata.ts
 nav_order: 100
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/PoolParams.mdx b/docs/content/docs/modules/PoolParams.mdx
similarity index 99%
rename from docs/content/docs/modules/core/PoolParams.mdx
rename to docs/content/docs/modules/PoolParams.mdx
index 2d300afa..569240bf 100644
--- a/docs/content/docs/modules/core/PoolParams.mdx
+++ b/docs/content/docs/modules/PoolParams.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/PoolParams.ts
+title: PoolParams.ts
 nav_order: 101
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Port.mdx b/docs/content/docs/modules/Port.mdx
similarity index 98%
rename from docs/content/docs/modules/core/Port.mdx
rename to docs/content/docs/modules/Port.mdx
index 20018ea0..bf172d3d 100644
--- a/docs/content/docs/modules/core/Port.mdx
+++ b/docs/content/docs/modules/Port.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Port.ts
+title: Port.ts
 nav_order: 102
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/PositiveCoin.mdx b/docs/content/docs/modules/PositiveCoin.mdx
similarity index 98%
rename from docs/content/docs/modules/core/PositiveCoin.mdx
rename to docs/content/docs/modules/PositiveCoin.mdx
index 00d39f39..201f519f 100644
--- a/docs/content/docs/modules/core/PositiveCoin.mdx
+++ b/docs/content/docs/modules/PositiveCoin.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/PositiveCoin.ts
+title: PositiveCoin.ts
 nav_order: 103
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/PrivateKey.mdx b/docs/content/docs/modules/PrivateKey.mdx
similarity index 99%
rename from docs/content/docs/modules/core/PrivateKey.mdx
rename to docs/content/docs/modules/PrivateKey.mdx
index 1d11e1b3..6f912201 100644
--- a/docs/content/docs/modules/core/PrivateKey.mdx
+++ b/docs/content/docs/modules/PrivateKey.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/PrivateKey.ts
+title: PrivateKey.ts
 nav_order: 104
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/ProposalProcedure.mdx b/docs/content/docs/modules/ProposalProcedure.mdx
similarity index 99%
rename from docs/content/docs/modules/core/ProposalProcedure.mdx
rename to docs/content/docs/modules/ProposalProcedure.mdx
index 4774f8a5..74450dc9 100644
--- a/docs/content/docs/modules/core/ProposalProcedure.mdx
+++ b/docs/content/docs/modules/ProposalProcedure.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/ProposalProcedure.ts
+title: ProposalProcedure.ts
 nav_order: 105
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/ProposalProcedures.mdx b/docs/content/docs/modules/ProposalProcedures.mdx
similarity index 99%
rename from docs/content/docs/modules/core/ProposalProcedures.mdx
rename to docs/content/docs/modules/ProposalProcedures.mdx
index c4f46f00..71261b90 100644
--- a/docs/content/docs/modules/core/ProposalProcedures.mdx
+++ b/docs/content/docs/modules/ProposalProcedures.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/ProposalProcedures.ts
+title: ProposalProcedures.ts
 nav_order: 106
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/ProtocolParamUpdate.mdx b/docs/content/docs/modules/ProtocolParamUpdate.mdx
similarity index 99%
rename from docs/content/docs/modules/core/ProtocolParamUpdate.mdx
rename to docs/content/docs/modules/ProtocolParamUpdate.mdx
index 68850250..5c32baaa 100644
--- a/docs/content/docs/modules/core/ProtocolParamUpdate.mdx
+++ b/docs/content/docs/modules/ProtocolParamUpdate.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/ProtocolParamUpdate.ts
+title: ProtocolParamUpdate.ts
 nav_order: 107
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/ProtocolVersion.mdx b/docs/content/docs/modules/ProtocolVersion.mdx
similarity index 99%
rename from docs/content/docs/modules/core/ProtocolVersion.mdx
rename to docs/content/docs/modules/ProtocolVersion.mdx
index 592e6216..1e6e533d 100644
--- a/docs/content/docs/modules/core/ProtocolVersion.mdx
+++ b/docs/content/docs/modules/ProtocolVersion.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/ProtocolVersion.ts
+title: ProtocolVersion.ts
 nav_order: 108
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Redeemer.mdx b/docs/content/docs/modules/Redeemer.mdx
similarity index 99%
rename from docs/content/docs/modules/core/Redeemer.mdx
rename to docs/content/docs/modules/Redeemer.mdx
index c6cc67ed..794dafb4 100644
--- a/docs/content/docs/modules/core/Redeemer.mdx
+++ b/docs/content/docs/modules/Redeemer.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Redeemer.ts
+title: Redeemer.ts
 nav_order: 109
 parent: Modules
 ---
@@ -138,7 +138,7 @@ FastCheck arbitrary for generating random RedeemerTag values.
 
 ```ts
 export declare const arbitraryRedeemerTag: FastCheck.Arbitrary<
-  "spend" | "mint" | "cert" | "reward" | "vote" | "propose"
+  "vote" | "spend" | "mint" | "cert" | "reward" | "propose"
 >
 ```
 
diff --git a/docs/content/docs/modules/core/Redeemers.mdx b/docs/content/docs/modules/Redeemers.mdx
similarity index 99%
rename from docs/content/docs/modules/core/Redeemers.mdx
rename to docs/content/docs/modules/Redeemers.mdx
index 549ed09e..f5fe24d1 100644
--- a/docs/content/docs/modules/core/Redeemers.mdx
+++ b/docs/content/docs/modules/Redeemers.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Redeemers.ts
+title: Redeemers.ts
 nav_order: 110
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Relay.mdx b/docs/content/docs/modules/Relay.mdx
similarity index 99%
rename from docs/content/docs/modules/core/Relay.mdx
rename to docs/content/docs/modules/Relay.mdx
index 97448bc9..1f4ddd96 100644
--- a/docs/content/docs/modules/core/Relay.mdx
+++ b/docs/content/docs/modules/Relay.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Relay.ts
+title: Relay.ts
 nav_order: 111
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/RewardAccount.mdx b/docs/content/docs/modules/RewardAccount.mdx
similarity index 99%
rename from docs/content/docs/modules/core/RewardAccount.mdx
rename to docs/content/docs/modules/RewardAccount.mdx
index 230fe49d..c3b8bf4d 100644
--- a/docs/content/docs/modules/core/RewardAccount.mdx
+++ b/docs/content/docs/modules/RewardAccount.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/RewardAccount.ts
+title: RewardAccount.ts
 nav_order: 112
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/RewardAddress.mdx b/docs/content/docs/modules/RewardAddress.mdx
similarity index 97%
rename from docs/content/docs/modules/core/RewardAddress.mdx
rename to docs/content/docs/modules/RewardAddress.mdx
index b6e42561..0eff2c70 100644
--- a/docs/content/docs/modules/core/RewardAddress.mdx
+++ b/docs/content/docs/modules/RewardAddress.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/RewardAddress.ts
+title: RewardAddress.ts
 nav_order: 113
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/Script.mdx b/docs/content/docs/modules/Script.mdx
similarity index 99%
rename from docs/content/docs/modules/core/Script.mdx
rename to docs/content/docs/modules/Script.mdx
index ff88850b..5a5a5b28 100644
--- a/docs/content/docs/modules/core/Script.mdx
+++ b/docs/content/docs/modules/Script.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/Script.ts
+title: Script.ts
 nav_order: 114
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/ScriptDataHash.mdx b/docs/content/docs/modules/ScriptDataHash.mdx
similarity index 99%
rename from docs/content/docs/modules/core/ScriptDataHash.mdx
rename to docs/content/docs/modules/ScriptDataHash.mdx
index 7b2a3ad3..6b747789 100644
--- a/docs/content/docs/modules/core/ScriptDataHash.mdx
+++ b/docs/content/docs/modules/ScriptDataHash.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/ScriptDataHash.ts
+title: ScriptDataHash.ts
 nav_order: 115
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/ScriptHash.mdx b/docs/content/docs/modules/ScriptHash.mdx
similarity index 99%
rename from docs/content/docs/modules/core/ScriptHash.mdx
rename to docs/content/docs/modules/ScriptHash.mdx
index c2942f6f..353552c1 100644
--- a/docs/content/docs/modules/core/ScriptHash.mdx
+++ b/docs/content/docs/modules/ScriptHash.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/ScriptHash.ts
+title: ScriptHash.ts
 nav_order: 116
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/ScriptRef.mdx b/docs/content/docs/modules/ScriptRef.mdx
similarity index 99%
rename from docs/content/docs/modules/core/ScriptRef.mdx
rename to docs/content/docs/modules/ScriptRef.mdx
index 0f6a80d0..57cef6ad 100644
--- a/docs/content/docs/modules/core/ScriptRef.mdx
+++ b/docs/content/docs/modules/ScriptRef.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/ScriptRef.ts
+title: ScriptRef.ts
 nav_order: 117
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/SingleHostAddr.mdx b/docs/content/docs/modules/SingleHostAddr.mdx
similarity index 99%
rename from docs/content/docs/modules/core/SingleHostAddr.mdx
rename to docs/content/docs/modules/SingleHostAddr.mdx
index b7ffd6ed..e2082f79 100644
--- a/docs/content/docs/modules/core/SingleHostAddr.mdx
+++ b/docs/content/docs/modules/SingleHostAddr.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/SingleHostAddr.ts
-nav_order: 118
+title: SingleHostAddr.ts
+nav_order: 163
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/SingleHostName.mdx b/docs/content/docs/modules/SingleHostName.mdx
similarity index 99%
rename from docs/content/docs/modules/core/SingleHostName.mdx
rename to docs/content/docs/modules/SingleHostName.mdx
index 914196c3..ab4f54ec 100644
--- a/docs/content/docs/modules/core/SingleHostName.mdx
+++ b/docs/content/docs/modules/SingleHostName.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/SingleHostName.ts
-nav_order: 119
+title: SingleHostName.ts
+nav_order: 164
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/StakeReference.mdx b/docs/content/docs/modules/StakeReference.mdx
similarity index 94%
rename from docs/content/docs/modules/core/StakeReference.mdx
rename to docs/content/docs/modules/StakeReference.mdx
index 38d7624a..e14a9cdc 100644
--- a/docs/content/docs/modules/core/StakeReference.mdx
+++ b/docs/content/docs/modules/StakeReference.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/StakeReference.ts
-nav_order: 120
+title: StakeReference.ts
+nav_order: 165
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/TSchema.mdx b/docs/content/docs/modules/TSchema.mdx
similarity index 99%
rename from docs/content/docs/modules/core/TSchema.mdx
rename to docs/content/docs/modules/TSchema.mdx
index dd9cde44..351cda1f 100644
--- a/docs/content/docs/modules/core/TSchema.mdx
+++ b/docs/content/docs/modules/TSchema.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/TSchema.ts
-nav_order: 135
+title: TSchema.ts
+nav_order: 180
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/Text.mdx b/docs/content/docs/modules/Text.mdx
similarity index 98%
rename from docs/content/docs/modules/core/Text.mdx
rename to docs/content/docs/modules/Text.mdx
index c91fca14..d95d0c6d 100644
--- a/docs/content/docs/modules/core/Text.mdx
+++ b/docs/content/docs/modules/Text.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/Text.ts
-nav_order: 121
+title: Text.ts
+nav_order: 166
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/Text128.mdx b/docs/content/docs/modules/Text128.mdx
similarity index 98%
rename from docs/content/docs/modules/core/Text128.mdx
rename to docs/content/docs/modules/Text128.mdx
index 7e16ac46..9fff7a4b 100644
--- a/docs/content/docs/modules/core/Text128.mdx
+++ b/docs/content/docs/modules/Text128.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/Text128.ts
-nav_order: 122
+title: Text128.ts
+nav_order: 167
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/Time/Slot.mdx b/docs/content/docs/modules/Time/Slot.mdx
similarity index 93%
rename from docs/content/docs/modules/core/Time/Slot.mdx
rename to docs/content/docs/modules/Time/Slot.mdx
index ebf32e3c..6fbf5bbe 100644
--- a/docs/content/docs/modules/core/Time/Slot.mdx
+++ b/docs/content/docs/modules/Time/Slot.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/Time/Slot.ts
-nav_order: 123
+title: Time/Slot.ts
+nav_order: 168
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/Time/SlotConfig.mdx b/docs/content/docs/modules/Time/SlotConfig.mdx
similarity index 96%
rename from docs/content/docs/modules/core/Time/SlotConfig.mdx
rename to docs/content/docs/modules/Time/SlotConfig.mdx
index ac3a1354..e8e10783 100644
--- a/docs/content/docs/modules/core/Time/SlotConfig.mdx
+++ b/docs/content/docs/modules/Time/SlotConfig.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/Time/SlotConfig.ts
-nav_order: 124
+title: Time/SlotConfig.ts
+nav_order: 169
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/Time/UnixTime.mdx b/docs/content/docs/modules/Time/UnixTime.mdx
similarity index 97%
rename from docs/content/docs/modules/core/Time/UnixTime.mdx
rename to docs/content/docs/modules/Time/UnixTime.mdx
index 3ad8d92f..0e601c71 100644
--- a/docs/content/docs/modules/core/Time/UnixTime.mdx
+++ b/docs/content/docs/modules/Time/UnixTime.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/Time/UnixTime.ts
-nav_order: 125
+title: Time/UnixTime.ts
+nav_order: 170
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/Transaction.mdx b/docs/content/docs/modules/Transaction.mdx
similarity index 99%
rename from docs/content/docs/modules/core/Transaction.mdx
rename to docs/content/docs/modules/Transaction.mdx
index d79392b2..a2cdf352 100644
--- a/docs/content/docs/modules/core/Transaction.mdx
+++ b/docs/content/docs/modules/Transaction.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/Transaction.ts
-nav_order: 126
+title: Transaction.ts
+nav_order: 171
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/TransactionBody.mdx b/docs/content/docs/modules/TransactionBody.mdx
similarity index 99%
rename from docs/content/docs/modules/core/TransactionBody.mdx
rename to docs/content/docs/modules/TransactionBody.mdx
index 2d83f481..0252715b 100644
--- a/docs/content/docs/modules/core/TransactionBody.mdx
+++ b/docs/content/docs/modules/TransactionBody.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/TransactionBody.ts
-nav_order: 127
+title: TransactionBody.ts
+nav_order: 172
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/TransactionHash.mdx b/docs/content/docs/modules/TransactionHash.mdx
similarity index 98%
rename from docs/content/docs/modules/core/TransactionHash.mdx
rename to docs/content/docs/modules/TransactionHash.mdx
index 68e6cb0e..63bc1271 100644
--- a/docs/content/docs/modules/core/TransactionHash.mdx
+++ b/docs/content/docs/modules/TransactionHash.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/TransactionHash.ts
-nav_order: 128
+title: TransactionHash.ts
+nav_order: 173
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/TransactionIndex.mdx b/docs/content/docs/modules/TransactionIndex.mdx
similarity index 96%
rename from docs/content/docs/modules/core/TransactionIndex.mdx
rename to docs/content/docs/modules/TransactionIndex.mdx
index 32919d4e..d9643c01 100644
--- a/docs/content/docs/modules/core/TransactionIndex.mdx
+++ b/docs/content/docs/modules/TransactionIndex.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/TransactionIndex.ts
-nav_order: 129
+title: TransactionIndex.ts
+nav_order: 174
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/TransactionInput.mdx b/docs/content/docs/modules/TransactionInput.mdx
similarity index 98%
rename from docs/content/docs/modules/core/TransactionInput.mdx
rename to docs/content/docs/modules/TransactionInput.mdx
index 27e79e02..6f957233 100644
--- a/docs/content/docs/modules/core/TransactionInput.mdx
+++ b/docs/content/docs/modules/TransactionInput.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/TransactionInput.ts
-nav_order: 130
+title: TransactionInput.ts
+nav_order: 175
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/TransactionMetadatum.mdx b/docs/content/docs/modules/TransactionMetadatum.mdx
similarity index 99%
rename from docs/content/docs/modules/core/TransactionMetadatum.mdx
rename to docs/content/docs/modules/TransactionMetadatum.mdx
index 507837a3..875ea686 100644
--- a/docs/content/docs/modules/core/TransactionMetadatum.mdx
+++ b/docs/content/docs/modules/TransactionMetadatum.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/TransactionMetadatum.ts
-nav_order: 131
+title: TransactionMetadatum.ts
+nav_order: 176
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/TransactionMetadatumLabels.mdx b/docs/content/docs/modules/TransactionMetadatumLabels.mdx
similarity index 98%
rename from docs/content/docs/modules/core/TransactionMetadatumLabels.mdx
rename to docs/content/docs/modules/TransactionMetadatumLabels.mdx
index a5874b27..6530d177 100644
--- a/docs/content/docs/modules/core/TransactionMetadatumLabels.mdx
+++ b/docs/content/docs/modules/TransactionMetadatumLabels.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/TransactionMetadatumLabels.ts
-nav_order: 132
+title: TransactionMetadatumLabels.ts
+nav_order: 177
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/TransactionOutput.mdx b/docs/content/docs/modules/TransactionOutput.mdx
similarity index 99%
rename from docs/content/docs/modules/core/TransactionOutput.mdx
rename to docs/content/docs/modules/TransactionOutput.mdx
index 40ddbd24..a35dda53 100644
--- a/docs/content/docs/modules/core/TransactionOutput.mdx
+++ b/docs/content/docs/modules/TransactionOutput.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/TransactionOutput.ts
-nav_order: 133
+title: TransactionOutput.ts
+nav_order: 178
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/TransactionWitnessSet.mdx b/docs/content/docs/modules/TransactionWitnessSet.mdx
similarity index 99%
rename from docs/content/docs/modules/core/TransactionWitnessSet.mdx
rename to docs/content/docs/modules/TransactionWitnessSet.mdx
index debdaa77..9823ad9e 100644
--- a/docs/content/docs/modules/core/TransactionWitnessSet.mdx
+++ b/docs/content/docs/modules/TransactionWitnessSet.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/TransactionWitnessSet.ts
-nav_order: 134
+title: TransactionWitnessSet.ts
+nav_order: 179
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/TxOut.mdx b/docs/content/docs/modules/TxOut.mdx
similarity index 99%
rename from docs/content/docs/modules/core/TxOut.mdx
rename to docs/content/docs/modules/TxOut.mdx
index 515e77f0..46485d58 100644
--- a/docs/content/docs/modules/core/TxOut.mdx
+++ b/docs/content/docs/modules/TxOut.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/TxOut.ts
-nav_order: 136
+title: TxOut.ts
+nav_order: 181
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/UTxO.mdx b/docs/content/docs/modules/UTxO.mdx
similarity index 65%
rename from docs/content/docs/modules/core/UTxO.mdx
rename to docs/content/docs/modules/UTxO.mdx
index 951333b8..8d587208 100644
--- a/docs/content/docs/modules/core/UTxO.mdx
+++ b/docs/content/docs/modules/UTxO.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/UTxO.ts
-nav_order: 140
+title: UTxO.ts
+nav_order: 188
 parent: Modules
 ---
 
@@ -21,15 +21,7 @@ parent: Modules
   - [empty](#empty)
   - [fromIterable](#fromiterable)
 - [conversions](#conversions)
-  - [datumOptionFromSDK](#datumoptionfromsdk)
-  - [datumOptionToSDK](#datumoptiontosdk)
-  - [fromSDK](#fromsdk)
-  - [fromSDKArray](#fromsdkarray)
-  - [scriptFromSDK](#scriptfromsdk)
-  - [scriptToSDK](#scripttosdk)
   - [toArray](#toarray)
-  - [toSDK](#tosdk)
-  - [toSDKArray](#tosdkarray)
 - [getters](#getters)
   - [size](#size)
   - [toOutRefString](#tooutrefstring)
@@ -150,88 +142,6 @@ Added in v2.0.0
 
 # conversions
 
-## datumOptionFromSDK
-
-Convert SDK DatumOption to Core DatumOption.
-
-**Signature**
-
-```ts
-export declare const datumOptionFromSDK: (
-  datum: SDKDatum.Datum
-) => Effect.Effect<DatumOption.DatumOption, ParseResult.ParseError>
-```
-
-Added in v2.0.0
-
-## datumOptionToSDK
-
-Convert Core DatumOption to SDK Datum.
-
-**Signature**
-
-```ts
-export declare const datumOptionToSDK: (datumOption: DatumOption.DatumOption) => SDKDatum.Datum
-```
-
-Added in v2.0.0
-
-## fromSDK
-
-Convert SDK UTxO to Core UTxO.
-
-**Signature**
-
-```ts
-export declare const fromSDK: (
-  utxo: SDKUTxO.UTxO,
-  toCoreAssets: (assets: SDKAssets.Assets) => Assets.Assets
-) => Effect.Effect<UTxO, ParseResult.ParseError>
-```
-
-Added in v2.0.0
-
-## fromSDKArray
-
-Convert an array of SDK UTxOs to a Core UTxOSet.
-
-**Signature**
-
-```ts
-export declare const fromSDKArray: (
-  utxos: ReadonlyArray<SDKUTxO.UTxO>,
-  toCoreAssets: (assets: SDKAssets.Assets) => Assets.Assets
-) => Effect.Effect<UTxOSet, ParseResult.ParseError>
-```
-
-Added in v2.0.0
-
-## scriptFromSDK
-
-Convert SDK Script to Core Script.
-
-**Signature**
-
-```ts
-export declare const scriptFromSDK: (
-  sdkScript: SDKScript.Script
-) => Effect.Effect<Script.Script, ParseResult.ParseError>
-```
-
-Added in v2.0.0
-
-## scriptToSDK
-
-Convert Core Script to SDK Script.
-
-**Signature**
-
-```ts
-export declare const scriptToSDK: (script: Script.Script) => SDKScript.Script
-```
-
-Added in v2.0.0
-
 ## toArray
 
 Convert a UTxO set to an array.
@@ -244,33 +154,6 @@ export declare const toArray: (set: UTxOSet) => Array<UTxO>
 
 Added in v2.0.0
 
-## toSDK
-
-Convert Core UTxO to SDK UTxO.
-
-**Signature**
-
-```ts
-export declare const toSDK: (utxo: UTxO, fromCoreAssets: (assets: Assets.Assets) => SDKAssets.Assets) => SDKUTxO.UTxO
-```
-
-Added in v2.0.0
-
-## toSDKArray
-
-Convert a Core UTxOSet to an array of SDK UTxOs.
-
-**Signature**
-
-```ts
-export declare const toSDKArray: (
-  set: UTxOSet,
-  fromCoreAssets: (assets: Assets.Assets) => SDKAssets.Assets
-) => Array<SDKUTxO.UTxO>
-```
-
-Added in v2.0.0
-
 # getters
 
 ## size
diff --git a/docs/content/docs/modules/core/UnitInterval.mdx b/docs/content/docs/modules/UnitInterval.mdx
similarity index 99%
rename from docs/content/docs/modules/core/UnitInterval.mdx
rename to docs/content/docs/modules/UnitInterval.mdx
index e2082aa4..dc398cfc 100644
--- a/docs/content/docs/modules/core/UnitInterval.mdx
+++ b/docs/content/docs/modules/UnitInterval.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/UnitInterval.ts
-nav_order: 137
+title: UnitInterval.ts
+nav_order: 182
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/Url.mdx b/docs/content/docs/modules/Url.mdx
similarity index 98%
rename from docs/content/docs/modules/core/Url.mdx
rename to docs/content/docs/modules/Url.mdx
index f92d6e22..79ee8944 100644
--- a/docs/content/docs/modules/core/Url.mdx
+++ b/docs/content/docs/modules/Url.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/Url.ts
-nav_order: 139
+title: Url.ts
+nav_order: 184
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/VKey.mdx b/docs/content/docs/modules/VKey.mdx
similarity index 99%
rename from docs/content/docs/modules/core/VKey.mdx
rename to docs/content/docs/modules/VKey.mdx
index c4b5139d..96efa281 100644
--- a/docs/content/docs/modules/core/VKey.mdx
+++ b/docs/content/docs/modules/VKey.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/VKey.ts
-nav_order: 142
+title: VKey.ts
+nav_order: 190
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/Value.mdx b/docs/content/docs/modules/Value.mdx
similarity index 99%
rename from docs/content/docs/modules/core/Value.mdx
rename to docs/content/docs/modules/Value.mdx
index 9f775ec7..a7a131c6 100644
--- a/docs/content/docs/modules/core/Value.mdx
+++ b/docs/content/docs/modules/Value.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/Value.ts
-nav_order: 141
+title: Value.ts
+nav_order: 189
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/VotingProcedures.mdx b/docs/content/docs/modules/VotingProcedures.mdx
similarity index 99%
rename from docs/content/docs/modules/core/VotingProcedures.mdx
rename to docs/content/docs/modules/VotingProcedures.mdx
index 580b2d21..490963ec 100644
--- a/docs/content/docs/modules/core/VotingProcedures.mdx
+++ b/docs/content/docs/modules/VotingProcedures.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/VotingProcedures.ts
-nav_order: 143
+title: VotingProcedures.ts
+nav_order: 191
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/VrfCert.mdx b/docs/content/docs/modules/VrfCert.mdx
similarity index 99%
rename from docs/content/docs/modules/core/VrfCert.mdx
rename to docs/content/docs/modules/VrfCert.mdx
index 5eab8267..263dce6f 100644
--- a/docs/content/docs/modules/core/VrfCert.mdx
+++ b/docs/content/docs/modules/VrfCert.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/VrfCert.ts
-nav_order: 144
+title: VrfCert.ts
+nav_order: 192
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/VrfKeyHash.mdx b/docs/content/docs/modules/VrfKeyHash.mdx
similarity index 98%
rename from docs/content/docs/modules/core/VrfKeyHash.mdx
rename to docs/content/docs/modules/VrfKeyHash.mdx
index aaa487ce..23d9d49d 100644
--- a/docs/content/docs/modules/core/VrfKeyHash.mdx
+++ b/docs/content/docs/modules/VrfKeyHash.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/VrfKeyHash.ts
-nav_order: 145
+title: VrfKeyHash.ts
+nav_order: 193
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/VrfVkey.mdx b/docs/content/docs/modules/VrfVkey.mdx
similarity index 98%
rename from docs/content/docs/modules/core/VrfVkey.mdx
rename to docs/content/docs/modules/VrfVkey.mdx
index b78aa09b..6122c198 100644
--- a/docs/content/docs/modules/core/VrfVkey.mdx
+++ b/docs/content/docs/modules/VrfVkey.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/VrfVkey.ts
-nav_order: 146
+title: VrfVkey.ts
+nav_order: 194
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/Withdrawals.mdx b/docs/content/docs/modules/Withdrawals.mdx
similarity index 99%
rename from docs/content/docs/modules/core/Withdrawals.mdx
rename to docs/content/docs/modules/Withdrawals.mdx
index dff48af5..b8de7db3 100644
--- a/docs/content/docs/modules/core/Withdrawals.mdx
+++ b/docs/content/docs/modules/Withdrawals.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/Withdrawals.ts
-nav_order: 147
+title: Withdrawals.ts
+nav_order: 195
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/_meta.json b/docs/content/docs/modules/_meta.json
index 9e26dfee..b77123f5 100644
--- a/docs/content/docs/modules/_meta.json
+++ b/docs/content/docs/modules/_meta.json
@@ -1 +1,128 @@
-{}
\ No newline at end of file
+{
+  "Address": "Address",
+  "AddressEras": "AddressEras",
+  "AddressTag": "AddressTag",
+  "Anchor": "Anchor",
+  "AssetName": "AssetName",
+  "AuxiliaryData": "AuxiliaryData",
+  "AuxiliaryDataHash": "AuxiliaryDataHash",
+  "BaseAddress": "BaseAddress",
+  "Bech32": "Bech32",
+  "BigInt": "BigInt",
+  "Bip32PrivateKey": "Bip32PrivateKey",
+  "Bip32PublicKey": "Bip32PublicKey",
+  "Block": "Block",
+  "BlockBodyHash": "BlockBodyHash",
+  "BlockHeaderHash": "BlockHeaderHash",
+  "BootstrapWitness": "BootstrapWitness",
+  "BoundedBytes": "BoundedBytes",
+  "ByronAddress": "ByronAddress",
+  "Bytes": "Bytes",
+  "Bytes128": "Bytes128",
+  "Bytes16": "Bytes16",
+  "Bytes29": "Bytes29",
+  "Bytes32": "Bytes32",
+  "Bytes4": "Bytes4",
+  "Bytes448": "Bytes448",
+  "Bytes57": "Bytes57",
+  "Bytes64": "Bytes64",
+  "Bytes80": "Bytes80",
+  "Bytes96": "Bytes96",
+  "CBOR": "CBOR",
+  "Certificate": "Certificate",
+  "Codec": "Codec",
+  "Coin": "Coin",
+  "Combinator": "Combinator",
+  "CommitteeColdCredential": "CommitteeColdCredential",
+  "CommitteeHotCredential": "CommitteeHotCredential",
+  "Constitution": "Constitution",
+  "CostModel": "CostModel",
+  "Credential": "Credential",
+  "DRep": "DRep",
+  "DRepCredential": "DRepCredential",
+  "Data": "Data",
+  "DataJson": "DataJson",
+  "DatumOption": "DatumOption",
+  "DnsName": "DnsName",
+  "Ed25519Signature": "Ed25519Signature",
+  "EnterpriseAddress": "EnterpriseAddress",
+  "EpochNo": "EpochNo",
+  "FormatError": "FormatError",
+  "Function": "Function",
+  "GovernanceAction": "GovernanceAction",
+  "Hash28": "Hash28",
+  "Header": "Header",
+  "HeaderBody": "HeaderBody",
+  "IPv4": "IPv4",
+  "IPv6": "IPv6",
+  "KESVkey": "KESVkey",
+  "KesSignature": "KesSignature",
+  "KeyHash": "KeyHash",
+  "Language": "Language",
+  "Metadata": "Metadata",
+  "Mint": "Mint",
+  "MultiAsset": "MultiAsset",
+  "MultiHostName": "MultiHostName",
+  "NativeScriptJSON": "NativeScriptJSON",
+  "NativeScripts": "NativeScripts",
+  "NativeScriptsOLD": "NativeScriptsOLD",
+  "Natural": "Natural",
+  "Network": "Network",
+  "NetworkId": "NetworkId",
+  "NonZeroInt64": "NonZeroInt64",
+  "NonnegativeInterval": "NonnegativeInterval",
+  "Numeric": "Numeric",
+  "OperationalCert": "OperationalCert",
+  "PaymentAddress": "PaymentAddress",
+  "PlutusV1": "PlutusV1",
+  "PlutusV2": "PlutusV2",
+  "PlutusV3": "PlutusV3",
+  "Pointer": "Pointer",
+  "PointerAddress": "PointerAddress",
+  "PolicyId": "PolicyId",
+  "PoolKeyHash": "PoolKeyHash",
+  "PoolMetadata": "PoolMetadata",
+  "PoolParams": "PoolParams",
+  "Port": "Port",
+  "PositiveCoin": "PositiveCoin",
+  "PrivateKey": "PrivateKey",
+  "ProposalProcedure": "ProposalProcedure",
+  "ProposalProcedures": "ProposalProcedures",
+  "ProtocolParamUpdate": "ProtocolParamUpdate",
+  "ProtocolVersion": "ProtocolVersion",
+  "Redeemer": "Redeemer",
+  "Redeemers": "Redeemers",
+  "Relay": "Relay",
+  "RewardAccount": "RewardAccount",
+  "RewardAddress": "RewardAddress",
+  "Script": "Script",
+  "ScriptDataHash": "ScriptDataHash",
+  "ScriptHash": "ScriptHash",
+  "ScriptRef": "ScriptRef",
+  "SingleHostAddr": "SingleHostAddr",
+  "SingleHostName": "SingleHostName",
+  "StakeReference": "StakeReference",
+  "TSchema": "TSchema",
+  "Text": "Text",
+  "Text128": "Text128",
+  "Transaction": "Transaction",
+  "TransactionBody": "TransactionBody",
+  "TransactionHash": "TransactionHash",
+  "TransactionIndex": "TransactionIndex",
+  "TransactionInput": "TransactionInput",
+  "TransactionMetadatum": "TransactionMetadatum",
+  "TransactionMetadatumLabels": "TransactionMetadatumLabels",
+  "TransactionOutput": "TransactionOutput",
+  "TransactionWitnessSet": "TransactionWitnessSet",
+  "TxOut": "TxOut",
+  "UTxO": "UTxO",
+  "UnitInterval": "UnitInterval",
+  "Url": "Url",
+  "VKey": "VKey",
+  "Value": "Value",
+  "VotingProcedures": "VotingProcedures",
+  "VrfCert": "VrfCert",
+  "VrfKeyHash": "VrfKeyHash",
+  "VrfVkey": "VrfVkey",
+  "Withdrawals": "Withdrawals"
+}
\ No newline at end of file
diff --git a/docs/content/docs/modules/blueprint/codegen-config.mdx b/docs/content/docs/modules/blueprint/codegen-config.mdx
index 31e0aab0..6aa7e3b2 100644
--- a/docs/content/docs/modules/blueprint/codegen-config.mdx
+++ b/docs/content/docs/modules/blueprint/codegen-config.mdx
@@ -1,6 +1,6 @@
 ---
 title: blueprint/codegen-config.ts
-nav_order: 1
+nav_order: 18
 parent: Modules
 ---
 
@@ -107,7 +107,7 @@ export interface CodegenConfig {
 
   /**
    * Explicit import lines for Data, TSchema, and effect modules
-   * e.g. data: 'import { Data } from "@evolution-sdk/evolution/core/Data"'
+   * e.g. data: 'import { Data } from "@evolution-sdk/evolution/Data"'
    */
   imports: {
     data: string
diff --git a/docs/content/docs/modules/blueprint/codegen.mdx b/docs/content/docs/modules/blueprint/codegen.mdx
index 0c6a3f39..0543952d 100644
--- a/docs/content/docs/modules/blueprint/codegen.mdx
+++ b/docs/content/docs/modules/blueprint/codegen.mdx
@@ -1,6 +1,6 @@
 ---
 title: blueprint/codegen.ts
-nav_order: 2
+nav_order: 19
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/blueprint/types.mdx b/docs/content/docs/modules/blueprint/types.mdx
index 6f594c5d..8c5e07f8 100644
--- a/docs/content/docs/modules/blueprint/types.mdx
+++ b/docs/content/docs/modules/blueprint/types.mdx
@@ -1,6 +1,6 @@
 ---
 title: blueprint/types.ts
-nav_order: 3
+nav_order: 20
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/core/message-signing/CoseKey.mdx b/docs/content/docs/modules/message-signing/CoseKey.mdx
similarity index 98%
rename from docs/content/docs/modules/core/message-signing/CoseKey.mdx
rename to docs/content/docs/modules/message-signing/CoseKey.mdx
index 7cb572a1..c3c10976 100644
--- a/docs/content/docs/modules/core/message-signing/CoseKey.mdx
+++ b/docs/content/docs/modules/message-signing/CoseKey.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/message-signing/CoseKey.ts
+title: message-signing/CoseKey.ts
 nav_order: 66
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/message-signing/CoseSign.mdx b/docs/content/docs/modules/message-signing/CoseSign.mdx
similarity index 99%
rename from docs/content/docs/modules/core/message-signing/CoseSign.mdx
rename to docs/content/docs/modules/message-signing/CoseSign.mdx
index b1e8b8b6..62d7cc9b 100644
--- a/docs/content/docs/modules/core/message-signing/CoseSign.mdx
+++ b/docs/content/docs/modules/message-signing/CoseSign.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/message-signing/CoseSign.ts
+title: message-signing/CoseSign.ts
 nav_order: 67
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/message-signing/CoseSign1.mdx b/docs/content/docs/modules/message-signing/CoseSign1.mdx
similarity index 99%
rename from docs/content/docs/modules/core/message-signing/CoseSign1.mdx
rename to docs/content/docs/modules/message-signing/CoseSign1.mdx
index 11ff6ce4..4b54dd53 100644
--- a/docs/content/docs/modules/core/message-signing/CoseSign1.mdx
+++ b/docs/content/docs/modules/message-signing/CoseSign1.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/message-signing/CoseSign1.ts
+title: message-signing/CoseSign1.ts
 nav_order: 68
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/message-signing/Header.mdx b/docs/content/docs/modules/message-signing/Header.mdx
similarity index 99%
rename from docs/content/docs/modules/core/message-signing/Header.mdx
rename to docs/content/docs/modules/message-signing/Header.mdx
index 422305d8..073cb1a3 100644
--- a/docs/content/docs/modules/core/message-signing/Header.mdx
+++ b/docs/content/docs/modules/message-signing/Header.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/message-signing/Header.ts
+title: message-signing/Header.ts
 nav_order: 69
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/message-signing/Label.mdx b/docs/content/docs/modules/message-signing/Label.mdx
similarity index 98%
rename from docs/content/docs/modules/core/message-signing/Label.mdx
rename to docs/content/docs/modules/message-signing/Label.mdx
index 52f82e7e..58c5185e 100644
--- a/docs/content/docs/modules/core/message-signing/Label.mdx
+++ b/docs/content/docs/modules/message-signing/Label.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/message-signing/Label.ts
+title: message-signing/Label.ts
 nav_order: 70
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/message-signing/SignData.mdx b/docs/content/docs/modules/message-signing/SignData.mdx
similarity index 97%
rename from docs/content/docs/modules/core/message-signing/SignData.mdx
rename to docs/content/docs/modules/message-signing/SignData.mdx
index 9318b85b..86f3a8af 100644
--- a/docs/content/docs/modules/core/message-signing/SignData.mdx
+++ b/docs/content/docs/modules/message-signing/SignData.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/message-signing/SignData.ts
+title: message-signing/SignData.ts
 nav_order: 71
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/message-signing/Utils.mdx b/docs/content/docs/modules/message-signing/Utils.mdx
similarity index 97%
rename from docs/content/docs/modules/core/message-signing/Utils.mdx
rename to docs/content/docs/modules/message-signing/Utils.mdx
index 4c18ad30..b20b63ec 100644
--- a/docs/content/docs/modules/core/message-signing/Utils.mdx
+++ b/docs/content/docs/modules/message-signing/Utils.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/message-signing/Utils.ts
+title: message-signing/Utils.ts
 nav_order: 72
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/plutus/Address.mdx b/docs/content/docs/modules/plutus/Address.mdx
similarity index 99%
rename from docs/content/docs/modules/core/plutus/Address.mdx
rename to docs/content/docs/modules/plutus/Address.mdx
index f3ff33fe..8478aec8 100644
--- a/docs/content/docs/modules/core/plutus/Address.mdx
+++ b/docs/content/docs/modules/plutus/Address.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/plutus/Address.ts
+title: plutus/Address.ts
 nav_order: 88
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/plutus/CIP68Metadata.mdx b/docs/content/docs/modules/plutus/CIP68Metadata.mdx
similarity index 98%
rename from docs/content/docs/modules/core/plutus/CIP68Metadata.mdx
rename to docs/content/docs/modules/plutus/CIP68Metadata.mdx
index c5586067..1045ac68 100644
--- a/docs/content/docs/modules/core/plutus/CIP68Metadata.mdx
+++ b/docs/content/docs/modules/plutus/CIP68Metadata.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/plutus/CIP68Metadata.ts
+title: plutus/CIP68Metadata.ts
 nav_order: 89
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/plutus/Credential.mdx b/docs/content/docs/modules/plutus/Credential.mdx
similarity index 99%
rename from docs/content/docs/modules/core/plutus/Credential.mdx
rename to docs/content/docs/modules/plutus/Credential.mdx
index 0ab35682..358050d1 100644
--- a/docs/content/docs/modules/core/plutus/Credential.mdx
+++ b/docs/content/docs/modules/plutus/Credential.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/plutus/Credential.ts
+title: plutus/Credential.ts
 nav_order: 90
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/plutus/OutputReference.mdx b/docs/content/docs/modules/plutus/OutputReference.mdx
similarity index 98%
rename from docs/content/docs/modules/core/plutus/OutputReference.mdx
rename to docs/content/docs/modules/plutus/OutputReference.mdx
index 34fcb8b2..b3984d44 100644
--- a/docs/content/docs/modules/core/plutus/OutputReference.mdx
+++ b/docs/content/docs/modules/plutus/OutputReference.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/plutus/OutputReference.ts
+title: plutus/OutputReference.ts
 nav_order: 91
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/core/plutus/Value.mdx b/docs/content/docs/modules/plutus/Value.mdx
similarity index 99%
rename from docs/content/docs/modules/core/plutus/Value.mdx
rename to docs/content/docs/modules/plutus/Value.mdx
index 8bc8039b..f3847740 100644
--- a/docs/content/docs/modules/core/plutus/Value.mdx
+++ b/docs/content/docs/modules/plutus/Value.mdx
@@ -1,5 +1,5 @@
 ---
-title: core/plutus/Value.ts
+title: plutus/Value.ts
 nav_order: 92
 parent: Modules
 ---
diff --git a/docs/content/docs/modules/sdk/Address.mdx b/docs/content/docs/modules/sdk/Address.mdx
deleted file mode 100644
index 3ce73f9c..00000000
--- a/docs/content/docs/modules/sdk/Address.mdx
+++ /dev/null
@@ -1,48 +0,0 @@
----
-title: sdk/Address.ts
-nav_order: 148
-parent: Modules
----
-
-## Address overview
-
-SDK Address module - user-friendly Bech32 string representation
-
-Added in v2.0.0
-
----
-
-<h2 className="text-delta">Table of contents</h2>
-
-- [utils](#utils)
-  - [Address (type alias)](#address-type-alias)
-  - [fromCoreAddress](#fromcoreaddress)
-  - [toCoreAddress](#tocoreaddress)
-
----
-
-# utils
-
-## Address (type alias)
-
-**Signature**
-
-```ts
-export type Address = string
-```
-
-## fromCoreAddress
-
-**Signature**
-
-```ts
-export declare const fromCoreAddress: (a: CoreAddress.Address, overrideOptions?: ParseOptions) => string
-```
-
-## toCoreAddress
-
-**Signature**
-
-```ts
-export declare const toCoreAddress: (i: string, overrideOptions?: ParseOptions) => CoreAddress.Address
-```
diff --git a/docs/content/docs/modules/sdk/AddressDetails.mdx b/docs/content/docs/modules/sdk/AddressDetails.mdx
deleted file mode 100644
index f5eec228..00000000
--- a/docs/content/docs/modules/sdk/AddressDetails.mdx
+++ /dev/null
@@ -1,134 +0,0 @@
----
-title: sdk/AddressDetails.ts
-nav_order: 149
-parent: Modules
----
-
-## AddressDetails overview
-
----
-
-<h2 className="text-delta">Table of contents</h2>
-
-- [encoding](#encoding)
-  - [toBech32](#tobech32)
-  - [toHex](#tohex)
-- [equality](#equality)
-  - [equals](#equals)
-- [parsing](#parsing)
-  - [fromBech32](#frombech32)
-  - [fromHex](#fromhex)
-- [schemas](#schemas)
-  - [AddressDetails (class)](#addressdetails-class)
-- [utils](#utils)
-  - [FromBech32](#frombech32-1)
-  - [FromHex](#fromhex-1)
-
----
-
-# encoding
-
-## toBech32
-
-Convert AddressDetails to Bech32 string.
-
-**Signature**
-
-```ts
-export declare const toBech32: (a: AddressDetails, overrideOptions?: ParseOptions) => string
-```
-
-Added in v2.0.0
-
-## toHex
-
-Convert AddressDetails to hex string.
-
-**Signature**
-
-```ts
-export declare const toHex: (a: AddressDetails, overrideOptions?: ParseOptions) => string
-```
-
-Added in v2.0.0
-
-# equality
-
-## equals
-
-Check if two AddressDetails instances are equal.
-
-**Signature**
-
-```ts
-export declare const equals: (self: AddressDetails, that: AddressDetails) => boolean
-```
-
-Added in v2.0.0
-
-# parsing
-
-## fromBech32
-
-Parse AddressDetails from Bech32 string.
-
-**Signature**
-
-```ts
-export declare const fromBech32: (i: string, overrideOptions?: ParseOptions) => AddressDetails
-```
-
-Added in v2.0.0
-
-## fromHex
-
-Parse AddressDetails from hex string.
-
-**Signature**
-
-```ts
-export declare const fromHex: (i: string, overrideOptions?: ParseOptions) => AddressDetails
-```
-
-Added in v2.0.0
-
-# schemas
-
-## AddressDetails (class)
-
-Schema for AddressDetails representing extended address information.
-Contains the address structure and its serialized representations
-
-**Signature**
-
-```ts
-export declare class AddressDetails
-```
-
-Added in v2.0.0
-
-# utils
-
-## FromBech32
-
-**Signature**
-
-```ts
-export declare const FromBech32: Schema.transformOrFail<
-  typeof Schema.String,
-  Schema.SchemaClass<AddressDetails, AddressDetails, never>,
-  never
->
-```
-
-## FromHex
-
-**Signature**
-
-```ts
-export declare const FromHex: Schema.transformOrFail<
-  typeof Schema.String,
-  Schema.SchemaClass<AddressDetails, AddressDetails, never>,
-  never
->
-```
diff --git a/docs/content/docs/modules/sdk/Assets.mdx b/docs/content/docs/modules/sdk/Assets.mdx
deleted file mode 100644
index 09d046af..00000000
--- a/docs/content/docs/modules/sdk/Assets.mdx
+++ /dev/null
@@ -1,364 +0,0 @@
----
-title: sdk/Assets.ts
-nav_order: 150
-parent: Modules
----
-
-## Assets overview
-
----
-
-<h2 className="text-delta">Table of contents</h2>
-
-- [conversion](#conversion)
-  - [fromCoreAssets](#fromcoreassets)
-  - [fromCoreAssetsSchema](#fromcoreassetsschema)
-  - [fromMint](#frommint)
-  - [toCoreAssets](#tocoreassets)
-  - [toCoreAssetsSchema](#tocoreassetsschema)
-  - [toMint](#tomint)
-- [helpers](#helpers)
-  - [addLovelace](#addlovelace)
-  - [getLovelace](#getlovelace)
-  - [setLovelace](#setlovelace)
-  - [subtractLovelace](#subtractlovelace)
-- [schemas](#schemas)
-  - [CoreAssetsFromAssets](#coreassetsfromassets)
-  - [MintFromAssets](#mintfromassets)
-- [utils](#utils)
-  - [Assets (type alias)](#assets-type-alias)
-  - [AssetsSchema](#assetsschema)
-  - [add](#add)
-  - [empty](#empty)
-  - [filter](#filter)
-  - [fromLovelace](#fromlovelace)
-  - [getAsset](#getasset)
-  - [getUnits](#getunits)
-  - [hasAsset](#hasasset)
-  - [isEmpty](#isempty)
-  - [make](#make)
-  - [merge](#merge)
-  - [multiply](#multiply)
-  - [negate](#negate)
-  - [sortCanonical](#sortcanonical)
-  - [subtract](#subtract)
-
----
-
-# conversion
-
-## fromCoreAssets
-
-Convert core Assets (lovelace + optional MultiAsset) to SDK Assets format.
-
-**Signature**
-
-```ts
-export declare const fromCoreAssets: (coreAssets: CoreAssets.Assets) => Assets
-```
-
-Added in v2.0.0
-
-## fromCoreAssetsSchema
-
-Convert Core Assets to SDK Assets format.
-
-**Signature**
-
-```ts
-export declare const fromCoreAssetsSchema: (
-  a: CoreAssets.Assets,
-  overrideOptions?: ParseOptions
-) => { readonly lovelace?: string | undefined } & { readonly [x: string]: string }
-```
-
-Added in v2.0.0
-
-## fromMint
-
-Convert Core Mint to SDK Assets format (without lovelace).
-
-**Signature**
-
-```ts
-export declare const fromMint: (
-  a: CoreMint.Mint,
-  overrideOptions?: ParseOptions
-) => { readonly lovelace?: string | undefined } & { readonly [x: string]: string }
-```
-
-Added in v2.0.0
-
-## toCoreAssets
-
-Convert SDK Assets format to core Assets (lovelace + optional MultiAsset).
-
-**Signature**
-
-```ts
-export declare const toCoreAssets: (assets: Assets) => CoreAssets.Assets
-```
-
-Added in v2.0.0
-
-## toCoreAssetsSchema
-
-Convert SDK Assets to Core Assets.
-
-**Signature**
-
-```ts
-export declare const toCoreAssetsSchema: (
-  i: { readonly lovelace?: string | undefined } & { readonly [x: string]: string },
-  overrideOptions?: ParseOptions
-) => CoreAssets.Assets
-```
-
-Added in v2.0.0
-
-## toMint
-
-Convert SDK Assets to Core Mint (lovelace key will be rejected).
-
-**Signature**
-
-```ts
-export declare const toMint: (
-  i: { readonly lovelace?: string | undefined } & { readonly [x: string]: string },
-  overrideOptions?: ParseOptions
-) => CoreMint.Mint
-```
-
-Added in v2.0.0
-
-# helpers
-
-## addLovelace
-
-Add a lovelace amount to Assets.
-
-**Signature**
-
-```ts
-export declare const addLovelace: (assets: Assets, amount: bigint) => Assets
-```
-
-Added in v2.0.0
-
-## getLovelace
-
-Get the lovelace amount from Assets, defaulting to 0n if undefined.
-
-**Signature**
-
-```ts
-export declare const getLovelace: (assets: Assets) => bigint
-```
-
-Added in v2.0.0
-
-## setLovelace
-
-Set the lovelace amount in Assets.
-
-**Signature**
-
-```ts
-export declare const setLovelace: (assets: Assets, amount: bigint) => Assets
-```
-
-Added in v2.0.0
-
-## subtractLovelace
-
-Subtract a lovelace amount from Assets.
-
-**Signature**
-
-```ts
-export declare const subtractLovelace: (assets: Assets, amount: bigint) => Assets
-```
-
-Added in v2.0.0
-
-# schemas
-
-## CoreAssetsFromAssets
-
-Transform between Assets (SDK-friendly) and core Assets.
-
-**Signature**
-
-```ts
-export declare const CoreAssetsFromAssets: Schema.transformOrFail<
-  Schema.extend<
-    Schema.Struct<{ lovelace: Schema.optional<typeof Schema.BigInt> }>,
-    Schema.Record$<typeof Schema.String, typeof Schema.BigInt>
-  >,
-  Schema.SchemaClass<CoreAssets.Assets, CoreAssets.Assets, never>,
-  never
->
-```
-
-Added in v2.0.0
-
-## MintFromAssets
-
-Transform between Assets (SDK-friendly) and Mint (Core).
-
-**Signature**
-
-```ts
-export declare const MintFromAssets: Schema.transformOrFail<
-  Schema.extend<
-    Schema.Struct<{ lovelace: Schema.optional<typeof Schema.BigInt> }>,
-    Schema.Record$<typeof Schema.String, typeof Schema.BigInt>
-  >,
-  Schema.SchemaClass<CoreMint.Mint, CoreMint.Mint, never>,
-  never
->
-```
-
-Added in v2.0.0
-
-# utils
-
-## Assets (type alias)
-
-**Signature**
-
-```ts
-export type Assets = typeof AssetsSchema.Type
-```
-
-## AssetsSchema
-
-**Signature**
-
-```ts
-export declare const AssetsSchema: Schema.extend<
-  Schema.Struct<{ lovelace: Schema.optional<typeof Schema.BigInt> }>,
-  Schema.Record$<typeof Schema.String, typeof Schema.BigInt>
->
-```
-
-## add
-
-**Signature**
-
-```ts
-export declare const add: (a: Assets, b: Assets) => Assets
-```
-
-## empty
-
-**Signature**
-
-```ts
-export declare const empty: () => Assets
-```
-
-## filter
-
-**Signature**
-
-```ts
-export declare const filter: (assets: Assets, predicate: (unit: string, amount: bigint) => boolean) => Assets
-```
-
-## fromLovelace
-
-**Signature**
-
-```ts
-export declare const fromLovelace: (lovelace: bigint) => Assets
-```
-
-## getAsset
-
-**Signature**
-
-```ts
-export declare const getAsset: (assets: Assets, unit: string) => bigint
-```
-
-## getUnits
-
-**Signature**
-
-```ts
-export declare const getUnits: (assets: Assets) => Array<string>
-```
-
-## hasAsset
-
-**Signature**
-
-```ts
-export declare const hasAsset: (assets: Assets, unit: string) => boolean
-```
-
-## isEmpty
-
-**Signature**
-
-```ts
-export declare const isEmpty: (assets: Assets) => boolean
-```
-
-## make
-
-**Signature**
-
-```ts
-export declare const make: (lovelace: bigint, tokens?: Record<string, bigint>) => Assets
-```
-
-## merge
-
-**Signature**
-
-```ts
-export declare const merge: (...assets: Array<Assets>) => Assets
-```
-
-## multiply
-
-Multiply all asset amounts by a factor.
-Useful for calculating fees, rewards, or scaling asset amounts.
-
-**Signature**
-
-```ts
-export declare const multiply: (assets: Assets, factor: bigint) => Assets
-```
-
-## negate
-
-Negate all asset amounts.
-Useful for calculating what needs to be subtracted or for representing debts.
-
-**Signature**
-
-```ts
-export declare const negate: (assets: Assets) => Assets
-```
-
-## sortCanonical
-
-Sort assets according to CBOR canonical ordering rules (RFC 7049 section 3.9).
-Lovelace comes first, then assets sorted by policy ID length, then lexicographically.
-
-**Signature**
-
-```ts
-export declare const sortCanonical: (assets: Assets) => Assets
-```
-
-## subtract
-
-**Signature**
-
-```ts
-export declare const subtract: (a: Assets, b: Assets) => Assets
-```
diff --git a/docs/content/docs/modules/sdk/Credential.mdx b/docs/content/docs/modules/sdk/Credential.mdx
deleted file mode 100644
index 582609c7..00000000
--- a/docs/content/docs/modules/sdk/Credential.mdx
+++ /dev/null
@@ -1,68 +0,0 @@
----
-title: sdk/Credential.ts
-nav_order: 187
-parent: Modules
----
-
-## Credential overview
-
----
-
-<h2 className="text-delta">Table of contents</h2>
-
-- [utils](#utils)
-  - [Credential (type alias)](#credential-type-alias)
-  - [KeyHash (type alias)](#keyhash-type-alias)
-  - [ScriptHash (type alias)](#scripthash-type-alias)
-  - [fromCoreCredential](#fromcorecredential)
-  - [toCoreCredential](#tocorecredential)
-
----
-
-# utils
-
-## Credential (type alias)
-
-**Signature**
-
-```ts
-export type Credential = typeof CoreCredential.Credential.Encoded
-```
-
-## KeyHash (type alias)
-
-**Signature**
-
-```ts
-export type KeyHash = typeof CoreKeyHash.KeyHash.Encoded
-```
-
-## ScriptHash (type alias)
-
-**Signature**
-
-```ts
-export type ScriptHash = typeof CoreScriptHash.ScriptHash.Encoded
-```
-
-## fromCoreCredential
-
-**Signature**
-
-```ts
-export declare const fromCoreCredential: (
-  a: CoreKeyHash.KeyHash | CoreScriptHash.ScriptHash,
-  overrideOptions?: ParseOptions
-) => { readonly _tag: "KeyHash"; readonly hash: string } | { readonly _tag: "ScriptHash"; readonly hash: string }
-```
-
-## toCoreCredential
-
-**Signature**
-
-```ts
-export declare const toCoreCredential: (
-  i: { readonly _tag: "KeyHash"; readonly hash: string } | { readonly _tag: "ScriptHash"; readonly hash: string },
-  overrideOptions?: ParseOptions
-) => CoreKeyHash.KeyHash | CoreScriptHash.ScriptHash
-```
diff --git a/docs/content/docs/modules/sdk/Datum.mdx b/docs/content/docs/modules/sdk/Datum.mdx
deleted file mode 100644
index 06865fea..00000000
--- a/docs/content/docs/modules/sdk/Datum.mdx
+++ /dev/null
@@ -1,128 +0,0 @@
----
-title: sdk/Datum.ts
-nav_order: 188
-parent: Modules
----
-
-## Datum overview
-
-Datum types and utilities for handling Cardano transaction data.
-
-This module provides types and functions for working with datum values
-that can be attached to UTxOs in Cardano transactions.
-
----
-
-<h2 className="text-delta">Table of contents</h2>
-
-- [utils](#utils)
-  - [Datum (type alias)](#datum-type-alias)
-  - [equals](#equals)
-  - [filterHashes](#filterhashes)
-  - [filterInline](#filterinline)
-  - [groupByType](#groupbytype)
-  - [isDatumHash](#isdatumhash)
-  - [isInlineDatum](#isinlinedatum)
-  - [makeDatumHash](#makedatumhash)
-  - [makeInlineDatum](#makeinlinedatum)
-  - [unique](#unique)
-
----
-
-# utils
-
-## Datum (type alias)
-
-Datum types and utilities for handling Cardano transaction data.
-
-This module provides types and functions for working with datum values
-that can be attached to UTxOs in Cardano transactions.
-
-**Signature**
-
-```ts
-export type Datum =
-  | {
-      type: "datumHash"
-      hash: string
-    }
-  | {
-      type: "inlineDatum"
-      inline: string
-    }
-```
-
-## equals
-
-**Signature**
-
-```ts
-export declare const equals: (a: Datum, b: Datum) => boolean
-```
-
-## filterHashes
-
-**Signature**
-
-```ts
-export declare const filterHashes: (datums: Array<Datum>) => Array<{ type: "datumHash"; hash: string }>
-```
-
-## filterInline
-
-**Signature**
-
-```ts
-export declare const filterInline: (datums: Array<Datum>) => Array<{ type: "inlineDatum"; inline: string }>
-```
-
-## groupByType
-
-**Signature**
-
-```ts
-export declare const groupByType: (datums: Array<Datum>) => {
-  hashes: Array<{ type: "datumHash"; hash: string }>
-  inline: Array<{ type: "inlineDatum"; inline: string }>
-}
-```
-
-## isDatumHash
-
-**Signature**
-
-```ts
-export declare const isDatumHash: (datum?: Datum) => datum is { type: "datumHash"; hash: string }
-```
-
-## isInlineDatum
-
-**Signature**
-
-```ts
-export declare const isInlineDatum: (datum?: Datum) => datum is { type: "inlineDatum"; inline: string }
-```
-
-## makeDatumHash
-
-**Signature**
-
-```ts
-export declare const makeDatumHash: (hash: string) => Datum
-```
-
-## makeInlineDatum
-
-**Signature**
-
-```ts
-export declare const makeInlineDatum: (inline: string) => Datum
-```
-
-## unique
-
-**Signature**
-
-```ts
-export declare const unique: (datums: Array<Datum>) => Array<Datum>
-```
diff --git a/docs/content/docs/modules/sdk/Delegation.mdx b/docs/content/docs/modules/sdk/Delegation.mdx
deleted file mode 100644
index 795459f9..00000000
--- a/docs/content/docs/modules/sdk/Delegation.mdx
+++ /dev/null
@@ -1,276 +0,0 @@
----
-title: sdk/Delegation.ts
-nav_order: 189
-parent: Modules
----
-
-## Delegation overview
-
-Delegation types and utilities for handling Cardano stake delegation.
-
-This module provides types and functions for working with stake delegation
-information, including pool assignments and reward balances.
-
----
-
-<h2 className="text-delta">Table of contents</h2>
-
-- [utils](#utils)
-  - [Delegation (interface)](#delegation-interface)
-  - [addRewards](#addrewards)
-  - [compareByPoolId](#comparebypoolid)
-  - [compareByRewards](#comparebyrewards)
-  - [contains](#contains)
-  - [empty](#empty)
-  - [equals](#equals)
-  - [filterByPool](#filterbypool)
-  - [filterDelegated](#filterdelegated)
-  - [filterUndelegated](#filterundelegated)
-  - [filterWithRewards](#filterwithrewards)
-  - [find](#find)
-  - [findByPool](#findbypool)
-  - [getAverageRewards](#getaveragerewards)
-  - [getMaxRewards](#getmaxrewards)
-  - [getMinRewards](#getminrewards)
-  - [getTotalRewards](#gettotalrewards)
-  - [getUniquePoolIds](#getuniquepoolids)
-  - [groupByPool](#groupbypool)
-  - [hasRewards](#hasrewards)
-  - [hasSamePool](#hassamepool)
-  - [isDelegated](#isdelegated)
-  - [make](#make)
-  - [sortByPoolId](#sortbypoolid)
-  - [sortByRewards](#sortbyrewards)
-  - [subtractRewards](#subtractrewards)
-  - [unique](#unique)
-
----
-
-# utils
-
-## Delegation (interface)
-
-Delegation types and utilities for handling Cardano stake delegation.
-
-This module provides types and functions for working with stake delegation
-information, including pool assignments and reward balances.
-
-**Signature**
-
-```ts
-export interface Delegation {
-  readonly poolId: string | undefined
-  readonly rewards: bigint
-}
-```
-
-## addRewards
-
-**Signature**
-
-```ts
-export declare const addRewards: (delegation: Delegation, additionalRewards: bigint) => Delegation
-```
-
-## compareByPoolId
-
-**Signature**
-
-```ts
-export declare const compareByPoolId: (a: Delegation, b: Delegation) => number
-```
-
-## compareByRewards
-
-**Signature**
-
-```ts
-export declare const compareByRewards: (a: Delegation, b: Delegation) => number
-```
-
-## contains
-
-**Signature**
-
-```ts
-export declare const contains: (delegations: Array<Delegation>, target: Delegation) => boolean
-```
-
-## empty
-
-**Signature**
-
-```ts
-export declare const empty: () => Delegation
-```
-
-## equals
-
-**Signature**
-
-```ts
-export declare const equals: (a: Delegation, b: Delegation) => boolean
-```
-
-## filterByPool
-
-**Signature**
-
-```ts
-export declare const filterByPool: (delegations: Array<Delegation>, poolId: string) => Array<Delegation>
-```
-
-## filterDelegated
-
-**Signature**
-
-```ts
-export declare const filterDelegated: (delegations: Array<Delegation>) => Array<Delegation>
-```
-
-## filterUndelegated
-
-**Signature**
-
-```ts
-export declare const filterUndelegated: (delegations: Array<Delegation>) => Array<Delegation>
-```
-
-## filterWithRewards
-
-**Signature**
-
-```ts
-export declare const filterWithRewards: (delegations: Array<Delegation>) => Array<Delegation>
-```
-
-## find
-
-**Signature**
-
-```ts
-export declare const find: (
-  delegations: Array<Delegation>,
-  predicate: (delegation: Delegation) => boolean
-) => Delegation | undefined
-```
-
-## findByPool
-
-**Signature**
-
-```ts
-export declare const findByPool: (delegations: Array<Delegation>, poolId: string) => Delegation | undefined
-```
-
-## getAverageRewards
-
-**Signature**
-
-```ts
-export declare const getAverageRewards: (delegations: Array<Delegation>) => bigint
-```
-
-## getMaxRewards
-
-**Signature**
-
-```ts
-export declare const getMaxRewards: (delegations: Array<Delegation>) => bigint
-```
-
-## getMinRewards
-
-**Signature**
-
-```ts
-export declare const getMinRewards: (delegations: Array<Delegation>) => bigint
-```
-
-## getTotalRewards
-
-**Signature**
-
-```ts
-export declare const getTotalRewards: (delegations: Array<Delegation>) => bigint
-```
-
-## getUniquePoolIds
-
-**Signature**
-
-```ts
-export declare const getUniquePoolIds: (delegations: Array<Delegation>) => Array<string>
-```
-
-## groupByPool
-
-**Signature**
-
-```ts
-export declare const groupByPool: (delegations: Array<Delegation>) => Record<string, Array<Delegation>>
-```
-
-## hasRewards
-
-**Signature**
-
-```ts
-export declare const hasRewards: (delegation: Delegation) => boolean
-```
-
-## hasSamePool
-
-**Signature**
-
-```ts
-export declare const hasSamePool: (a: Delegation, b: Delegation) => boolean
-```
-
-## isDelegated
-
-**Signature**
-
-```ts
-export declare const isDelegated: (delegation: Delegation) => boolean
-```
-
-## make
-
-**Signature**
-
-```ts
-export declare const make: (poolId: string | undefined, rewards: bigint) => Delegation
-```
-
-## sortByPoolId
-
-**Signature**
-
-```ts
-export declare const sortByPoolId: (delegations: Array<Delegation>) => Array<Delegation>
-```
-
-## sortByRewards
-
-**Signature**
-
-```ts
-export declare const sortByRewards: (delegations: Array<Delegation>, ascending?: boolean) => Array<Delegation>
-```
-
-## subtractRewards
-
-**Signature**
-
-```ts
-export declare const subtractRewards: (delegation: Delegation, rewardsToSubtract: bigint) => Delegation
-```
-
-## unique
-
-**Signature**
-
-```ts
-export declare const unique: (delegations: Array<Delegation>) => Array<Delegation>
-```
diff --git a/docs/content/docs/modules/sdk/EvalRedeemer.mdx b/docs/content/docs/modules/sdk/EvalRedeemer.mdx
index 5c1edf70..47f8007f 100644
--- a/docs/content/docs/modules/sdk/EvalRedeemer.mdx
+++ b/docs/content/docs/modules/sdk/EvalRedeemer.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/EvalRedeemer.ts
-nav_order: 190
+nav_order: 154
 parent: Modules
 ---
 
@@ -12,21 +12,28 @@ parent: Modules
 
 <h2 className="text-delta">Table of contents</h2>
 
-- [utils](#utils)
+- [model](#model)
   - [EvalRedeemer (type alias)](#evalredeemer-type-alias)
 
 ---
 
-# utils
+# model
 
 ## EvalRedeemer (type alias)
 
+Evaluation result for a single redeemer from transaction evaluation.
+
+Uses Core CDDL terminology ("cert"/"reward") for consistency.
+Provider implementations map from their API formats (e.g., Ogmios "publish"/"withdraw").
+
 **Signature**
 
 ```ts
 export type EvalRedeemer = {
-  readonly ex_units: { readonly mem: number; readonly steps: number }
+  readonly ex_units: Redeemer.ExUnits
   readonly redeemer_index: number
-  readonly redeemer_tag: "spend" | "mint" | "publish" | "withdraw" | "vote" | "propose"
+  readonly redeemer_tag: Redeemer.RedeemerTag
 }
 ```
+
+Added in v2.0.0
diff --git a/docs/content/docs/modules/sdk/Network.mdx b/docs/content/docs/modules/sdk/Network.mdx
deleted file mode 100644
index d2657031..00000000
--- a/docs/content/docs/modules/sdk/Network.mdx
+++ /dev/null
@@ -1,13 +0,0 @@
----
-title: sdk/Network.ts
-nav_order: 191
-parent: Modules
----
-
-## Network overview
-
----
-
-<h2 className="text-delta">Table of contents</h2>
-
----
diff --git a/docs/content/docs/modules/sdk/OutRef.mdx b/docs/content/docs/modules/sdk/OutRef.mdx
deleted file mode 100644
index 68617e1c..00000000
--- a/docs/content/docs/modules/sdk/OutRef.mdx
+++ /dev/null
@@ -1,246 +0,0 @@
----
-title: sdk/OutRef.ts
-nav_order: 192
-parent: Modules
----
-
-## OutRef overview
-
-OutRef types and utilities for handling Cardano transaction output references.
-
-This module provides types and functions for working with transaction output references,
-which uniquely identify UTxOs by their transaction hash and output index.
-
----
-
-<h2 className="text-delta">Table of contents</h2>
-
-- [utils](#utils)
-  - [OutRef (interface)](#outref-interface)
-  - [compare](#compare)
-  - [contains](#contains)
-  - [difference](#difference)
-  - [equals](#equals)
-  - [filter](#filter)
-  - [find](#find)
-  - [first](#first)
-  - [fromTxHashAndIndex](#fromtxhashandindex)
-  - [getIndicesForTx](#getindicesfortx)
-  - [getTxHashes](#gettxhashes)
-  - [groupByTxHash](#groupbytxhash)
-  - [intersection](#intersection)
-  - [isEmpty](#isempty)
-  - [last](#last)
-  - [make](#make)
-  - [remove](#remove)
-  - [size](#size)
-  - [sort](#sort)
-  - [sortByIndex](#sortbyindex)
-  - [sortByTxHash](#sortbytxhash)
-  - [toString](#tostring)
-  - [union](#union)
-  - [unique](#unique)
-
----
-
-# utils
-
-## OutRef (interface)
-
-OutRef types and utilities for handling Cardano transaction output references.
-
-This module provides types and functions for working with transaction output references,
-which uniquely identify UTxOs by their transaction hash and output index.
-
-**Signature**
-
-```ts
-export interface OutRef {
-  txHash: string
-  outputIndex: number
-}
-```
-
-## compare
-
-**Signature**
-
-```ts
-export declare const compare: (a: OutRef, b: OutRef) => number
-```
-
-## contains
-
-**Signature**
-
-```ts
-export declare const contains: (outRefs: Array<OutRef>, target: OutRef) => boolean
-```
-
-## difference
-
-**Signature**
-
-```ts
-export declare const difference: (setA: Array<OutRef>, setB: Array<OutRef>) => Array<OutRef>
-```
-
-## equals
-
-**Signature**
-
-```ts
-export declare const equals: (a: OutRef, b: OutRef) => boolean
-```
-
-## filter
-
-**Signature**
-
-```ts
-export declare const filter: (outRefs: Array<OutRef>, predicate: (outRef: OutRef) => boolean) => Array<OutRef>
-```
-
-## find
-
-**Signature**
-
-```ts
-export declare const find: (outRefs: Array<OutRef>, predicate: (outRef: OutRef) => boolean) => OutRef | undefined
-```
-
-## first
-
-**Signature**
-
-```ts
-export declare const first: (outRefs: Array<OutRef>) => OutRef | undefined
-```
-
-## fromTxHashAndIndex
-
-**Signature**
-
-```ts
-export declare const fromTxHashAndIndex: (txHash: string, outputIndex: number) => OutRef
-```
-
-## getIndicesForTx
-
-**Signature**
-
-```ts
-export declare const getIndicesForTx: (outRefs: Array<OutRef>, txHash: string) => Array<number>
-```
-
-## getTxHashes
-
-**Signature**
-
-```ts
-export declare const getTxHashes: (outRefs: Array<OutRef>) => Array<string>
-```
-
-## groupByTxHash
-
-**Signature**
-
-```ts
-export declare const groupByTxHash: (outRefs: Array<OutRef>) => Record<string, Array<OutRef>>
-```
-
-## intersection
-
-**Signature**
-
-```ts
-export declare const intersection: (setA: Array<OutRef>, setB: Array<OutRef>) => Array<OutRef>
-```
-
-## isEmpty
-
-**Signature**
-
-```ts
-export declare const isEmpty: (outRefs: Array<OutRef>) => boolean
-```
-
-## last
-
-**Signature**
-
-```ts
-export declare const last: (outRefs: Array<OutRef>) => OutRef | undefined
-```
-
-## make
-
-**Signature**
-
-```ts
-export declare const make: (txHash: string, outputIndex: number) => OutRef
-```
-
-## remove
-
-**Signature**
-
-```ts
-export declare const remove: (outRefs: Array<OutRef>, target: OutRef) => Array<OutRef>
-```
-
-## size
-
-**Signature**
-
-```ts
-export declare const size: (outRefs: Array<OutRef>) => number
-```
-
-## sort
-
-**Signature**
-
-```ts
-export declare const sort: (outRefs: Array<OutRef>) => Array<OutRef>
-```
-
-## sortByIndex
-
-**Signature**
-
-```ts
-export declare const sortByIndex: (outRefs: Array<OutRef>) => Array<OutRef>
-```
-
-## sortByTxHash
-
-**Signature**
-
-```ts
-export declare const sortByTxHash: (outRefs: Array<OutRef>) => Array<OutRef>
-```
-
-## toString
-
-**Signature**
-
-```ts
-export declare const toString: (outRef: OutRef) => string
-```
-
-## union
-
-**Signature**
-
-```ts
-export declare const union: (setA: Array<OutRef>, setB: Array<OutRef>) => Array<OutRef>
-```
-
-## unique
-
-**Signature**
-
-```ts
-export declare const unique: (outRefs: Array<OutRef>) => Array<OutRef>
-```
diff --git a/docs/content/docs/modules/sdk/PolicyId.mdx b/docs/content/docs/modules/sdk/PolicyId.mdx
deleted file mode 100644
index 47c9c0f0..00000000
--- a/docs/content/docs/modules/sdk/PolicyId.mdx
+++ /dev/null
@@ -1,26 +0,0 @@
----
-title: sdk/PolicyId.ts
-nav_order: 193
-parent: Modules
----
-
-## PolicyId overview
-
----
-
-<h2 className="text-delta">Table of contents</h2>
-
-- [utils](#utils)
-  - [PolicyId (type alias)](#policyid-type-alias)
-
----
-
-# utils
-
-## PolicyId (type alias)
-
-**Signature**
-
-```ts
-export type PolicyId = string
-```
diff --git a/docs/content/docs/modules/sdk/PoolParams.mdx b/docs/content/docs/modules/sdk/PoolParams.mdx
deleted file mode 100644
index 0c9374c3..00000000
--- a/docs/content/docs/modules/sdk/PoolParams.mdx
+++ /dev/null
@@ -1,135 +0,0 @@
----
-title: sdk/PoolParams.ts
-nav_order: 194
-parent: Modules
----
-
-## PoolParams overview
-
-SDK PoolParams module - user-friendly types for pool registration parameters.
-
-Added in v2.0.0
-
----
-
-<h2 className="text-delta">Table of contents</h2>
-
-- [conversions](#conversions)
-  - [fromCore](#fromcore)
-  - [toCore](#tocore)
-- [model](#model)
-  - [PoolParams (type alias)](#poolparams-type-alias)
-
----
-
-# conversions
-
-## fromCore
-
-Convert from Core PoolParams to SDK PoolParams (encode to lightweight form).
-
-**Signature**
-
-```ts
-export declare const fromCore: (
-  a: CorePoolParams.PoolParams,
-  overrideOptions?: ParseOptions
-) => {
-  readonly _tag: "PoolParams"
-  readonly operator: { readonly _tag: "PoolKeyHash"; readonly hash: string }
-  readonly vrfKeyhash: { readonly _tag: "VrfKeyHash"; readonly hash: string }
-  readonly pledge: string
-  readonly cost: string
-  readonly margin: { readonly numerator: string; readonly denominator: string }
-  readonly rewardAccount: {
-    readonly _tag: "RewardAccount"
-    readonly networkId: number
-    readonly stakeCredential:
-      | { readonly _tag: "KeyHash"; readonly hash: string }
-      | { readonly _tag: "ScriptHash"; readonly hash: string }
-  }
-  readonly poolOwners: readonly { readonly _tag: "KeyHash"; readonly hash: string }[]
-  readonly relays: readonly (
-    | {
-        readonly _tag: "SingleHostAddr"
-        readonly port?: string | undefined
-        readonly ipv4?: { readonly _tag: "IPv4"; readonly bytes: string } | undefined
-        readonly ipv6?: { readonly _tag: "IPv6"; readonly bytes: string } | undefined
-      }
-    | { readonly _tag: "SingleHostName"; readonly dnsName: string; readonly port?: string | undefined }
-    | { readonly _tag: "MultiHostName"; readonly dnsName: string }
-  )[]
-  readonly poolMetadata?:
-    | {
-        readonly _tag: "PoolMetadata"
-        readonly hash: any
-        readonly url: { readonly _tag: "Url"; readonly href: string }
-      }
-    | null
-    | undefined
-}
-```
-
-Added in v2.0.0
-
-## toCore
-
-Convert from SDK PoolParams to Core PoolParams (decode to strict form).
-
-**Signature**
-
-```ts
-export declare const toCore: (
-  i: {
-    readonly _tag: "PoolParams"
-    readonly operator: { readonly _tag: "PoolKeyHash"; readonly hash: string }
-    readonly vrfKeyhash: { readonly _tag: "VrfKeyHash"; readonly hash: string }
-    readonly pledge: string
-    readonly cost: string
-    readonly margin: { readonly numerator: string; readonly denominator: string }
-    readonly rewardAccount: {
-      readonly _tag: "RewardAccount"
-      readonly networkId: number
-      readonly stakeCredential:
-        | { readonly _tag: "KeyHash"; readonly hash: string }
-        | { readonly _tag: "ScriptHash"; readonly hash: string }
-    }
-    readonly poolOwners: readonly { readonly _tag: "KeyHash"; readonly hash: string }[]
-    readonly relays: readonly (
-      | {
-          readonly _tag: "SingleHostAddr"
-          readonly port?: string | undefined
-          readonly ipv4?: { readonly _tag: "IPv4"; readonly bytes: string } | undefined
-          readonly ipv6?: { readonly _tag: "IPv6"; readonly bytes: string } | undefined
-        }
-      | { readonly _tag: "SingleHostName"; readonly dnsName: string; readonly port?: string | undefined }
-      | { readonly _tag: "MultiHostName"; readonly dnsName: string }
-    )[]
-    readonly poolMetadata?:
-      | {
-          readonly _tag: "PoolMetadata"
-          readonly hash: any
-          readonly url: { readonly _tag: "Url"; readonly href: string }
-        }
-      | null
-      | undefined
-  },
-  overrideOptions?: ParseOptions
-) => CorePoolParams.PoolParams
-```
-
-Added in v2.0.0
-
-# model
-
-## PoolParams (type alias)
-
-User-friendly pool registration parameters type (lightweight encoded form).
-
-**Signature**
-
-```ts
-export type PoolParams = typeof CorePoolParams.PoolParams.Encoded
-```
-
-Added in v2.0.0
diff --git a/docs/content/docs/modules/sdk/ProtocolParameters.mdx b/docs/content/docs/modules/sdk/ProtocolParameters.mdx
deleted file mode 100644
index 3660bbf7..00000000
--- a/docs/content/docs/modules/sdk/ProtocolParameters.mdx
+++ /dev/null
@@ -1,108 +0,0 @@
----
-title: sdk/ProtocolParameters.ts
-nav_order: 195
-parent: Modules
----
-
-## ProtocolParameters overview
-
-Protocol Parameters types and utilities for Cardano network configuration.
-
-This module provides types and functions for working with Cardano protocol parameters,
-which define the operational rules and limits of the network.
-
----
-
-<h2 className="text-delta">Table of contents</h2>
-
-- [utils](#utils)
-  - [ProtocolParameters (type alias)](#protocolparameters-type-alias)
-  - [calculateMinFee](#calculateminfee)
-  - [calculateUtxoCost](#calculateutxocost)
-  - [getCostModel](#getcostmodel)
-  - [supportsPlutusVersion](#supportsplutusversion)
-
----
-
-# utils
-
-## ProtocolParameters (type alias)
-
-Protocol Parameters types and utilities for Cardano network configuration.
-
-This module provides types and functions for working with Cardano protocol parameters,
-which define the operational rules and limits of the network.
-
-**Signature**
-
-```ts
-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>
-  }
-}
-```
-
-## calculateMinFee
-
-Calculate the minimum fee for a transaction based on protocol parameters.
-
-**Signature**
-
-```ts
-export declare const calculateMinFee: (protocolParams: ProtocolParameters, txSize: number) => bigint
-```
-
-## calculateUtxoCost
-
-Calculate the UTxO cost based on the protocol parameters.
-
-**Signature**
-
-```ts
-export declare const calculateUtxoCost: (protocolParams: ProtocolParameters, utxoSize: number) => bigint
-```
-
-## getCostModel
-
-Get the cost model for a specific Plutus version.
-
-**Signature**
-
-```ts
-export declare const getCostModel: (
-  protocolParams: ProtocolParameters,
-  version: "PlutusV1" | "PlutusV2" | "PlutusV3"
-) => Record<string, number>
-```
-
-## supportsPlutusVersion
-
-Check if the protocol parameters support a specific Plutus version.
-
-**Signature**
-
-```ts
-export declare const supportsPlutusVersion: (
-  protocolParams: ProtocolParameters,
-  version: "PlutusV1" | "PlutusV2" | "PlutusV3"
-) => boolean
-```
diff --git a/docs/content/docs/modules/sdk/Relay.mdx b/docs/content/docs/modules/sdk/Relay.mdx
deleted file mode 100644
index e454db58..00000000
--- a/docs/content/docs/modules/sdk/Relay.mdx
+++ /dev/null
@@ -1,53 +0,0 @@
----
-title: sdk/Relay.ts
-nav_order: 201
-parent: Modules
----
-
-## Relay overview
-
----
-
-<h2 className="text-delta">Table of contents</h2>
-
-- [utils](#utils)
-  - [MultiHostName (type alias)](#multihostname-type-alias)
-  - [Relay (type alias)](#relay-type-alias)
-  - [SingleHostAddr (type alias)](#singlehostaddr-type-alias)
-  - [SingleHostName (type alias)](#singlehostname-type-alias)
-
----
-
-# utils
-
-## MultiHostName (type alias)
-
-**Signature**
-
-```ts
-export type MultiHostName = (typeof CoreRelay.Relay.members)[2]["Encoded"]
-```
-
-## Relay (type alias)
-
-**Signature**
-
-```ts
-export type Relay = typeof CoreRelay.Relay.Encoded
-```
-
-## SingleHostAddr (type alias)
-
-**Signature**
-
-```ts
-export type SingleHostAddr = (typeof CoreRelay.Relay.members)[0]["Encoded"]
-```
-
-## SingleHostName (type alias)
-
-**Signature**
-
-```ts
-export type SingleHostName = (typeof CoreRelay.Relay.members)[1]["Encoded"]
-```
diff --git a/docs/content/docs/modules/sdk/RewardAddress.mdx b/docs/content/docs/modules/sdk/RewardAddress.mdx
deleted file mode 100644
index ab198f1b..00000000
--- a/docs/content/docs/modules/sdk/RewardAddress.mdx
+++ /dev/null
@@ -1,120 +0,0 @@
----
-title: sdk/RewardAddress.ts
-nav_order: 202
-parent: Modules
----
-
-## RewardAddress overview
-
----
-
-<h2 className="text-delta">Table of contents</h2>
-
-- [utils](#utils)
-  - [RewardAddress (type alias)](#rewardaddress-type-alias)
-  - [fromJsonToRewardAccount](#fromjsontorewardaccount)
-  - [fromRewardAccount](#fromrewardaccount)
-  - [fromRewardAccountToJson](#fromrewardaccounttojson)
-  - [jsonToRewardAddress](#jsontorewardaddress)
-  - [rewardAddressToJson](#rewardaddresstojson)
-  - [toRewardAccount](#torewardaccount)
-
----
-
-# utils
-
-## RewardAddress (type alias)
-
-Reward address in bech32 format.
-Mainnet addresses start with "stake1"
-Testnet addresses start with "stake_test1"
-
-**Signature**
-
-```ts
-export type RewardAddress = string
-```
-
-## fromJsonToRewardAccount
-
-**Signature**
-
-```ts
-export declare const fromJsonToRewardAccount: (
-  i: {
-    readonly _tag: "RewardAccount"
-    readonly networkId: number
-    readonly stakeCredential:
-      | { readonly _tag: "KeyHash"; readonly hash: string }
-      | { readonly _tag: "ScriptHash"; readonly hash: string }
-  },
-  overrideOptions?: ParseOptions
-) => CoreRewardAccount.RewardAccount
-```
-
-## fromRewardAccount
-
-**Signature**
-
-```ts
-export declare const fromRewardAccount: (a: CoreRewardAccount.RewardAccount, overrideOptions?: ParseOptions) => string
-```
-
-## fromRewardAccountToJson
-
-**Signature**
-
-```ts
-export declare const fromRewardAccountToJson: (
-  a: CoreRewardAccount.RewardAccount,
-  overrideOptions?: ParseOptions
-) => {
-  readonly _tag: "RewardAccount"
-  readonly networkId: number
-  readonly stakeCredential:
-    | { readonly _tag: "KeyHash"; readonly hash: string }
-    | { readonly _tag: "ScriptHash"; readonly hash: string }
-}
-```
-
-## jsonToRewardAddress
-
-**Signature**
-
-```ts
-export declare const jsonToRewardAddress: (
-  i: {
-    readonly _tag: "RewardAccount"
-    readonly networkId: number
-    readonly stakeCredential:
-      | { readonly _tag: "KeyHash"; readonly hash: string }
-      | { readonly _tag: "ScriptHash"; readonly hash: string }
-  },
-  overrideOptions?: ParseOptions | undefined
-) => string
-```
-
-## rewardAddressToJson
-
-**Signature**
-
-```ts
-export declare const rewardAddressToJson: (
-  i: string,
-  overrideOptions?: ParseOptions | undefined
-) => {
-  readonly _tag: "RewardAccount"
-  readonly networkId: number
-  readonly stakeCredential:
-    | { readonly _tag: "KeyHash"; readonly hash: string }
-    | { readonly _tag: "ScriptHash"; readonly hash: string }
-}
-```
-
-## toRewardAccount
-
-**Signature**
-
-```ts
-export declare const toRewardAccount: (i: string, overrideOptions?: ParseOptions) => CoreRewardAccount.RewardAccount
-```
diff --git a/docs/content/docs/modules/sdk/Script.mdx b/docs/content/docs/modules/sdk/Script.mdx
deleted file mode 100644
index ff8eb977..00000000
--- a/docs/content/docs/modules/sdk/Script.mdx
+++ /dev/null
@@ -1,185 +0,0 @@
----
-title: sdk/Script.ts
-nav_order: 203
-parent: Modules
----
-
-## Script overview
-
----
-
-<h2 className="text-delta">Table of contents</h2>
-
-- [utils](#utils)
-  - [MintingPolicy (type alias)](#mintingpolicy-type-alias)
-  - [Native (type alias)](#native-type-alias)
-  - [PlutusV1 (type alias)](#plutusv1-type-alias)
-  - [PlutusV2 (type alias)](#plutusv2-type-alias)
-  - [PlutusV3 (type alias)](#plutusv3-type-alias)
-  - [PolicyId (type alias)](#policyid-type-alias)
-  - [Script (type alias)](#script-type-alias)
-  - [SpendingValidator (type alias)](#spendingvalidator-type-alias)
-  - [Validator (type alias)](#validator-type-alias)
-  - [applyDoubleCborEncoding](#applydoublecborencoding)
-  - [applySingleCborEncoding](#applysinglecborencoding)
-  - [makeNativeScript](#makenativescript)
-  - [makePlutusV1Script](#makeplutusv1script)
-  - [makePlutusV2Script](#makeplutusv2script)
-  - [makePlutusV3Script](#makeplutusv3script)
-  - [scriptEquals](#scriptequals)
-
----
-
-# utils
-
-## MintingPolicy (type alias)
-
-**Signature**
-
-```ts
-export type MintingPolicy = Script
-```
-
-## Native (type alias)
-
-**Signature**
-
-```ts
-export type Native = {
-  type: "Native"
-  script: string // CBOR hex string
-}
-```
-
-## PlutusV1 (type alias)
-
-**Signature**
-
-```ts
-export type PlutusV1 = {
-  type: "PlutusV1"
-  script: string // CBOR hex string
-}
-```
-
-## PlutusV2 (type alias)
-
-**Signature**
-
-```ts
-export type PlutusV2 = {
-  type: "PlutusV2"
-  script: string // CBOR hex string
-}
-```
-
-## PlutusV3 (type alias)
-
-**Signature**
-
-```ts
-export type PlutusV3 = {
-  type: "PlutusV3"
-  script: string // CBOR hex string
-}
-```
-
-## PolicyId (type alias)
-
-**Signature**
-
-```ts
-export type PolicyId = string
-```
-
-## Script (type alias)
-
-**Signature**
-
-```ts
-export type Script = Native | PlutusV1 | PlutusV2 | PlutusV3
-```
-
-## SpendingValidator (type alias)
-
-**Signature**
-
-```ts
-export type SpendingValidator = Script
-```
-
-## Validator (type alias)
-
-**Signature**
-
-```ts
-export type Validator = Script
-```
-
-## applyDoubleCborEncoding
-
-Compute the policy ID for a minting policy script.
-The policy ID is identical to the script hash.
-
-**Signature**
-
-```ts
-export declare const applyDoubleCborEncoding: (script: string) => string
-```
-
-## applySingleCborEncoding
-
-**Signature**
-
-```ts
-export declare const applySingleCborEncoding: (script: string) => string
-```
-
-## makeNativeScript
-
-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
-
-**Signature**
-
-```ts
-export declare const makeNativeScript: (cbor: string) => Native
-```
-
-## makePlutusV1Script
-
-**Signature**
-
-```ts
-export declare const makePlutusV1Script: (cbor: string) => PlutusV1
-```
-
-## makePlutusV2Script
-
-**Signature**
-
-```ts
-export declare const makePlutusV2Script: (cbor: string) => PlutusV2
-```
-
-## makePlutusV3Script
-
-**Signature**
-
-```ts
-export declare const makePlutusV3Script: (cbor: string) => PlutusV3
-```
-
-## scriptEquals
-
-**Signature**
-
-```ts
-export declare const scriptEquals: (a: Script, b: Script) => boolean
-```
diff --git a/docs/content/docs/modules/sdk/Type.mdx b/docs/content/docs/modules/sdk/Type.mdx
index b236c54c..93c9c82f 100644
--- a/docs/content/docs/modules/sdk/Type.mdx
+++ b/docs/content/docs/modules/sdk/Type.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/Type.ts
-nav_order: 204
+nav_order: 160
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/UTxO.mdx b/docs/content/docs/modules/sdk/UTxO.mdx
deleted file mode 100644
index 066a41f0..00000000
--- a/docs/content/docs/modules/sdk/UTxO.mdx
+++ /dev/null
@@ -1,510 +0,0 @@
----
-title: sdk/UTxO.ts
-nav_order: 206
-parent: Modules
----
-
-## UTxO overview
-
----
-
-<h2 className="text-delta">Table of contents</h2>
-
-- [constructors](#constructors)
-  - [toUTxO](#toutxo)
-- [conversion](#conversion)
-  - [fromCore](#fromcore)
-  - [fromCoreArray](#fromcorearray)
-  - [toCore](#tocore)
-  - [toCoreArray](#tocorearray)
-- [utils](#utils)
-  - [TxOutput (interface)](#txoutput-interface)
-  - [UTxO (interface)](#utxo-interface)
-  - [UTxOSet (type alias)](#utxoset-type-alias)
-  - [addAssets](#addassets)
-  - [difference](#difference)
-  - [equals](#equals)
-  - [filter](#filter)
-  - [filterByAddress](#filterbyaddress)
-  - [filterByAsset](#filterbyasset)
-  - [filterByMinLovelace](#filterbyminlovelace)
-  - [filterWithDatum](#filterwithdatum)
-  - [filterWithScript](#filterwithscript)
-  - [find](#find)
-  - [findByAddress](#findbyaddress)
-  - [findByOutRef](#findbyoutref)
-  - [findWithDatumHash](#findwithdatumhash)
-  - [findWithMinLovelace](#findwithminlovelace)
-  - [fromArray](#fromarray)
-  - [getDatumHash](#getdatumhash)
-  - [getInlineDatum](#getinlinedatum)
-  - [getLovelace](#getlovelace)
-  - [getOutRef](#getoutref)
-  - [getTotalAssets](#gettotalassets)
-  - [getTotalLovelace](#gettotallovelace)
-  - [getValue](#getvalue)
-  - [hasAssets](#hasassets)
-  - [hasDatum](#hasdatum)
-  - [hasLovelace](#haslovelace)
-  - [hasNativeTokens](#hasnativetokens)
-  - [hasScript](#hasscript)
-  - [intersection](#intersection)
-  - [isEmpty](#isempty)
-  - [map](#map)
-  - [reduce](#reduce)
-  - [removeByOutRef](#removebyoutref)
-  - [size](#size)
-  - [sortByLovelace](#sortbylovelace)
-  - [subtractAssets](#subtractassets)
-  - [toArray](#toarray)
-  - [union](#union)
-  - [withAssets](#withassets)
-  - [withDatum](#withdatum)
-  - [withScript](#withscript)
-  - [withoutDatum](#withoutdatum)
-  - [withoutScript](#withoutscript)
-
----
-
-# constructors
-
-## toUTxO
-
-Convert a TxOutput to a UTxO by adding txHash and outputIndex.
-Used after transaction submission when outputs become UTxOs on-chain.
-
-**Signature**
-
-```ts
-export declare const toUTxO: (output: TxOutput, txHash: string, outputIndex: number) => UTxO
-```
-
-Added in v2.0.0
-
-# conversion
-
-## fromCore
-
-Convert Core UTxO to SDK UTxO.
-This is a pure function as all data is available to convert.
-
-**Signature**
-
-```ts
-export declare const fromCore: (utxo: CoreUTxO.UTxO) => UTxO
-```
-
-Added in v2.0.0
-
-## fromCoreArray
-
-Convert array of Core UTxOs to SDK UTxOs.
-
-**Signature**
-
-```ts
-export declare const fromCoreArray: (utxos: ReadonlyArray<CoreUTxO.UTxO>) => ReadonlyArray<UTxO>
-```
-
-Added in v2.0.0
-
-## toCore
-
-Convert SDK UTxO to Core UTxO.
-This is an Effect as it needs to parse the address and transaction hash.
-
-**Signature**
-
-```ts
-export declare const toCore: (utxo: UTxO) => Effect.Effect<CoreUTxO.UTxO, Error>
-```
-
-Added in v2.0.0
-
-## toCoreArray
-
-Convert array of SDK UTxOs to Core UTxOs.
-
-**Signature**
-
-```ts
-export declare const toCoreArray: (utxos: ReadonlyArray<UTxO>) => Effect.Effect<ReadonlyArray<CoreUTxO.UTxO>, Error>
-```
-
-Added in v2.0.0
-
-# utils
-
-## TxOutput (interface)
-
-Transaction output before it's submitted on-chain.
-Similar to UTxO but without txHash/outputIndex since those don't exist yet.
-
-**Signature**
-
-```ts
-export interface TxOutput {
-  address: string
-  assets: Assets.Assets
-  datumOption?: Datum.Datum
-  scriptRef?: Script.Script
-}
-```
-
-## UTxO (interface)
-
-UTxO (Unspent Transaction Output) - a TxOutput that has been confirmed on-chain
-and has a txHash and outputIndex identifying it.
-
-**Signature**
-
-```ts
-export interface UTxO extends TxOutput {
-  txHash: string
-  outputIndex: number
-}
-```
-
-## UTxOSet (type alias)
-
-**Signature**
-
-```ts
-export type UTxOSet = Array<UTxO>
-```
-
-## addAssets
-
-**Signature**
-
-```ts
-export declare const addAssets: (utxo: UTxO, assets: Assets.Assets) => UTxO
-```
-
-## difference
-
-**Signature**
-
-```ts
-export declare const difference: (setA: UTxOSet, setB: UTxOSet) => UTxOSet
-```
-
-## equals
-
-**Signature**
-
-```ts
-export declare const equals: (a: UTxO, b: UTxO) => boolean
-```
-
-## filter
-
-**Signature**
-
-```ts
-export declare const filter: (utxos: UTxOSet, predicate: (utxo: UTxO) => boolean) => UTxOSet
-```
-
-## filterByAddress
-
-**Signature**
-
-```ts
-export declare const filterByAddress: (utxoSet: UTxOSet, address: string) => UTxOSet
-```
-
-## filterByAsset
-
-**Signature**
-
-```ts
-export declare const filterByAsset: (utxoSet: UTxOSet, unit: string) => UTxOSet
-```
-
-## filterByMinLovelace
-
-**Signature**
-
-```ts
-export declare const filterByMinLovelace: (utxoSet: UTxOSet, minLovelace: bigint) => UTxOSet
-```
-
-## filterWithDatum
-
-**Signature**
-
-```ts
-export declare const filterWithDatum: (utxoSet: UTxOSet) => UTxOSet
-```
-
-## filterWithScript
-
-**Signature**
-
-```ts
-export declare const filterWithScript: (utxoSet: UTxOSet) => UTxOSet
-```
-
-## find
-
-**Signature**
-
-```ts
-export declare const find: (utxos: UTxOSet, predicate: (utxo: UTxO) => boolean) => UTxO | undefined
-```
-
-## findByAddress
-
-**Signature**
-
-```ts
-export declare const findByAddress: (utxos: UTxOSet, address: string) => UTxOSet
-```
-
-## findByOutRef
-
-**Signature**
-
-```ts
-export declare const findByOutRef: (utxoSet: UTxOSet, outRef: OutRef.OutRef) => UTxO | undefined
-```
-
-## findWithDatumHash
-
-**Signature**
-
-```ts
-export declare const findWithDatumHash: (utxos: UTxOSet, hash: string) => UTxOSet
-```
-
-## findWithMinLovelace
-
-**Signature**
-
-```ts
-export declare const findWithMinLovelace: (utxos: UTxOSet, minLovelace: bigint) => UTxOSet
-```
-
-## fromArray
-
-**Signature**
-
-```ts
-export declare const fromArray: (utxos: Array<UTxO>) => UTxOSet
-```
-
-## getDatumHash
-
-**Signature**
-
-```ts
-export declare const getDatumHash: (utxo: UTxO) => string | undefined
-```
-
-## getInlineDatum
-
-**Signature**
-
-```ts
-export declare const getInlineDatum: (utxo: UTxO) => string | undefined
-```
-
-## getLovelace
-
-**Signature**
-
-```ts
-export declare const getLovelace: (utxo: UTxO) => bigint
-```
-
-## getOutRef
-
-**Signature**
-
-```ts
-export declare const getOutRef: (utxo: UTxO) => OutRef.OutRef
-```
-
-## getTotalAssets
-
-**Signature**
-
-```ts
-export declare const getTotalAssets: (utxoSet: UTxOSet) => Assets.Assets
-```
-
-## getTotalLovelace
-
-**Signature**
-
-```ts
-export declare const getTotalLovelace: (utxoSet: UTxOSet) => bigint
-```
-
-## getValue
-
-**Signature**
-
-```ts
-export declare const getValue: (utxo: UTxO) => Assets.Assets
-```
-
-## hasAssets
-
-**Signature**
-
-```ts
-export declare const hasAssets: (utxo: UTxO) => boolean
-```
-
-## hasDatum
-
-**Signature**
-
-```ts
-export declare const hasDatum: (utxo: UTxO) => boolean
-```
-
-## hasLovelace
-
-**Signature**
-
-```ts
-export declare const hasLovelace: (utxo: UTxO) => boolean
-```
-
-## hasNativeTokens
-
-**Signature**
-
-```ts
-export declare const hasNativeTokens: (utxo: UTxO) => boolean
-```
-
-## hasScript
-
-**Signature**
-
-```ts
-export declare const hasScript: (utxo: UTxO) => boolean
-```
-
-## intersection
-
-**Signature**
-
-```ts
-export declare const intersection: (setA: UTxOSet, setB: UTxOSet) => UTxOSet
-```
-
-## isEmpty
-
-**Signature**
-
-```ts
-export declare const isEmpty: (utxoSet: UTxOSet) => boolean
-```
-
-## map
-
-**Signature**
-
-```ts
-export declare const map: <T>(utxos: UTxOSet, mapper: (utxo: UTxO) => T) => Array<T>
-```
-
-## reduce
-
-**Signature**
-
-```ts
-export declare const reduce: <T>(utxos: UTxOSet, reducer: (acc: T, utxo: UTxO) => T, initial: T) => T
-```
-
-## removeByOutRef
-
-**Signature**
-
-```ts
-export declare const removeByOutRef: (utxoSet: UTxOSet, outRef: OutRef.OutRef) => UTxOSet
-```
-
-## size
-
-**Signature**
-
-```ts
-export declare const size: (utxoSet: UTxOSet) => number
-```
-
-## sortByLovelace
-
-**Signature**
-
-```ts
-export declare const sortByLovelace: (utxoSet: UTxOSet, ascending?: boolean) => UTxOSet
-```
-
-## subtractAssets
-
-**Signature**
-
-```ts
-export declare const subtractAssets: (utxo: UTxO, assets: Assets.Assets) => UTxO
-```
-
-## toArray
-
-**Signature**
-
-```ts
-export declare const toArray: (utxoSet: UTxOSet) => Array<UTxO>
-```
-
-## union
-
-**Signature**
-
-```ts
-export declare const union: (setA: UTxOSet, setB: UTxOSet) => UTxOSet
-```
-
-## withAssets
-
-**Signature**
-
-```ts
-export declare const withAssets: (utxo: UTxO, assets: Assets.Assets) => UTxO
-```
-
-## withDatum
-
-**Signature**
-
-```ts
-export declare const withDatum: (utxo: UTxO, datumOption: Datum.Datum) => UTxO
-```
-
-## withScript
-
-**Signature**
-
-```ts
-export declare const withScript: (utxo: UTxO, scriptRef: Script.Script) => UTxO
-```
-
-## withoutDatum
-
-**Signature**
-
-```ts
-export declare const withoutDatum: (utxo: UTxO) => UTxO
-```
-
-## withoutScript
-
-**Signature**
-
-```ts
-export declare const withoutScript: (utxo: UTxO) => UTxO
-```
diff --git a/docs/content/docs/modules/sdk/Unit.mdx b/docs/content/docs/modules/sdk/Unit.mdx
deleted file mode 100644
index e03096af..00000000
--- a/docs/content/docs/modules/sdk/Unit.mdx
+++ /dev/null
@@ -1,69 +0,0 @@
----
-title: sdk/Unit.ts
-nav_order: 205
-parent: Modules
----
-
-## Unit overview
-
----
-
-<h2 className="text-delta">Table of contents</h2>
-
-- [utils](#utils)
-  - [Unit (type alias)](#unit-type-alias)
-  - [UnitDetails (interface)](#unitdetails-interface)
-  - [fromUnit](#fromunit)
-  - [toUnit](#tounit)
-
----
-
-# utils
-
-## Unit (type alias)
-
-**Signature**
-
-```ts
-export type Unit = string
-```
-
-## UnitDetails (interface)
-
-**Signature**
-
-```ts
-export interface UnitDetails {
-  policyId: PolicyId.PolicyId
-  assetName: string | undefined
-  name: string | undefined
-  label: number | undefined
-}
-```
-
-## fromUnit
-
-Parse a unit string into its components.
-Returns policy ID, asset name (full hex after policy),
-name (without label) and label if applicable.
-name will be returned in Hex.
-
-**Signature**
-
-```ts
-export declare const fromUnit: (unit: Unit) => UnitDetails
-```
-
-## toUnit
-
-Create a unit string from policy ID, name, and optional label.
-
-**Signature**
-
-```ts
-export declare const toUnit: (
-  policyId: PolicyId.PolicyId,
-  name?: string | undefined,
-  label?: number | undefined
-) => Unit
-```
diff --git a/docs/content/docs/modules/sdk/builders/CoinSelection.mdx b/docs/content/docs/modules/sdk/builders/CoinSelection.mdx
index 963a9946..1c908090 100644
--- a/docs/content/docs/modules/sdk/builders/CoinSelection.mdx
+++ b/docs/content/docs/modules/sdk/builders/CoinSelection.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/CoinSelection.ts
-nav_order: 151
+nav_order: 118
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/EvaluationStateManager.mdx b/docs/content/docs/modules/sdk/builders/EvaluationStateManager.mdx
index 28857927..21d552f0 100644
--- a/docs/content/docs/modules/sdk/builders/EvaluationStateManager.mdx
+++ b/docs/content/docs/modules/sdk/builders/EvaluationStateManager.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/EvaluationStateManager.ts
-nav_order: 152
+nav_order: 119
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/RedeemerBuilder.mdx b/docs/content/docs/modules/sdk/builders/RedeemerBuilder.mdx
index 92bed936..d807e597 100644
--- a/docs/content/docs/modules/sdk/builders/RedeemerBuilder.mdx
+++ b/docs/content/docs/modules/sdk/builders/RedeemerBuilder.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/RedeemerBuilder.ts
-nav_order: 176
+nav_order: 143
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/SignBuilder.mdx b/docs/content/docs/modules/sdk/builders/SignBuilder.mdx
index 2175d5f8..aa02b6ed 100644
--- a/docs/content/docs/modules/sdk/builders/SignBuilder.mdx
+++ b/docs/content/docs/modules/sdk/builders/SignBuilder.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/SignBuilder.ts
-nav_order: 177
+nav_order: 144
 parent: Modules
 ---
 
@@ -62,7 +62,7 @@ export interface SignBuilderEffect {
 
   // Signing methods
   readonly sign: () => Effect.Effect<SubmitBuilder, TransactionBuilderError>
-  readonly signAndSubmit: () => Effect.Effect<string, TransactionBuilderError>
+  readonly signAndSubmit: () => Effect.Effect<TransactionHash.TransactionHash, TransactionBuilderError>
   readonly signWithWitness: (
     witnessSet: TransactionWitnessSet.TransactionWitnessSet
   ) => Effect.Effect<SubmitBuilder, TransactionBuilderError>
diff --git a/docs/content/docs/modules/sdk/builders/SignBuilderImpl.mdx b/docs/content/docs/modules/sdk/builders/SignBuilderImpl.mdx
index 14775f77..acae7a97 100644
--- a/docs/content/docs/modules/sdk/builders/SignBuilderImpl.mdx
+++ b/docs/content/docs/modules/sdk/builders/SignBuilderImpl.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/SignBuilderImpl.ts
-nav_order: 178
+nav_order: 145
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/SubmitBuilder.mdx b/docs/content/docs/modules/sdk/builders/SubmitBuilder.mdx
index 86ab6bf4..e7de5f11 100644
--- a/docs/content/docs/modules/sdk/builders/SubmitBuilder.mdx
+++ b/docs/content/docs/modules/sdk/builders/SubmitBuilder.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/SubmitBuilder.ts
-nav_order: 179
+nav_order: 146
 parent: Modules
 ---
 
@@ -72,7 +72,7 @@ export interface SubmitBuilderEffect {
    * @returns Effect resolving to the transaction hash
    * @since 2.0.0
    */
-  readonly submit: () => Effect.Effect<string, TransactionBuilderError>
+  readonly submit: () => Effect.Effect<TransactionHash.TransactionHash, TransactionBuilderError>
 }
 ```
 
diff --git a/docs/content/docs/modules/sdk/builders/SubmitBuilderImpl.mdx b/docs/content/docs/modules/sdk/builders/SubmitBuilderImpl.mdx
index 0a2f4677..34632d99 100644
--- a/docs/content/docs/modules/sdk/builders/SubmitBuilderImpl.mdx
+++ b/docs/content/docs/modules/sdk/builders/SubmitBuilderImpl.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/SubmitBuilderImpl.ts
-nav_order: 180
+nav_order: 147
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/TransactionBuilder.mdx b/docs/content/docs/modules/sdk/builders/TransactionBuilder.mdx
index 8ed2be8e..0091be4b 100644
--- a/docs/content/docs/modules/sdk/builders/TransactionBuilder.mdx
+++ b/docs/content/docs/modules/sdk/builders/TransactionBuilder.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/TransactionBuilder.ts
-nav_order: 181
+nav_order: 148
 parent: Modules
 ---
 
@@ -268,8 +268,8 @@ export interface TransactionBuilderBase {
    *
    * @example
    * ```typescript
-   * import * as Script from "../../core/Script.js"
-   * import * as NativeScripts from "../../core/NativeScripts.js"
+   * import * as Script from "../../Script.js"
+   * import * as NativeScripts from "../../NativeScripts.js"
    *
    * const nativeScript = NativeScripts.makeScriptPubKey(keyHashBytes)
    * const script = Script.fromNativeScript(nativeScript)
@@ -346,7 +346,7 @@ export interface TransactionBuilderBase {
    *
    * @example
    * ```typescript
-   * import * as UTxO from "../../core/UTxO.js"
+   * import * as UTxO from "../../UTxO.js"
    *
    * // Use reference script stored on-chain instead of attaching to transaction
    * const refScriptUtxo = await provider.getUtxoByTxHash("abc123...")
@@ -619,7 +619,7 @@ export interface TransactionBuilderBase {
    *
    * @example
    * ```typescript
-   * import * as Time from "@evolution-sdk/core/Time"
+   * import * as Time from "@evolution-sdk/Time"
    *
    * // Transaction valid for 10 minutes from now
    * const tx = await builder
@@ -658,9 +658,9 @@ export interface TransactionBuilderBase {
    *
    * @example
    * ```typescript
-   * import * as VotingProcedures from "@evolution-sdk/core/VotingProcedures"
-   * import * as Vote from "@evolution-sdk/core/Vote"
-   * import * as Data from "@evolution-sdk/core/Data"
+   * import * as VotingProcedures from "@evolution-sdk/VotingProcedures"
+   * import * as Vote from "@evolution-sdk/Vote"
+   * import * as Data from "@evolution-sdk/Data"
    *
    * // Simple single vote with helper
    * await client.newTx()
@@ -716,8 +716,8 @@ export interface TransactionBuilderBase {
    *
    * @example
    * ```typescript
-   * import * as GovernanceAction from "@evolution-sdk/core/GovernanceAction"
-   * import * as RewardAccount from "@evolution-sdk/core/RewardAccount"
+   * import * as GovernanceAction from "@evolution-sdk/GovernanceAction"
+   * import * as RewardAccount from "@evolution-sdk/RewardAccount"
    *
    * // Submit single proposal (deposit auto-fetched)
    * await client.newTx()
@@ -769,8 +769,8 @@ export interface TransactionBuilderBase {
    *
    * @example
    * ```typescript
-   * import * as KeyHash from "@evolution-sdk/core/KeyHash"
-   * import * as Address from "@evolution-sdk/core/Address"
+   * import * as KeyHash from "@evolution-sdk/KeyHash"
+   * import * as Address from "@evolution-sdk/Address"
    *
    * // Add signer from address credential
    * const address = Address.fromBech32("addr_test1...")
@@ -805,7 +805,7 @@ export interface TransactionBuilderBase {
    *
    * @example
    * ```typescript
-   * import { fromEntries } from "@evolution-sdk/evolution/core/TransactionMetadatum"
+   * import { fromEntries } from "@evolution-sdk/evolution/TransactionMetadatum"
    *
    * // Attach a simple message (CIP-20)
    * const tx = await builder
diff --git a/docs/content/docs/modules/sdk/builders/TransactionResult.mdx b/docs/content/docs/modules/sdk/builders/TransactionResult.mdx
index 98526da8..08091141 100644
--- a/docs/content/docs/modules/sdk/builders/TransactionResult.mdx
+++ b/docs/content/docs/modules/sdk/builders/TransactionResult.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/TransactionResult.ts
-nav_order: 182
+nav_order: 149
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/TxBuilderImpl.mdx b/docs/content/docs/modules/sdk/builders/TxBuilderImpl.mdx
index 1828c197..827b8adf 100644
--- a/docs/content/docs/modules/sdk/builders/TxBuilderImpl.mdx
+++ b/docs/content/docs/modules/sdk/builders/TxBuilderImpl.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/TxBuilderImpl.ts
-nav_order: 183
+nav_order: 150
 parent: Modules
 ---
 
@@ -30,7 +30,6 @@ parent: Modules
   - [filterScriptUtxos](#filterscriptutxos)
   - [isScriptAddress](#isscriptaddress)
   - [isScriptAddressCore](#isscriptaddresscore)
-  - [makeDatumOption](#makedatumoption)
   - [makeTxOutput](#maketxoutput)
   - [mergeAssetsIntoOutput](#mergeassetsintooutput)
   - [mergeAssetsIntoUTxO](#mergeassetsintoutxo)
@@ -320,21 +319,6 @@ export declare const isScriptAddressCore: (address: CoreAddress.Address) => bool
 
 Added in v2.0.0
 
-## makeDatumOption
-
-Convert SDK Datum to core DatumOption.
-Parses CBOR hex strings for inline datums and hashes for datum references.
-
-**Signature**
-
-```ts
-export declare const makeDatumOption: (
-  datum: Datum.Datum
-) => Effect.Effect<DatumOption.DatumOption, TransactionBuilderError>
-```
-
-Added in v2.0.0
-
 ## makeTxOutput
 
 Create a TransactionOutput from user-friendly parameters.
diff --git a/docs/content/docs/modules/sdk/builders/Unfrack.mdx b/docs/content/docs/modules/sdk/builders/Unfrack.mdx
index d716a962..e1b9cb5f 100644
--- a/docs/content/docs/modules/sdk/builders/Unfrack.mdx
+++ b/docs/content/docs/modules/sdk/builders/Unfrack.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/Unfrack.ts
-nav_order: 184
+nav_order: 151
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/operations/AddSigner.mdx b/docs/content/docs/modules/sdk/builders/operations/AddSigner.mdx
index 5fb66bc8..fa00aa13 100644
--- a/docs/content/docs/modules/sdk/builders/operations/AddSigner.mdx
+++ b/docs/content/docs/modules/sdk/builders/operations/AddSigner.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/AddSigner.ts
-nav_order: 153
+nav_order: 120
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/operations/Attach.mdx b/docs/content/docs/modules/sdk/builders/operations/Attach.mdx
index 05d15af5..15b397a6 100644
--- a/docs/content/docs/modules/sdk/builders/operations/Attach.mdx
+++ b/docs/content/docs/modules/sdk/builders/operations/Attach.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/Attach.ts
-nav_order: 154
+nav_order: 121
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/operations/AttachMetadata.mdx b/docs/content/docs/modules/sdk/builders/operations/AttachMetadata.mdx
index 99560d6a..a1559374 100644
--- a/docs/content/docs/modules/sdk/builders/operations/AttachMetadata.mdx
+++ b/docs/content/docs/modules/sdk/builders/operations/AttachMetadata.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/AttachMetadata.ts
-nav_order: 155
+nav_order: 122
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/operations/Collect.mdx b/docs/content/docs/modules/sdk/builders/operations/Collect.mdx
index 7de13dd1..82220c75 100644
--- a/docs/content/docs/modules/sdk/builders/operations/Collect.mdx
+++ b/docs/content/docs/modules/sdk/builders/operations/Collect.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/Collect.ts
-nav_order: 156
+nav_order: 123
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/operations/Governance.mdx b/docs/content/docs/modules/sdk/builders/operations/Governance.mdx
index 0b726f03..4ce687c9 100644
--- a/docs/content/docs/modules/sdk/builders/operations/Governance.mdx
+++ b/docs/content/docs/modules/sdk/builders/operations/Governance.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/Governance.ts
-nav_order: 157
+nav_order: 124
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/operations/Mint.mdx b/docs/content/docs/modules/sdk/builders/operations/Mint.mdx
index e25de344..dd780e1c 100644
--- a/docs/content/docs/modules/sdk/builders/operations/Mint.mdx
+++ b/docs/content/docs/modules/sdk/builders/operations/Mint.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/Mint.ts
-nav_order: 158
+nav_order: 125
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/operations/Operations.mdx b/docs/content/docs/modules/sdk/builders/operations/Operations.mdx
index 42f08ac7..97fc3583 100644
--- a/docs/content/docs/modules/sdk/builders/operations/Operations.mdx
+++ b/docs/content/docs/modules/sdk/builders/operations/Operations.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/Operations.ts
-nav_order: 159
+nav_order: 126
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/operations/Pay.mdx b/docs/content/docs/modules/sdk/builders/operations/Pay.mdx
index bdb9ca1a..d6e4a0ae 100644
--- a/docs/content/docs/modules/sdk/builders/operations/Pay.mdx
+++ b/docs/content/docs/modules/sdk/builders/operations/Pay.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/Pay.ts
-nav_order: 160
+nav_order: 127
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/operations/Pool.mdx b/docs/content/docs/modules/sdk/builders/operations/Pool.mdx
index 54305ab7..c1e200e4 100644
--- a/docs/content/docs/modules/sdk/builders/operations/Pool.mdx
+++ b/docs/content/docs/modules/sdk/builders/operations/Pool.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/Pool.ts
-nav_order: 161
+nav_order: 128
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/operations/Propose.mdx b/docs/content/docs/modules/sdk/builders/operations/Propose.mdx
index dde00f49..f1b939f4 100644
--- a/docs/content/docs/modules/sdk/builders/operations/Propose.mdx
+++ b/docs/content/docs/modules/sdk/builders/operations/Propose.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/Propose.ts
-nav_order: 162
+nav_order: 129
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/operations/ReadFrom.mdx b/docs/content/docs/modules/sdk/builders/operations/ReadFrom.mdx
index b407dace..0f5fe31c 100644
--- a/docs/content/docs/modules/sdk/builders/operations/ReadFrom.mdx
+++ b/docs/content/docs/modules/sdk/builders/operations/ReadFrom.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/ReadFrom.ts
-nav_order: 163
+nav_order: 130
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/operations/Stake.mdx b/docs/content/docs/modules/sdk/builders/operations/Stake.mdx
index 83a7b71a..1cfe4149 100644
--- a/docs/content/docs/modules/sdk/builders/operations/Stake.mdx
+++ b/docs/content/docs/modules/sdk/builders/operations/Stake.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/Stake.ts
-nav_order: 164
+nav_order: 131
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/operations/Validity.mdx b/docs/content/docs/modules/sdk/builders/operations/Validity.mdx
index 133f0a94..41ae4fe6 100644
--- a/docs/content/docs/modules/sdk/builders/operations/Validity.mdx
+++ b/docs/content/docs/modules/sdk/builders/operations/Validity.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/Validity.ts
-nav_order: 165
+nav_order: 132
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/operations/Vote.mdx b/docs/content/docs/modules/sdk/builders/operations/Vote.mdx
index 8301fca6..d567b427 100644
--- a/docs/content/docs/modules/sdk/builders/operations/Vote.mdx
+++ b/docs/content/docs/modules/sdk/builders/operations/Vote.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/Vote.ts
-nav_order: 166
+nav_order: 133
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/phases/Balance.mdx b/docs/content/docs/modules/sdk/builders/phases/Balance.mdx
index c6496ab1..96e0a94c 100644
--- a/docs/content/docs/modules/sdk/builders/phases/Balance.mdx
+++ b/docs/content/docs/modules/sdk/builders/phases/Balance.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/phases/Balance.ts
-nav_order: 167
+nav_order: 134
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/phases/ChangeCreation.mdx b/docs/content/docs/modules/sdk/builders/phases/ChangeCreation.mdx
index 282d09e9..47590a36 100644
--- a/docs/content/docs/modules/sdk/builders/phases/ChangeCreation.mdx
+++ b/docs/content/docs/modules/sdk/builders/phases/ChangeCreation.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/phases/ChangeCreation.ts
-nav_order: 168
+nav_order: 135
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/phases/Collateral.mdx b/docs/content/docs/modules/sdk/builders/phases/Collateral.mdx
index e0dbced0..39b5f462 100644
--- a/docs/content/docs/modules/sdk/builders/phases/Collateral.mdx
+++ b/docs/content/docs/modules/sdk/builders/phases/Collateral.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/phases/Collateral.ts
-nav_order: 169
+nav_order: 136
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/phases/Evaluation.mdx b/docs/content/docs/modules/sdk/builders/phases/Evaluation.mdx
index 571db563..306af2ec 100644
--- a/docs/content/docs/modules/sdk/builders/phases/Evaluation.mdx
+++ b/docs/content/docs/modules/sdk/builders/phases/Evaluation.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/phases/Evaluation.ts
-nav_order: 170
+nav_order: 137
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/phases/Fallback.mdx b/docs/content/docs/modules/sdk/builders/phases/Fallback.mdx
index 506d4577..22ba23fc 100644
--- a/docs/content/docs/modules/sdk/builders/phases/Fallback.mdx
+++ b/docs/content/docs/modules/sdk/builders/phases/Fallback.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/phases/Fallback.ts
-nav_order: 171
+nav_order: 138
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/phases/FeeCalculation.mdx b/docs/content/docs/modules/sdk/builders/phases/FeeCalculation.mdx
index 57cac59c..713abae6 100644
--- a/docs/content/docs/modules/sdk/builders/phases/FeeCalculation.mdx
+++ b/docs/content/docs/modules/sdk/builders/phases/FeeCalculation.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/phases/FeeCalculation.ts
-nav_order: 172
+nav_order: 139
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/phases/Phases.mdx b/docs/content/docs/modules/sdk/builders/phases/Phases.mdx
index afb72a89..edba79c6 100644
--- a/docs/content/docs/modules/sdk/builders/phases/Phases.mdx
+++ b/docs/content/docs/modules/sdk/builders/phases/Phases.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/phases/Phases.ts
-nav_order: 173
+nav_order: 140
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/phases/Selection.mdx b/docs/content/docs/modules/sdk/builders/phases/Selection.mdx
index 8b36da59..803a70b6 100644
--- a/docs/content/docs/modules/sdk/builders/phases/Selection.mdx
+++ b/docs/content/docs/modules/sdk/builders/phases/Selection.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/phases/Selection.ts
-nav_order: 174
+nav_order: 141
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/builders/phases/utils.mdx b/docs/content/docs/modules/sdk/builders/phases/utils.mdx
index 6afc8f04..b44ac51f 100644
--- a/docs/content/docs/modules/sdk/builders/phases/utils.mdx
+++ b/docs/content/docs/modules/sdk/builders/phases/utils.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/phases/utils.ts
-nav_order: 175
+nav_order: 142
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/client/Client.mdx b/docs/content/docs/modules/sdk/client/Client.mdx
index e3d6faa1..923192b3 100644
--- a/docs/content/docs/modules/sdk/client/Client.mdx
+++ b/docs/content/docs/modules/sdk/client/Client.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/client/Client.ts
-nav_order: 185
+nav_order: 152
 parent: Modules
 ---
 
@@ -338,7 +338,7 @@ ReadOnlyClient Effect - provider, read-only wallet, and utility methods.
 ```ts
 export interface ReadOnlyClientEffect extends Provider.ProviderEffect, ReadOnlyWalletEffect {
   readonly getWalletUtxos: () => Effect.Effect<ReadonlyArray<CoreUTxO.UTxO>, Provider.ProviderError>
-  readonly getWalletDelegation: () => Effect.Effect<Delegation.Delegation, Provider.ProviderError>
+  readonly getWalletDelegation: () => Effect.Effect<Provider.Delegation, Provider.ProviderError>
 }
 ```
 
@@ -451,7 +451,7 @@ SigningClient Effect - provider, signing wallet, and utility methods.
 ```ts
 export interface SigningClientEffect extends Provider.ProviderEffect, SigningWalletEffect {
   readonly getWalletUtxos: () => Effect.Effect<ReadonlyArray<CoreUTxO.UTxO>, WalletError | Provider.ProviderError>
-  readonly getWalletDelegation: () => Effect.Effect<Delegation.Delegation, WalletError | Provider.ProviderError>
+  readonly getWalletDelegation: () => Effect.Effect<Provider.Delegation, WalletError | Provider.ProviderError>
 }
 ```
 
diff --git a/docs/content/docs/modules/sdk/client/ClientImpl.mdx b/docs/content/docs/modules/sdk/client/ClientImpl.mdx
index a8c8f6be..4ba024e0 100644
--- a/docs/content/docs/modules/sdk/client/ClientImpl.mdx
+++ b/docs/content/docs/modules/sdk/client/ClientImpl.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/client/ClientImpl.ts
-nav_order: 186
+nav_order: 153
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/sdk/provider/Blockfrost.mdx b/docs/content/docs/modules/sdk/provider/Blockfrost.mdx
index d3f9a6c9..0c77ad5b 100644
--- a/docs/content/docs/modules/sdk/provider/Blockfrost.mdx
+++ b/docs/content/docs/modules/sdk/provider/Blockfrost.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/provider/Blockfrost.ts
-nav_order: 196
+nav_order: 155
 parent: Modules
 ---
 
@@ -130,7 +130,7 @@ getDelegation: (rewardAddress: Parameters<Provider["getDelegation"]>[0]) => Prom
 **Signature**
 
 ```ts
-getDatum: (datumHash: Parameters<Provider["getDatum"]>[0]) => Promise<string>
+getDatum: (datumHash: Parameters<Provider["getDatum"]>[0]) => Promise<Data>
 ```
 
 ### awaitTx (property)
@@ -147,7 +147,7 @@ awaitTx: (txHash: Parameters<Provider["awaitTx"]>[0], checkInterval?: Parameters
 **Signature**
 
 ```ts
-submitTx: (cbor: Parameters<Provider["submitTx"]>[0]) => Promise<string>
+submitTx: (cbor: Parameters<Provider["submitTx"]>[0]) => Promise<TransactionHash>
 ```
 
 ### evaluateTx (property)
diff --git a/docs/content/docs/modules/sdk/provider/Koios.mdx b/docs/content/docs/modules/sdk/provider/Koios.mdx
index a6f28a1e..debc7530 100644
--- a/docs/content/docs/modules/sdk/provider/Koios.mdx
+++ b/docs/content/docs/modules/sdk/provider/Koios.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/provider/Koios.ts
-nav_order: 197
+nav_order: 156
 parent: Modules
 ---
 
@@ -108,7 +108,7 @@ getDelegation: (rewardAddress: Parameters<Provider["getDelegation"]>[0]) => Prom
 **Signature**
 
 ```ts
-getDatum: (datumHash: Parameters<Provider["getDatum"]>[0]) => Promise<string>
+getDatum: (datumHash: Parameters<Provider["getDatum"]>[0]) => Promise<Data>
 ```
 
 ### awaitTx (property)
@@ -125,7 +125,7 @@ awaitTx: (txHash: Parameters<Provider["awaitTx"]>[0], checkInterval?: Parameters
 **Signature**
 
 ```ts
-submitTx: (tx: Parameters<Provider["submitTx"]>[0]) => Promise<string>
+submitTx: (tx: Parameters<Provider["submitTx"]>[0]) => Promise<TransactionHash>
 ```
 
 ### evaluateTx (property)
diff --git a/docs/content/docs/modules/sdk/provider/Kupmios.mdx b/docs/content/docs/modules/sdk/provider/Kupmios.mdx
index f2f6fd2d..acd1d041 100644
--- a/docs/content/docs/modules/sdk/provider/Kupmios.mdx
+++ b/docs/content/docs/modules/sdk/provider/Kupmios.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/provider/Kupmios.ts
-nav_order: 198
+nav_order: 157
 parent: Modules
 ---
 
@@ -115,7 +115,7 @@ getDelegation: (rewardAddress: Parameters<Provider["getDelegation"]>[0]) => Prom
 **Signature**
 
 ```ts
-getDatum: (datumHash: Parameters<Provider["getDatum"]>[0]) => Promise<string>
+getDatum: (datumHash: Parameters<Provider["getDatum"]>[0]) => Promise<Data>
 ```
 
 ### awaitTx (property)
@@ -141,5 +141,5 @@ evaluateTx: (tx: Parameters<Provider["evaluateTx"]>[0], additionalUTxOs?: Parame
 **Signature**
 
 ```ts
-submitTx: (tx: Parameters<Provider["submitTx"]>[0]) => Promise<string>
+submitTx: (tx: Parameters<Provider["submitTx"]>[0]) => Promise<TransactionHash>
 ```
diff --git a/docs/content/docs/modules/sdk/provider/Maestro.mdx b/docs/content/docs/modules/sdk/provider/Maestro.mdx
index 7b9a84a1..03d76053 100644
--- a/docs/content/docs/modules/sdk/provider/Maestro.mdx
+++ b/docs/content/docs/modules/sdk/provider/Maestro.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/provider/Maestro.ts
-nav_order: 199
+nav_order: 158
 parent: Modules
 ---
 
@@ -114,7 +114,7 @@ getDelegation: (rewardAddress: Parameters<Provider["getDelegation"]>[0]) => Prom
 **Signature**
 
 ```ts
-getDatum: (datumHash: Parameters<Provider["getDatum"]>[0]) => Promise<string>
+getDatum: (datumHash: Parameters<Provider["getDatum"]>[0]) => Promise<Data>
 ```
 
 ### awaitTx (property)
@@ -131,7 +131,7 @@ awaitTx: (txHash: Parameters<Provider["awaitTx"]>[0], checkInterval?: Parameters
 **Signature**
 
 ```ts
-submitTx: (cbor: Parameters<Provider["submitTx"]>[0]) => Promise<string>
+submitTx: (cbor: Parameters<Provider["submitTx"]>[0]) => Promise<TransactionHash>
 ```
 
 ### evaluateTx (property)
diff --git a/docs/content/docs/modules/sdk/provider/Provider.mdx b/docs/content/docs/modules/sdk/provider/Provider.mdx
index 6a816f04..92ee0ba6 100644
--- a/docs/content/docs/modules/sdk/provider/Provider.mdx
+++ b/docs/content/docs/modules/sdk/provider/Provider.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/provider/Provider.ts
-nav_order: 200
+nav_order: 159
 parent: Modules
 ---
 
@@ -13,6 +13,8 @@ parent: Modules
 - [errors](#errors)
   - [ProviderError (class)](#providererror-class)
 - [model](#model)
+  - [Delegation (interface)](#delegation-interface)
+  - [ProtocolParameters (type alias)](#protocolparameters-type-alias)
   - [Provider (interface)](#provider-interface)
   - [ProviderEffect](#providereffect)
   - [ProviderEffect (interface)](#providereffect-interface)
@@ -36,6 +38,56 @@ Added in v2.0.0
 
 # model
 
+## Delegation (interface)
+
+Delegation information including pool ID and rewards.
+
+**Signature**
+
+```ts
+export interface Delegation {
+  readonly poolId: PoolKeyHash.PoolKeyHash | null
+  readonly rewards: bigint
+}
+```
+
+Added in v2.0.0
+
+## ProtocolParameters (type alias)
+
+Protocol Parameters for the Cardano network.
+Defines operational rules and limits used by providers.
+
+**Signature**
+
+```ts
+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>
+  }
+}
+```
+
+Added in v2.0.0
+
 ## Provider (interface)
 
 Promise-based provider interface for blockchain data access and submission.
@@ -76,7 +128,7 @@ export interface ProviderEffect {
   /**
    * Retrieve current protocol parameters from the blockchain.
    */
-  readonly getProtocolParameters: () => Effect.Effect<ProtocolParameters.ProtocolParameters, ProviderError>
+  readonly getProtocolParameters: () => Effect.Effect<ProtocolParameters, ProviderError>
   /**
    * Query UTxOs at a given address or by credential.
    */
@@ -92,37 +144,44 @@ export interface ProviderEffect {
   ) => Effect.Effect<Array<CoreUTxO.UTxO>, ProviderError>
   /**
    * Query a single UTxO by its unit identifier.
+   * Unit format: policyId (56 hex chars) + assetName (0-64 hex chars)
    */
   readonly getUtxoByUnit: (unit: string) => Effect.Effect<CoreUTxO.UTxO, ProviderError>
   /**
-   * Query UTxOs by their output references.
+   * Query UTxOs by their transaction inputs (output references).
    */
   readonly getUtxosByOutRef: (
-    outRefs: ReadonlyArray<OutRef.OutRef>
+    inputs: ReadonlyArray<TransactionInput.TransactionInput>
   ) => Effect.Effect<Array<CoreUTxO.UTxO>, ProviderError>
   /**
    * Query delegation info for a reward address.
    */
-  readonly getDelegation: (
-    rewardAddress: RewardAddress.RewardAddress
-  ) => Effect.Effect<Delegation.Delegation, ProviderError>
+  readonly getDelegation: (rewardAddress: RewardAddress.RewardAddress) => Effect.Effect<Delegation, ProviderError>
   /**
    * Query a datum by its hash.
+   * Returns the parsed PlutusData structure.
    */
-  readonly getDatum: (datumHash: string) => Effect.Effect<string, ProviderError>
+  readonly getDatum: (datumHash: DatumOption.DatumHash) => Effect.Effect<PlutusData.Data, ProviderError>
   /**
    * Wait for a transaction to be confirmed on the blockchain.
    */
-  readonly awaitTx: (txHash: string, checkInterval?: number) => Effect.Effect<boolean, ProviderError>
+  readonly awaitTx: (
+    txHash: TransactionHash.TransactionHash,
+    checkInterval?: number
+  ) => Effect.Effect<boolean, ProviderError>
   /**
    * Submit a signed transaction to the blockchain.
+   * @param tx - Signed transaction to submit
+   * @returns Transaction hash of the submitted transaction
    */
-  readonly submitTx: (cbor: string) => Effect.Effect<string, ProviderError>
+  readonly submitTx: (tx: Transaction.Transaction) => Effect.Effect<TransactionHash.TransactionHash, ProviderError>
   /**
    * Evaluate a transaction to determine script execution costs.
+   * @param tx - Transaction to evaluate
+   * @param additionalUTxOs - Additional UTxOs to include in evaluation context
    */
   readonly evaluateTx: (
-    tx: string,
+    tx: Transaction.Transaction,
     additionalUTxOs?: Array<CoreUTxO.UTxO>
   ) => Effect.Effect<Array<EvalRedeemer>, ProviderError>
 }
diff --git a/docs/content/docs/modules/sdk/wallet/Derivation.mdx b/docs/content/docs/modules/sdk/wallet/Derivation.mdx
index 12fbcbe9..9da44765 100644
--- a/docs/content/docs/modules/sdk/wallet/Derivation.mdx
+++ b/docs/content/docs/modules/sdk/wallet/Derivation.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/wallet/Derivation.ts
-nav_order: 207
+nav_order: 161
 parent: Modules
 ---
 
@@ -46,7 +46,7 @@ Result of deriving keys and addresses from a seed or Bip32 root
 ```ts
 export type SeedDerivationResult = {
   address: CoreAddress.Address
-  rewardAddress: SdkRewardAddress.RewardAddress | undefined
+  rewardAddress: CoreRewardAddress.RewardAddress | undefined
   paymentKey: string
   stakeKey: string | undefined
   keyStore: Map<string, PrivateKey.PrivateKey>
@@ -70,7 +70,7 @@ export declare function addressFromSeed(
     accountIndex?: number
     network?: "Mainnet" | "Testnet" | "Custom"
   } = {}
-): { address: CoreAddress.Address; rewardAddress: SdkRewardAddress.RewardAddress | undefined }
+): { address: CoreAddress.Address; rewardAddress: CoreRewardAddress.RewardAddress | undefined }
 ```
 
 ## keysFromSeed
diff --git a/docs/content/docs/modules/sdk/wallet/WalletNew.mdx b/docs/content/docs/modules/sdk/wallet/WalletNew.mdx
index e4955df9..914a8e05 100644
--- a/docs/content/docs/modules/sdk/wallet/WalletNew.mdx
+++ b/docs/content/docs/modules/sdk/wallet/WalletNew.mdx
@@ -1,6 +1,6 @@
 ---
 title: sdk/wallet/WalletNew.ts
-nav_order: 208
+nav_order: 162
 parent: Modules
 ---
 
@@ -149,7 +149,9 @@ export interface ApiWalletEffect extends ReadOnlyWalletEffect {
    * Submit transaction directly through the wallet API.
    * API wallets can submit without requiring a separate provider.
    */
-  readonly submitTx: (tx: Transaction.Transaction | string) => Effect.Effect<string, WalletError>
+  readonly submitTx: (
+    tx: Transaction.Transaction | string
+  ) => Effect.Effect<TransactionHash.TransactionHash, WalletError>
 }
 ```
 
diff --git a/docs/content/docs/modules/core/uplc/UPLC.mdx b/docs/content/docs/modules/uplc/UPLC.mdx
similarity index 99%
rename from docs/content/docs/modules/core/uplc/UPLC.mdx
rename to docs/content/docs/modules/uplc/UPLC.mdx
index 245c7999..ef032fc4 100644
--- a/docs/content/docs/modules/core/uplc/UPLC.mdx
+++ b/docs/content/docs/modules/uplc/UPLC.mdx
@@ -1,6 +1,6 @@
 ---
-title: core/uplc/UPLC.ts
-nav_order: 138
+title: uplc/UPLC.ts
+nav_order: 183
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/utils/FeeValidation.mdx b/docs/content/docs/modules/utils/FeeValidation.mdx
index 95efcb41..c2e029b0 100644
--- a/docs/content/docs/modules/utils/FeeValidation.mdx
+++ b/docs/content/docs/modules/utils/FeeValidation.mdx
@@ -1,6 +1,6 @@
 ---
 title: utils/FeeValidation.ts
-nav_order: 210
+nav_order: 186
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/utils/Hash.mdx b/docs/content/docs/modules/utils/Hash.mdx
index d50aad4c..dd5f557a 100644
--- a/docs/content/docs/modules/utils/Hash.mdx
+++ b/docs/content/docs/modules/utils/Hash.mdx
@@ -1,6 +1,6 @@
 ---
 title: utils/Hash.ts
-nav_order: 211
+nav_order: 187
 parent: Modules
 ---
 
diff --git a/docs/content/docs/modules/utils/effect-runtime.mdx b/docs/content/docs/modules/utils/effect-runtime.mdx
index 6e0c2df0..e4eb2688 100644
--- a/docs/content/docs/modules/utils/effect-runtime.mdx
+++ b/docs/content/docs/modules/utils/effect-runtime.mdx
@@ -1,6 +1,6 @@
 ---
 title: utils/effect-runtime.ts
-nav_order: 209
+nav_order: 185
 parent: Modules
 ---
 
diff --git a/docs/content/docs/providers/provider-only-client.mdx b/docs/content/docs/providers/provider-only-client.mdx
index 920ae9eb..0cfa1f34 100644
--- a/docs/content/docs/providers/provider-only-client.mdx
+++ b/docs/content/docs/providers/provider-only-client.mdx
@@ -29,7 +29,7 @@ Provider-only clients are ideal when you need blockchain data but not wallet-spe
 Create a client with only provider configuration:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, Bytes, DatumOption, RewardAddress, Transaction, TransactionHash, TransactionInput, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -42,7 +42,7 @@ const client = createClient({
 
 // Query any address
 const utxos = await client.getUtxos(
-  Core.Address.fromBech32("addr1qxy8sclc58rsck0pzsc0v4skmqjwuqsqpwfcvrdldl5sjvvhyltp7fk0fmtmrlnykgmhnzcns2msa2cmpvllzgqd2azqhpv8e4")
+  Address.fromBech32("addr1qxy8sclc58rsck0pzsc0v4skmqjwuqsqpwfcvrdldl5sjvvhyltp7fk0fmtmrlnykgmhnzcns2msa2cmpvllzgqd2azqhpv8e4")
 );
 console.log("Found UTxOs:", utxos.length);
 
@@ -56,7 +56,7 @@ console.log("Min fee A:", params.minFeeA);
 Provider-only clients expose all provider methods directly:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, Bytes, DatumOption, RewardAddress, Transaction, TransactionHash, TransactionInput, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -70,31 +70,31 @@ const client = createClient({
 // Protocol parameters
 const params = await client.getProtocolParameters();
 
-// UTxO queries - use Core.Address.fromBech32 for addresses
-const address = Core.Address.fromBech32("addr1qxy8sclc58rsck0pzsc0v4skmqjwuqsqpwfcvrdldl5sjvvhyltp7fk0fmtmrlnykgmhnzcns2msa2cmpvllzgqd2azqhpv8e4");
+// UTxO queries - use Address.fromBech32 for addresses
+const address = Address.fromBech32("addr1qxy8sclc58rsck0pzsc0v4skmqjwuqsqpwfcvrdldl5sjvvhyltp7fk0fmtmrlnykgmhnzcns2msa2cmpvllzgqd2azqhpv8e4");
 const utxos = await client.getUtxos(address);
 const utxosWithAda = await client.getUtxosWithUnit(address, "lovelace");
 const utxosByRefs = await client.getUtxosByOutRef([
-  new Core.TransactionInput.TransactionInput({ 
-    transactionId: Core.TransactionHash.fromHex("abc123def456..."), 
+  new TransactionInput.TransactionInput({ 
+    transactionId: TransactionHash.fromHex("abc123def456..."), 
     index: 0n 
   })
 ]);
 
 // Delegation
-const delegation = await client.getDelegation(Core.RewardAddress.RewardAddress.make("stake1uxy..."));
+const delegation = await client.getDelegation(RewardAddress.RewardAddress.make("stake1uxy..."));
 
 // Datum resolution
-const datum = await client.getDatum(new Core.DatumOption.DatumHash({ hash: Core.Bytes.fromHex("datum-hash-here") }));
+const datum = await client.getDatum(new DatumOption.DatumHash({ hash: Bytes.fromHex("datum-hash-here") }));
 
 // Transaction operations
 const signedTxCbor = "84a300...";
-const signedTx = Core.Transaction.fromCBORHex(signedTxCbor);
+const signedTx = Transaction.fromCBORHex(signedTxCbor);
 const txHash = await client.submitTx(signedTx);
 const confirmed = await client.awaitTx(txHash);
 
 const unsignedTxCbor = "84a300...";
-const unsignedTx = Core.Transaction.fromCBORHex(unsignedTxCbor);
+const unsignedTx = Transaction.fromCBORHex(unsignedTxCbor);
 const evaluated = await client.evaluateTx(unsignedTx);
 ```
 
@@ -103,7 +103,7 @@ const evaluated = await client.evaluateTx(unsignedTx);
 Portfolio tracker for multiple addresses:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, Bytes, DatumOption, RewardAddress, Transaction, TransactionHash, TransactionInput, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -119,7 +119,7 @@ async function getPortfolioBalance(addressesBech32: string[]) {
   const results = await Promise.all(
     addressesBech32.map(async (addressBech32) => {
       const utxos = await client.getUtxos(
-        Core.Address.fromBech32(addressBech32)
+        Address.fromBech32(addressBech32)
       );
       const lovelace = utxos.reduce(
         (sum, utxo) => sum + utxo.assets.lovelace,
@@ -143,7 +143,7 @@ const portfolio = await getPortfolioBalance([
 Accept signed transactions and submit to blockchain:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, Bytes, DatumOption, RewardAddress, Transaction, TransactionHash, TransactionInput, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -157,7 +157,7 @@ const client = createClient({
 // API endpoint
 export async function submitTransaction(signedTxCbor: string) {
   try {
-    const signedTx = Core.Transaction.fromCBORHex(signedTxCbor);
+    const signedTx = Transaction.fromCBORHex(signedTxCbor);
     const txHash = await client.submitTx(signedTx);
     
     // Wait for confirmation
@@ -182,7 +182,7 @@ export async function submitTransaction(signedTxCbor: string) {
 Track network parameters for fee estimation or protocol changes:
 
 ```typescript twoslash
-import { createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, Bytes, DatumOption, RewardAddress, Transaction, TransactionHash, TransactionInput, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -221,7 +221,7 @@ Provider-only clients cannot perform wallet-specific operations:
 
 ```typescript twoslash
 // @errors: 2339
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, Bytes, DatumOption, RewardAddress, Transaction, TransactionHash, TransactionInput, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -245,12 +245,12 @@ client.signTx();
 client.address();
 
 // CAN query any address
-const address = Core.Address.fromBech32("addr1qxy8sclc58rsck0pzsc0v4skmqjwuqsqpwfcvrdldl5sjvvhyltp7fk0fmtmrlnykgmhnzcns2msa2cmpvllzgqd2azqhpv8e4");
+const address = Address.fromBech32("addr1qxy8sclc58rsck0pzsc0v4skmqjwuqsqpwfcvrdldl5sjvvhyltp7fk0fmtmrlnykgmhnzcns2msa2cmpvllzgqd2azqhpv8e4");
 const utxos = await client.getUtxos(address);
 
 // CAN submit pre-signed transactions
 const signedCbor = "84a400..."; // Example signed transaction CBOR
-const signedTx = Core.Transaction.fromCBORHex(signedCbor);
+const signedTx = Transaction.fromCBORHex(signedCbor);
 const txHash = await client.submitTx(signedTx);
 ```
 
@@ -259,7 +259,7 @@ const txHash = await client.submitTx(signedTx);
 Add wallet to provider-only client using `attachWallet()`:
 
 ```typescript twoslash
-import { createClient, Core } from "@evolution-sdk/evolution";
+import { Address, Assets, Bytes, DatumOption, RewardAddress, Transaction, TransactionHash, TransactionInput, createClient } from "@evolution-sdk/evolution";
 
 // Start with provider only
 const providerClient = createClient({
@@ -280,8 +280,8 @@ const readOnlyClient = providerClient.attachWallet({
 // Now can build transactions for this address
 const builder = readOnlyClient.newTx();
 builder.payToAddress({
-  address: Core.Address.fromBech32("addr1qxh7f8gxv43dxz7k2vf6x5cxj5f5mk5mmqfk5u7qp7t2nvw9pqp0aw50nln8nyzfh6fjp6sxgajx5q0c6p73xqf2qhvqwlx8f7"),
-  assets: Core.Assets.fromLovelace(5000000n)
+  address: Address.fromBech32("addr1qxh7f8gxv43dxz7k2vf6x5cxj5f5mk5mmqfk5u7qp7t2nvw9pqp0aw50nln8nyzfh6fjp6sxgajx5q0c6p73xqf2qhvqwlx8f7"),
+  assets: Assets.fromLovelace(5000000n)
 });
 
 const result = await builder.build();
@@ -292,7 +292,7 @@ const result = await builder.build();
 Switch between environments:
 
 ```typescript twoslash
-import { createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, Bytes, DatumOption, RewardAddress, Transaction, TransactionHash, TransactionInput, createClient } from "@evolution-sdk/evolution";
 
 const env = (process.env.NODE_ENV || "development") as "development" | "production";
 
diff --git a/docs/content/docs/providers/querying.mdx b/docs/content/docs/providers/querying.mdx
index 4d03b8cb..17cee3c1 100644
--- a/docs/content/docs/providers/querying.mdx
+++ b/docs/content/docs/providers/querying.mdx
@@ -12,7 +12,7 @@ Providers expose methods to query UTxOs, protocol parameters, delegation informa
 Retrieve current network parameters for fee calculation and transaction constraints:
 
 ```typescript twoslash
-import { createClient } from "@evolution-sdk/evolution";
+import { Address, Bytes, Credential, DatumOption, PoolKeyHash, RewardAddress, TransactionHash, TransactionInput, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -48,7 +48,7 @@ Query unspent transaction outputs by address, credential, unit, or reference.
 ### By Address
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Bytes, Credential, DatumOption, PoolKeyHash, RewardAddress, TransactionHash, TransactionInput, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -61,7 +61,7 @@ const client = createClient({
 
 // Get all UTxOs at address
 const utxos = await client.getUtxos(
-  Core.Address.fromBech32("addr1qxy8sclc58rsck0pzsc0v4skmqjwuqsqpwfcvrdldl5sjvvhyltp7fk0fmtmrlnykgmhnzcns2msa2cmpvllzgqd2azqhpv8e4")
+  Address.fromBech32("addr1qxy8sclc58rsck0pzsc0v4skmqjwuqsqpwfcvrdldl5sjvvhyltp7fk0fmtmrlnykgmhnzcns2msa2cmpvllzgqd2azqhpv8e4")
 );
 
 // Calculate total ADA
@@ -86,7 +86,7 @@ utxos.forEach((utxo) => {
 Query UTxOs by payment credential instead of full address:
 
 ```typescript
-import { createClient, Credential } from "@evolution-sdk/evolution";
+import { Address, Bytes, Credential, DatumOption, PoolKeyHash, RewardAddress, TransactionHash, TransactionInput, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -109,7 +109,7 @@ const utxos = await client.getUtxos(credential);
 Query UTxOs containing specific native asset:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Bytes, Credential, DatumOption, PoolKeyHash, RewardAddress, TransactionHash, TransactionInput, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -126,7 +126,7 @@ const assetName = "MyToken";
 const unit = policyId + assetName;
 
 const utxosWithToken = await client.getUtxosWithUnit(
-  Core.Address.fromBech32("addr1qxy8sclc58rsck0pzsc0v4skmqjwuqsqpwfcvrdldl5sjvvhyltp7fk0fmtmrlnykgmhnzcns2msa2cmpvllzgqd2azqhpv8e4"),
+  Address.fromBech32("addr1qxy8sclc58rsck0pzsc0v4skmqjwuqsqpwfcvrdldl5sjvvhyltp7fk0fmtmrlnykgmhnzcns2msa2cmpvllzgqd2azqhpv8e4"),
   unit
 );
 
@@ -138,7 +138,7 @@ console.log("UTxOs with token:", utxosWithToken.length);
 Query specific UTxOs by transaction output reference:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Bytes, Credential, DatumOption, PoolKeyHash, RewardAddress, TransactionHash, TransactionInput, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -151,12 +151,12 @@ const client = createClient({
 
 // Query specific UTxOs
 const utxos = await client.getUtxosByOutRef([
-  new Core.TransactionInput.TransactionInput({
-    transactionId: Core.TransactionHash.fromHex("abc123..."),
+  new TransactionInput.TransactionInput({
+    transactionId: TransactionHash.fromHex("abc123..."),
     index: 0n
   }),
-  new Core.TransactionInput.TransactionInput({
-    transactionId: Core.TransactionHash.fromHex("def456..."),
+  new TransactionInput.TransactionInput({
+    transactionId: TransactionHash.fromHex("def456..."),
     index: 1n
   })
 ]);
@@ -169,7 +169,7 @@ console.log("Found UTxOs:", utxos.length);
 Find a single UTxO by unique unit identifier:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Bytes, Credential, DatumOption, PoolKeyHash, RewardAddress, TransactionHash, TransactionInput, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -184,8 +184,8 @@ const client = createClient({
 const nftUnit = "policyId" + "tokenName";
 const utxo = await client.getUtxoByUnit(nftUnit);
 
-console.log("NFT found at:", Core.Address.toBech32(utxo.address));
-console.log("Current owner UTxO:", Core.TransactionHash.toHex(utxo.transactionId));
+console.log("NFT found at:", Address.toBech32(utxo.address));
+console.log("Current owner UTxO:", TransactionHash.toHex(utxo.transactionId));
 ```
 
 ## Delegation Queries
@@ -193,7 +193,7 @@ console.log("Current owner UTxO:", Core.TransactionHash.toHex(utxo.transactionId
 Query staking delegation and reward information:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Bytes, Credential, DatumOption, PoolKeyHash, RewardAddress, TransactionHash, TransactionInput, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -204,7 +204,7 @@ const client = createClient({
   }
 });
 
-const delegation = await client.getDelegation(Core.RewardAddress.RewardAddress.make("stake1uxy..."));
+const delegation = await client.getDelegation(RewardAddress.RewardAddress.make("stake1uxy..."));
 
 console.log("Delegated to pool:", delegation.poolId);
 console.log("Is delegated:", delegation.poolId !== undefined);
@@ -216,7 +216,7 @@ console.log("Rewards:", delegation.rewards);
 Retrieve datum content by hash:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Bytes, Credential, DatumOption, PoolKeyHash, RewardAddress, TransactionHash, TransactionInput, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -228,7 +228,7 @@ const client = createClient({
 });
 
 // Get datum from hash
-const datumHash = new Core.DatumOption.DatumHash({ hash: Core.Bytes.fromHex("abc123...") });
+const datumHash = new DatumOption.DatumHash({ hash: Bytes.fromHex("abc123...") });
 const datumCbor = await client.getDatum(datumHash);
 
 console.log("Datum CBOR:", datumCbor);
@@ -241,7 +241,7 @@ console.log("Datum CBOR:", datumCbor);
 Calculate total balance across multiple addresses:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Bytes, Credential, DatumOption, PoolKeyHash, RewardAddress, TransactionHash, TransactionInput, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -255,7 +255,7 @@ const client = createClient({
 async function getPortfolioBalance(addressesBech32: string[]) {
   const balances = await Promise.all(
     addressesBech32.map(async (addressBech32) => {
-      const address = Core.Address.fromBech32(addressBech32);
+      const address = Address.fromBech32(addressBech32);
       const utxos = await client.getUtxos(address);
       const lovelace = utxos.reduce(
         (sum, utxo) => sum + utxo.assets.lovelace,
@@ -290,7 +290,7 @@ async function getPortfolioBalance(addressesBech32: string[]) {
 Find all holders of a specific token:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Bytes, Credential, DatumOption, PoolKeyHash, RewardAddress, TransactionHash, TransactionInput, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -308,7 +308,7 @@ async function getTokenHolders(
   const holders = [];
   
   for (const addressBech32 of addresses) {
-    const address = Core.Address.fromBech32(addressBech32);
+    const address = Address.fromBech32(addressBech32);
     const utxos = await client.getUtxosWithUnit(address, tokenUnit);
     
     if (utxos.length > 0) {
@@ -330,7 +330,7 @@ async function getTokenHolders(
 Check if addresses are delegated to specific pool:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Bytes, Credential, DatumOption, PoolKeyHash, RewardAddress, TransactionHash, TransactionInput, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -347,11 +347,11 @@ async function checkPoolDelegation(
 ) {
   const results = await Promise.all(
     rewardAddresses.map(async (rewardAddress) => {
-      const delegation = await client.getDelegation(Core.RewardAddress.RewardAddress.make(rewardAddress));
+      const delegation = await client.getDelegation(RewardAddress.RewardAddress.make(rewardAddress));
       
       return {
         rewardAddress,
-        delegatedToTarget: delegation.poolId !== null && Core.PoolKeyHash.toHex(delegation.poolId) === targetPoolIdHex,
+        delegatedToTarget: delegation.poolId !== null && PoolKeyHash.toHex(delegation.poolId) === targetPoolIdHex,
         currentPool: delegation.poolId,
         isDelegated: delegation.poolId !== null,
         rewards: delegation.rewards
@@ -368,7 +368,7 @@ async function checkPoolDelegation(
 Track NFT ownership across collection:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Bytes, Credential, DatumOption, PoolKeyHash, RewardAddress, TransactionHash, TransactionInput, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -386,8 +386,8 @@ async function getNFTOwnership(nftUnits: string[]) {
         const utxo = await client.getUtxoByUnit(unit);
         return {
           unit,
-          owner: Core.Address.toBech32(utxo.address),
-          txHash: Core.TransactionHash.toHex(utxo.transactionId),
+          owner: Address.toBech32(utxo.address),
+          txHash: TransactionHash.toHex(utxo.transactionId),
           outputIndex: utxo.index
         };
       } catch (error: any) {
@@ -409,7 +409,7 @@ async function getNFTOwnership(nftUnits: string[]) {
 Handle query errors gracefully:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Bytes, Credential, DatumOption, PoolKeyHash, RewardAddress, TransactionHash, TransactionInput, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -422,7 +422,7 @@ const client = createClient({
 
 async function safeGetUtxos(addressBech32: string) {
   try {
-    const address = Core.Address.fromBech32(addressBech32);
+    const address = Address.fromBech32(addressBech32);
     const utxos = await client.getUtxos(address);
     return { success: true as const, utxos };
   } catch (error: any) {
@@ -433,7 +433,7 @@ async function safeGetUtxos(addressBech32: string) {
 
 async function safeGetDelegation(rewardAddress: string) {
   try {
-    const delegation = await client.getDelegation(Core.RewardAddress.RewardAddress.make(rewardAddress));
+    const delegation = await client.getDelegation(RewardAddress.RewardAddress.make(rewardAddress));
     return { success: true as const, delegation };
   } catch (error: any) {
     // May fail if address not registered
@@ -447,7 +447,7 @@ async function safeGetDelegation(rewardAddress: string) {
 Optimize queries for better performance:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Bytes, Credential, DatumOption, PoolKeyHash, RewardAddress, TransactionHash, TransactionInput, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -463,7 +463,7 @@ async function batchQuery(addressesBech32: string[]) {
   // Good: parallel queries
   const results = await Promise.all(
     addressesBech32.map(addr => 
-      client.getUtxos(Core.Address.fromBech32(addr))
+      client.getUtxos(Address.fromBech32(addr))
     )
   );
   
diff --git a/docs/content/docs/providers/submission.mdx b/docs/content/docs/providers/submission.mdx
index 9655d144..5e54aa58 100644
--- a/docs/content/docs/providers/submission.mdx
+++ b/docs/content/docs/providers/submission.mdx
@@ -12,7 +12,7 @@ Providers handle transaction submission and confirmation monitoring. Submit pre-
 Submit a signed transaction CBOR string:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Transaction, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -25,7 +25,7 @@ const client = createClient({
 
 // Submit signed transaction
 const signedTxCbor = "84a300..."; // Signed transaction CBOR
-const signedTx = Core.Transaction.fromCBORHex(signedTxCbor);
+const signedTx = Transaction.fromCBORHex(signedTxCbor);
 const txHash = await client.submitTx(signedTx);
 
 console.log("Transaction submitted:", txHash);
@@ -36,7 +36,7 @@ console.log("Transaction submitted:", txHash);
 Monitor transaction until confirmed on blockchain:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Transaction, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -48,7 +48,7 @@ const client = createClient({
 });
 
 const signedTxCbor = "84a300...";
-const signedTx = Core.Transaction.fromCBORHex(signedTxCbor);
+const signedTx = Transaction.fromCBORHex(signedTxCbor);
 const txHash = await client.submitTx(signedTx);
 
 // Wait for confirmation (checks every 5 seconds by default)
@@ -66,7 +66,7 @@ if (confirmed) {
 Specify how often to check for confirmation:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Transaction, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -78,7 +78,7 @@ const client = createClient({
 });
 
 const txHashHex = "abc123...";
-const txHash = Core.TransactionHash.fromHex(txHashHex);
+const txHash = TransactionHash.fromHex(txHashHex);
 
 // Check every 10 seconds
 const confirmed = await client.awaitTx(txHash, 10000);
@@ -91,7 +91,7 @@ console.log("Confirmed:", confirmed);
 Evaluate transaction before submission to estimate script execution costs:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Transaction, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -103,7 +103,7 @@ const client = createClient({
 });
 
 const unsignedTxCbor = "84a300..."; // Unsigned transaction
-const unsignedTx = Core.Transaction.fromCBORHex(unsignedTxCbor);
+const unsignedTx = Transaction.fromCBORHex(unsignedTxCbor);
 
 // Evaluate script execution
 const redeemers = await client.evaluateTx(unsignedTx);
@@ -121,7 +121,7 @@ redeemers.forEach((redeemer) => {
 Create a transaction submission service with error handling:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Transaction, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -144,7 +144,7 @@ export async function submitAndWait(
   checkInterval = 5000
 ): Promise<SubmissionResult> {
   try {
-    const signedTx = Core.Transaction.fromCBORHex(signedTxCbor);
+    const signedTx = Transaction.fromCBORHex(signedTxCbor);
     const txHash = await client.submitTx(signedTx);
     
     console.log("Transaction submitted:", txHash);
@@ -153,7 +153,7 @@ export async function submitAndWait(
     
     return {
       success: true,
-      txHash: Core.TransactionHash.toHex(txHash),
+      txHash: TransactionHash.toHex(txHash),
       confirmed
     };
   } catch (error: any) {
@@ -172,7 +172,7 @@ export async function submitAndWait(
 Submit multiple transactions sequentially:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Transaction, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -188,7 +188,7 @@ async function submitBatch(signedTxs: string[]) {
   
   for (const txCbor of signedTxs) {
     try {
-      const tx = Core.Transaction.fromCBORHex(txCbor);
+      const tx = Transaction.fromCBORHex(txCbor);
       const txHash = await client.submitTx(tx);
       console.log("Submitted:", txHash);
       
@@ -196,7 +196,7 @@ async function submitBatch(signedTxs: string[]) {
       
       results.push({
         success: true,
-        txHash: Core.TransactionHash.toHex(txHash),
+        txHash: TransactionHash.toHex(txHash),
         confirmed
       });
     } catch (error: any) {
@@ -216,7 +216,7 @@ async function submitBatch(signedTxs: string[]) {
 Handle common submission errors:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Transaction, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -229,7 +229,7 @@ const client = createClient({
 
 async function safeSubmit(signedTxCbor: string) {
   try {
-    const signedTx = Core.Transaction.fromCBORHex(signedTxCbor);
+    const signedTx = Transaction.fromCBORHex(signedTxCbor);
     const txHash = await client.submitTx(signedTx);
     return { success: true as const, txHash };
   } catch (error: any) {
@@ -275,7 +275,7 @@ async function safeSubmit(signedTxCbor: string) {
 Implement retry logic for transient failures:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Transaction, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -295,7 +295,7 @@ async function submitWithRetry(
   
   for (let attempt = 1; attempt <= maxRetries; attempt++) {
     try {
-      const signedTx = Core.Transaction.fromCBORHex(signedTxCbor);
+      const signedTx = Transaction.fromCBORHex(signedTxCbor);
       const txHash = await client.submitTx(signedTx);
       console.log(`Success on attempt ${attempt}:`, txHash);
       return { success: true as const, txHash };
@@ -329,7 +329,7 @@ async function submitWithRetry(
 Track transaction status with periodic checks:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Transaction, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -346,7 +346,7 @@ async function monitorTransaction(
   checkInterval = 5000
 ): Promise<boolean> {
   const startTime = Date.now();
-  const txHash = Core.TransactionHash.fromHex(txHashHex);
+  const txHash = TransactionHash.fromHex(txHashHex);
   
   while (Date.now() - startTime < timeout) {
     try {
@@ -373,7 +373,7 @@ async function monitorTransaction(
 End-to-end transaction submission with all error handling:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Transaction, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -403,7 +403,7 @@ export async function submitTransaction(
     attempts++;
     
     try {
-      const signedTx = Core.Transaction.fromCBORHex(signedTxCbor);
+      const signedTx = Transaction.fromCBORHex(signedTxCbor);
       const txHash = await client.submitTx(signedTx);
       
       console.log(`Submitted (attempt ${attempts}):`, txHash);
@@ -414,7 +414,7 @@ export async function submitTransaction(
       if (confirmed) {
         return {
           status: "confirmed",
-          txHash: Core.TransactionHash.toHex(txHash),
+          txHash: TransactionHash.toHex(txHash),
           attempts,
           confirmedAt: new Date()
         };
@@ -422,7 +422,7 @@ export async function submitTransaction(
       
       return {
         status: "submitted",
-        txHash: Core.TransactionHash.toHex(txHash),
+        txHash: TransactionHash.toHex(txHash),
         attempts
       };
       
@@ -462,7 +462,7 @@ export async function submitTransaction(
 Validate scripts before submitting:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Transaction, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -476,7 +476,7 @@ const client = createClient({
 async function evaluateAndSubmit(signedTxCbor: string) {
   try {
     // Evaluate first
-    const signedTx = Core.Transaction.fromCBORHex(signedTxCbor);
+    const signedTx = Transaction.fromCBORHex(signedTxCbor);
     const redeemers = await client.evaluateTx(signedTx);
     
     console.log("Script evaluation:");
@@ -494,7 +494,7 @@ async function evaluateAndSubmit(signedTxCbor: string) {
     
     return {
       success: true,
-      txHash: Core.TransactionHash.toHex(txHash),
+      txHash: TransactionHash.toHex(txHash),
       confirmed,
       redeemers
     };
diff --git a/docs/content/docs/providers/use-cases.mdx b/docs/content/docs/providers/use-cases.mdx
index 57cc5e49..d6a73690 100644
--- a/docs/content/docs/providers/use-cases.mdx
+++ b/docs/content/docs/providers/use-cases.mdx
@@ -12,7 +12,7 @@ Practical patterns and complete examples showing how to use providers in real ap
 Query and display address information:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, PoolKeyHash, RewardAddress, Transaction, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -34,7 +34,7 @@ export async function exploreAddress(
   addressBech32: string
 ): Promise<AddressInfo> {
   const utxos = await client.getUtxos(
-    Core.Address.fromBech32(addressBech32)
+    Address.fromBech32(addressBech32)
   );
   
   const lovelace = utxos.reduce(
@@ -56,7 +56,7 @@ export async function exploreAddress(
 Track balances across multiple addresses:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, PoolKeyHash, RewardAddress, Transaction, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -88,7 +88,7 @@ export async function trackPortfolio(
   const wallets = await Promise.all(
     addressesBech32.map(async (addressBech32) => {
       const utxos = await client.getUtxos(
-        Core.Address.fromBech32(addressBech32)
+        Address.fromBech32(addressBech32)
       );
       
       let lovelace = 0n;
@@ -132,7 +132,7 @@ export async function trackPortfolio(
 Backend API endpoint for transaction submission:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, PoolKeyHash, RewardAddress, Transaction, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -155,7 +155,7 @@ export async function handleSubmission(
 ): Promise<SubmissionResponse> {
   try {
     // Submit transaction
-    const signedTx = Core.Transaction.fromCBORHex(signedTxCbor);
+    const signedTx = Transaction.fromCBORHex(signedTxCbor);
     const txHash = await client.submitTx(signedTx);
     
     console.log("Transaction submitted:", txHash);
@@ -165,7 +165,7 @@ export async function handleSubmission(
     
     return {
       success: true,
-      txHash: Core.TransactionHash.toHex(txHash),
+      txHash: TransactionHash.toHex(txHash),
       confirmed
     };
   } catch (error: any) {
@@ -211,7 +211,7 @@ app.post("/api/submit", async (req, res) => {
 Track token distribution across holders:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, PoolKeyHash, RewardAddress, Transaction, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -242,7 +242,7 @@ export async function trackDistribution(
   let totalSupply = 0n;
   
   for (const addressBech32 of addresses) {
-    const address = Core.Address.fromBech32(addressBech32);
+    const address = Address.fromBech32(addressBech32);
     const utxos = await client.getUtxosWithUnit(address, tokenUnit);
     
     if (utxos.length > 0) {
@@ -277,7 +277,7 @@ export async function trackDistribution(
 Track NFT ownership and rarity:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, PoolKeyHash, RewardAddress, Transaction, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -310,8 +310,8 @@ export async function trackNFTCollection(
         return {
           tokenId: tokenName,
           unit,
-          owner: Core.Address.toBech32(utxo.address),
-          txHash: Core.TransactionHash.toHex(utxo.transactionId),
+          owner: Address.toBech32(utxo.address),
+          txHash: TransactionHash.toHex(utxo.transactionId),
           outputIndex: utxo.index
         };
       } catch (error) {
@@ -357,7 +357,7 @@ export async function getCollectionStats(
 Track delegators to a specific stake pool:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, PoolKeyHash, RewardAddress, Transaction, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -370,18 +370,18 @@ const client = createClient({
 
 interface Delegator {
   rewardAddress: string;
-  poolId: Core.PoolKeyHash.PoolKeyHash | null;
+  poolId: PoolKeyHash.PoolKeyHash | null;
   rewards: bigint;
 }
 
 export async function trackPoolDelegators(
   rewardAddresses: string[],
-  targetPoolId: Core.PoolKeyHash.PoolKeyHash
+  targetPoolId: PoolKeyHash.PoolKeyHash
 ): Promise<Delegator[]> {
   const delegators = await Promise.all(
     rewardAddresses.map(async (rewardAddress) => {
       try {
-        const delegation = await client.getDelegation(Core.RewardAddress.RewardAddress.make(rewardAddress));
+        const delegation = await client.getDelegation(RewardAddress.RewardAddress.make(rewardAddress));
         
         return {
           rewardAddress,
@@ -396,14 +396,14 @@ export async function trackPoolDelegators(
   
   // Filter to only target pool delegators
   return delegators.filter(
-    (d) => d !== null && d.poolId !== null && Core.PoolKeyHash.toHex(d.poolId) === Core.PoolKeyHash.toHex(targetPoolId)
+    (d) => d !== null && d.poolId !== null && PoolKeyHash.toHex(d.poolId) === PoolKeyHash.toHex(targetPoolId)
   ) as Delegator[];
 }
 
 // Get pool statistics
 export async function getPoolStats(
   rewardAddresses: string[],
-  targetPoolId: Core.PoolKeyHash.PoolKeyHash
+  targetPoolId: PoolKeyHash.PoolKeyHash
 ) {
   const delegators = await trackPoolDelegators(
     rewardAddresses,
@@ -428,7 +428,7 @@ export async function getPoolStats(
 Monitor network parameters for changes:
 
 ```typescript twoslash
-import { createClient } from "@evolution-sdk/evolution";
+import { Address, PoolKeyHash, RewardAddress, Transaction, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "mainnet",
@@ -514,12 +514,12 @@ export class ParameterMonitor {
 Implement provider failover for reliability:
 
 ```typescript twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, PoolKeyHash, RewardAddress, Transaction, TransactionHash, createClient } from "@evolution-sdk/evolution";
 
 // Type for clients with common provider methods
 interface ProviderClient {
-  getUtxos: (address: Core.Address.Address) => Promise<any>;
-  submitTx: (tx: Core.Transaction.Transaction) => Promise<Core.TransactionHash.TransactionHash>;
+  getUtxos: (address: Address.Address) => Promise<any>;
+  submitTx: (tx: Transaction.Transaction) => Promise<TransactionHash.TransactionHash>;
   getProtocolParameters: () => Promise<any>;
 }
 
@@ -565,11 +565,11 @@ class ProviderWithFallback {
     throw lastError;
   }
   
-  async getUtxos(address: Core.Address.Address) {
+  async getUtxos(address: Address.Address) {
     return this.withFallback((client) => client.getUtxos(address));
   }
   
-  async submitTx(tx: Core.Transaction.Transaction) {
+  async submitTx(tx: Transaction.Transaction) {
     return this.withFallback((client) => client.submitTx(tx));
   }
   
@@ -600,7 +600,7 @@ const resilientProvider = new ProviderWithFallback([
   }
 ]);
 
-const address = Core.Address.fromBech32("addr1qxy8sclc58rsck0pzsc0v4skmqjwuqsqpwfcvrdldl5sjvvhyltp7fk0fmtmrlnykgmhnzcns2msa2cmpvllzgqd2azqhpv8e4");
+const address = Address.fromBech32("addr1qxy8sclc58rsck0pzsc0v4skmqjwuqsqpwfcvrdldl5sjvvhyltp7fk0fmtmrlnykgmhnzcns2msa2cmpvllzgqd2azqhpv8e4");
 const utxos = await resilientProvider.getUtxos(address);
 ```
 
diff --git a/docs/content/docs/transactions/first-transaction.mdx b/docs/content/docs/transactions/first-transaction.mdx
index 55dba42d..f1d93808 100644
--- a/docs/content/docs/transactions/first-transaction.mdx
+++ b/docs/content/docs/transactions/first-transaction.mdx
@@ -14,7 +14,7 @@ This guide walks through a complete payment transaction from client setup to on-
 Here's a full transaction workflow—configure once, then build, sign, and submit:
 
 ```ts twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, createClient } from "@evolution-sdk/evolution";
 
 // 1. Configure your client
 const client = createClient({
@@ -35,8 +35,8 @@ const client = createClient({
 const tx = await client
   .newTx()
   .payToAddress({
-    address: Core.Address.fromBech32("addr_test1vrm9x2dgvdau8vckj4duc89m638t8djmluqw5pdrFollw8qd9k63"),
-    assets: Core.Assets.fromLovelace(2_000_000n)
+    address: Address.fromBech32("addr_test1vrm9x2dgvdau8vckj4duc89m638t8djmluqw5pdrFollw8qd9k63"),
+    assets: Assets.fromLovelace(2_000_000n)
   })
   .build();
 
@@ -54,7 +54,7 @@ console.log("Transaction submitted:", txHash);
 
 Set up your connection to the network. This happens once—you'll reuse the client throughout your application:
 ```ts twoslash
-import { createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "preprod",
@@ -76,7 +76,7 @@ const client = createClient({
 Chain operations to specify what the transaction should do. Call `.build()` when ready to finalize:
 
 ```ts twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "preprod",
@@ -86,8 +86,8 @@ const client = createClient({
 
 const tx = await client.newTx()
   .payToAddress({
-    address: Core.Address.fromBech32("addr_test1vrm9x2dgvdau8vckj4duc89m638t8djmluqw5pdrFollw8qd9k63"),
-    assets: Core.Assets.fromLovelace(2_000_000n)
+    address: Address.fromBech32("addr_test1vrm9x2dgvdau8vckj4duc89m638t8djmluqw5pdrFollw8qd9k63"),
+    assets: Assets.fromLovelace(2_000_000n)
   })
   .build();
 ```
@@ -99,7 +99,7 @@ The builder handles UTxO selection, fee calculation, and change outputs automati
 Authorize the transaction with your wallet's private keys:
 
 ```ts twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "preprod",
@@ -108,7 +108,7 @@ const client = createClient({
 });
 
 const tx = await client.newTx()
-  .payToAddress({ address: Core.Address.fromBech32("addr_test1vrm9x2dgvdau8vckj4duc89m638t8djmluqw5pdrFollw8qd9k63"), assets: Core.Assets.fromLovelace(2_000_000n) })
+  .payToAddress({ address: Address.fromBech32("addr_test1vrm9x2dgvdau8vckj4duc89m638t8djmluqw5pdrFollw8qd9k63"), assets: Assets.fromLovelace(2_000_000n) })
   .build();
 
 const signed = await tx.sign();
@@ -119,7 +119,7 @@ const signed = await tx.sign();
 Broadcast the signed transaction to the blockchain and get the transaction hash:
 
 ```ts twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "preprod",
@@ -128,7 +128,7 @@ const client = createClient({
 });
 
 const tx = await client.newTx()
-  .payToAddress({ address: Core.Address.fromBech32("addr_test1vrm9x2dgvdau8vckj4duc89m638t8djmluqw5pdrFollw8qd9k63"), assets: Core.Assets.fromLovelace(2_000_000n) })
+  .payToAddress({ address: Address.fromBech32("addr_test1vrm9x2dgvdau8vckj4duc89m638t8djmluqw5pdrFollw8qd9k63"), assets: Assets.fromLovelace(2_000_000n) })
   .build();
 
 const signed = await tx.sign();
diff --git a/docs/content/docs/transactions/simple-payment.mdx b/docs/content/docs/transactions/simple-payment.mdx
index be14772a..70e07a88 100644
--- a/docs/content/docs/transactions/simple-payment.mdx
+++ b/docs/content/docs/transactions/simple-payment.mdx
@@ -14,7 +14,7 @@ This guide covers common payment patterns—from basic ADA transfers to payments
 The simplest transaction sends only lovelace (ADA's smallest unit). 1 ADA = 1,000,000 lovelace:
 
 ```ts twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "preprod",
@@ -34,8 +34,8 @@ const client = createClient({
 const tx = await client
   .newTx()
   .payToAddress({
-    address: Core.Address.fromBech32("addr_test1vrm9x2dgvdau8vckj4duc89m638t8djmluqw5pdrFollw8qd9k63"),
-    assets: Core.Assets.fromLovelace(2_000_000n)
+    address: Address.fromBech32("addr_test1vrm9x2dgvdau8vckj4duc89m638t8djmluqw5pdrFollw8qd9k63"),
+    assets: Assets.fromLovelace(2_000_000n)
   })
   .build();
 
@@ -66,7 +66,7 @@ console.log(lovelace); // 2500000n
 Include native tokens (custom tokens or NFTs) alongside ADA. The `assets` object takes any asset by its policy ID + asset name:
 
 ```ts twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "preprod",
@@ -85,13 +85,13 @@ const client = createClient({
 // Send 2 ADA plus 100 tokens
 const policyId = "7edb7a2d9fbc4d2a68e4c9e9d3d7a5c8f2d1e9f8a7b6c5d4e3f2a1b0c9d8e7f6";
 const assetName = ""; // empty for fungible tokens
-let assets = Core.Assets.fromLovelace(2_000_000n);
-assets = Core.Assets.addByHex(assets, policyId, assetName, 100n);
+let assets = Assets.fromLovelace(2_000_000n);
+assets = Assets.addByHex(assets, policyId, assetName, 100n);
 
 const tx = await client
   .newTx()
   .payToAddress({
-    address: Core.Address.fromBech32("addr_test1vrm9x2dgvdau8vckj4duc89m638t8djmluqw5pdrFollw8qd9k63"),
+    address: Address.fromBech32("addr_test1vrm9x2dgvdau8vckj4duc89m638t8djmluqw5pdrFollw8qd9k63"),
     assets
   })
   .build();
@@ -109,7 +109,7 @@ The policy ID + asset name is concatenated into a single hex string.
 Make your code more readable with descriptive variable names:
 
 ```ts twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "preprod",
@@ -118,14 +118,14 @@ const client = createClient({
 });
 
 // ---cut---
-const recipientAddress = Core.Address.fromBech32("addr_test1vrm9x2dgvdau8vckj4duc89m638t8djmluqw5pdrFollw8qd9k63");
+const recipientAddress = Address.fromBech32("addr_test1vrm9x2dgvdau8vckj4duc89m638t8djmluqw5pdrFollw8qd9k63");
 const paymentAmount = 5_000_000n;  // 5 ADA
 
 const tx = await client
   .newTx()
   .payToAddress({
     address: recipientAddress,
-    assets: Core.Assets.fromLovelace(paymentAmount)
+    assets: Assets.fromLovelace(paymentAmount)
   })
   .build();
 ```
@@ -135,7 +135,7 @@ const tx = await client
 Adjust transaction values based on network or configuration:
 
 ```ts twoslash
-import { Core, createClient } from "@evolution-sdk/evolution";
+import { Address, Assets, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "preprod",
@@ -150,8 +150,8 @@ const amount = isMainnet ? 5_000_000n : 1_000_000n;
 const tx = await client
   .newTx()
   .payToAddress({
-    address: Core.Address.fromBech32("addr_test1vrm9x2dgvdau8vckj4duc89m638t8djmluqw5pdrFollw8qd9k63"),
-    assets: Core.Assets.fromLovelace(amount)
+    address: Address.fromBech32("addr_test1vrm9x2dgvdau8vckj4duc89m638t8djmluqw5pdrFollw8qd9k63"),
+    assets: Assets.fromLovelace(amount)
   })
   .build();
 ```
diff --git a/docs/content/docs/wallets/seed-phrase.mdx b/docs/content/docs/wallets/seed-phrase.mdx
index 7a3cc9af..f1d1c0a8 100644
--- a/docs/content/docs/wallets/seed-phrase.mdx
+++ b/docs/content/docs/wallets/seed-phrase.mdx
@@ -36,10 +36,10 @@ Mnemonics provide human-friendly backup and recovery. The same 24 words reconstr
 Use the SDK to generate a cryptographically secure 24-word mnemonic:
 
 ```typescript twoslash
-import { Core } from "@evolution-sdk/evolution";
+import { PrivateKey } from "@evolution-sdk/evolution";
 
 // Generate 24-word mnemonic (256-bit entropy)
-const mnemonic = Core.PrivateKey.generateMnemonic();
+const mnemonic = PrivateKey.generateMnemonic();
 console.log(mnemonic);
 // Example output: "abandon abandon abandon ... art art art"
 ```
@@ -48,7 +48,7 @@ console.log(mnemonic);
 ## Basic Setup
 
 ```typescript twoslash
-import { createClient } from "@evolution-sdk/evolution";
+import { PrivateKey, createClient } from "@evolution-sdk/evolution";
 
 // Create a signing-only client with seed wallet (no provider)
 // Can sign transactions but cannot query blockchain or submit
@@ -84,7 +84,7 @@ interface SeedWalletConfig {
 Different networks use the same wallet configuration—just change the network parameter:
 
 ```typescript twoslash
-import { createClient } from "@evolution-sdk/evolution";
+import { PrivateKey, createClient } from "@evolution-sdk/evolution";
 
 // Testnet client
 const testClient = createClient({
@@ -116,7 +116,7 @@ BLOCKFROST_PROJECT_ID="preprodYourProjectIdHere"
 ```
 
 ```typescript twoslash
-import { createClient } from "@evolution-sdk/evolution";
+import { PrivateKey, createClient } from "@evolution-sdk/evolution";
 
 const client = createClient({
   network: "preprod",
@@ -133,7 +133,7 @@ const client = createClient({
 Generate independent wallets from the same mnemonic using different `accountIndex` values:
 
 ```typescript twoslash
-import { createClient } from "@evolution-sdk/evolution";
+import { PrivateKey, createClient } from "@evolution-sdk/evolution";
 
 // Account 0 (default)
 const account0 = createClient({
@@ -165,7 +165,7 @@ console.log("Different addresses:", addr0 !== addr1); // true
 ### Development Testing
 
 ```typescript twoslash
-import { createClient } from "@evolution-sdk/evolution";
+import { PrivateKey, createClient } from "@evolution-sdk/evolution";
 
 // Mock test runner functions for documentation
 declare function describe(name: string, fn: () => void): void;
diff --git a/packages/aiken-uplc/src/Evaluator.ts b/packages/aiken-uplc/src/Evaluator.ts
index cb915cf4..86228ae4 100644
--- a/packages/aiken-uplc/src/Evaluator.ts
+++ b/packages/aiken-uplc/src/Evaluator.ts
@@ -4,17 +4,17 @@
  * @packageDocumentation
  */
 
-import * as Bytes from "@evolution-sdk/evolution/core/Bytes"
-import * as CBOR from "@evolution-sdk/evolution/core/CBOR"
-import * as Redeemer from "@evolution-sdk/evolution/core/Redeemer"
-import * as Script from "@evolution-sdk/evolution/core/Script"
-import * as ScriptRef from "@evolution-sdk/evolution/core/ScriptRef"
-import * as Transaction from "@evolution-sdk/evolution/core/Transaction"
-import * as TransactionInput from "@evolution-sdk/evolution/core/TransactionInput"
-import * as TxOut from "@evolution-sdk/evolution/core/TxOut"
-import type * as UTxO from "@evolution-sdk/evolution/core/UTxO"
+import * as Bytes from "@evolution-sdk/evolution/Bytes"
+import * as CBOR from "@evolution-sdk/evolution/CBOR"
+import * as Redeemer from "@evolution-sdk/evolution/Redeemer"
+import * as Script from "@evolution-sdk/evolution/Script"
+import * as ScriptRef from "@evolution-sdk/evolution/ScriptRef"
 import * as TransactionBuilder from "@evolution-sdk/evolution/sdk/builders/TransactionBuilder"
 import type * as EvalRedeemer from "@evolution-sdk/evolution/sdk/EvalRedeemer"
+import * as Transaction from "@evolution-sdk/evolution/Transaction"
+import * as TransactionInput from "@evolution-sdk/evolution/TransactionInput"
+import * as TxOut from "@evolution-sdk/evolution/TxOut"
+import type * as UTxO from "@evolution-sdk/evolution/UTxO"
 import { Effect } from "effect"
 
 import type * as WasmLoader from "./WasmLoader.js"
diff --git a/packages/evolution-devnet/src/Genesis.ts b/packages/evolution-devnet/src/Genesis.ts
index 9dad46fb..63175816 100644
--- a/packages/evolution-devnet/src/Genesis.ts
+++ b/packages/evolution-devnet/src/Genesis.ts
@@ -1,6 +1,8 @@
-import { Core } from "@evolution-sdk/evolution"
-import * as AddressEras from "@evolution-sdk/evolution/core/AddressEras"
-import * as TransactionHash from "@evolution-sdk/evolution/core/TransactionHash"
+import * as Address from "@evolution-sdk/evolution/Address"
+import * as AddressEras from "@evolution-sdk/evolution/AddressEras"
+import * as Assets from "@evolution-sdk/evolution/Assets"
+import * as TransactionHash from "@evolution-sdk/evolution/TransactionHash"
+import * as UTxO from "@evolution-sdk/evolution/UTxO"
 import { blake2b } from "@noble/hashes/blake2"
 import { Data, Effect } from "effect"
 
@@ -59,15 +61,15 @@ export interface Cluster {
  */
 export const calculateUtxosFromConfigEffect = (
   genesisConfig: Config.ShelleyGenesis
-): Effect.Effect<ReadonlyArray<Core.UTxO.UTxO>, GenesisError> =>
+): Effect.Effect<ReadonlyArray<UTxO.UTxO>, GenesisError> =>
   Effect.gen(function* () {
-    const utxos: Array<Core.UTxO.UTxO> = []
+    const utxos: Array<UTxO.UTxO> = []
     const fundEntries = Object.entries(genesisConfig.initialFunds)
 
     for (const [addressHex, lovelace] of fundEntries) {
-      // Convert hex address to Core Address
+      // Convert hex address to Address
       const address = yield* Effect.try({
-        try: () => Core.Address.fromHex(addressHex),
+        try: () => Address.fromHex(addressHex),
         catch: (e) =>
           new GenesisError({
             reason: "address_conversion_failed",
@@ -84,11 +86,11 @@ export const calculateUtxosFromConfigEffect = (
       const transactionId = new TransactionHash.TransactionHash({ hash: txHashBytes })
 
       utxos.push(
-        new Core.UTxO.UTxO({
+        new UTxO.UTxO({
           transactionId,
           index: 0n, // Genesis UTxOs always use index 0 (minBound in Haskell)
           address,
-          assets: Core.Assets.fromLovelace(BigInt(lovelace))
+          assets: Assets.fromLovelace(BigInt(lovelace))
         })
       )
     }
@@ -112,7 +114,7 @@ export const calculateUtxosFromConfig = (genesisConfig: Config.ShelleyGenesis) =
  * @since 2.0.0
  * @category genesis
  */
-export const queryUtxosEffect = (cluster: Cluster): Effect.Effect<ReadonlyArray<Core.UTxO.UTxO>, GenesisError> =>
+export const queryUtxosEffect = (cluster: Cluster): Effect.Effect<ReadonlyArray<UTxO.UTxO>, GenesisError> =>
   Effect.gen(function* () {
     // Need to import Container functions dynamically to avoid circular dependency
     const ContainerModule = yield* Effect.promise(() => import("./Container.js"))
@@ -153,12 +155,12 @@ export const queryUtxosEffect = (cluster: Cluster): Effect.Effect<ReadonlyArray<
     return Object.entries(parsed).map(([key, data]) => {
       const [txHashHex, outputIndex] = key.split("#")
       const transactionId = TransactionHash.fromHex(txHashHex)
-      const address = Core.Address.fromBech32(data.address)
-      return new Core.UTxO.UTxO({
+      const address = Address.fromBech32(data.address)
+      return new UTxO.UTxO({
         transactionId,
         index: BigInt(parseInt(outputIndex)),
         address,
-        assets: Core.Assets.fromLovelace(BigInt(data.value.lovelace))
+        assets: Assets.fromLovelace(BigInt(data.value.lovelace))
       })
     })
   })
diff --git a/packages/evolution-devnet/test/Client.Devnet.test.ts b/packages/evolution-devnet/test/Client.Devnet.test.ts
index f1c2a299..39b1bd80 100644
--- a/packages/evolution-devnet/test/Client.Devnet.test.ts
+++ b/packages/evolution-devnet/test/Client.Devnet.test.ts
@@ -2,21 +2,21 @@ import { describe, expect, it } from "@effect/vitest"
 import * as Cluster from "@evolution-sdk/devnet/Cluster"
 import * as Config from "@evolution-sdk/devnet/Config"
 import * as Genesis from "@evolution-sdk/devnet/Genesis"
-import { Core } from "@evolution-sdk/evolution"
-import * as CoreAddress from "@evolution-sdk/evolution/core/Address"
+import { Cardano } from "@evolution-sdk/evolution"
+import * as CoreAddress from "@evolution-sdk/evolution/Address"
 import { createClient } from "@evolution-sdk/evolution/sdk/client/ClientImpl"
 import type { ProtocolParameters } from "@evolution-sdk/evolution/sdk/ProtocolParameters"
 import { afterAll, beforeAll } from "vitest"
 
-// Alias for Core.Assets
-const CoreAssets = Core.Assets
+// Alias for Cardano.Assets
+const CoreAssets = Cardano.Assets
 
 /**
  * Client integration tests with local Devnet
  */
 describe("Client with Devnet", () => {
   let devnetCluster: Cluster.Cluster | undefined
-  let genesisUtxos: Array<Core.UTxO.UTxO> = []
+  let genesisUtxos: Array<Cardano.UTxO.UTxO> = []
   let genesisConfig: Config.ShelleyGenesis
 
   const TEST_MNEMONIC =
@@ -81,7 +81,7 @@ describe("Client with Devnet", () => {
 
     const utxo = calculatedUtxos[0]
     expect(utxo.transactionId).toBeDefined()
-    expect(Core.TransactionHash.toHex(utxo.transactionId).length).toBe(64)
+    expect(Cardano.TransactionHash.toHex(utxo.transactionId).length).toBe(64)
     expect(utxo.index).toBe(0n)
     expect(CoreAddress.toBech32(utxo.address)).toMatch(/^addr_test/)
     expect(utxo.assets.lovelace).toBe(900_000_000_000n)
@@ -149,7 +149,7 @@ describe("Client with Devnet", () => {
     expect(submitBuilder.witnessSet.vkeyWitnesses).toBeDefined()
 
     const txHash = await submitBuilder.submit()
-    expect(Core.TransactionHash.toHex(txHash).length).toBe(64)
+    expect(Cardano.TransactionHash.toHex(txHash).length).toBe(64)
 
     const confirmed = await client.awaitTx(txHash, 1000)
     expect(confirmed).toBe(true)
diff --git a/packages/evolution-devnet/test/Devnet.Genesis.test.ts b/packages/evolution-devnet/test/Devnet.Genesis.test.ts
index 70832038..0fe2c369 100644
--- a/packages/evolution-devnet/test/Devnet.Genesis.test.ts
+++ b/packages/evolution-devnet/test/Devnet.Genesis.test.ts
@@ -2,8 +2,8 @@ import { describe, expect, it } from "@effect/vitest"
 import * as Cluster from "@evolution-sdk/devnet/Cluster"
 import * as Config from "@evolution-sdk/devnet/Config"
 import * as Genesis from "@evolution-sdk/devnet/Genesis"
-import { Core } from "@evolution-sdk/evolution"
-import * as CoreAddress from "@evolution-sdk/evolution/core/Address"
+import { Cardano } from "@evolution-sdk/evolution"
+import * as CoreAddress from "@evolution-sdk/evolution/Address"
 import { afterAll, beforeAll } from "vitest"
 
 /**
@@ -53,7 +53,7 @@ describe("Devnet.Genesis", () => {
     
     const utxo = utxos[0]
     expect(utxo.transactionId).toBeDefined()
-    expect(Core.TransactionHash.toHex(utxo.transactionId).length).toBe(64)
+    expect(Cardano.TransactionHash.toHex(utxo.transactionId).length).toBe(64)
     expect(utxo.index).toBe(0n)
     expect(CoreAddress.toBech32(utxo.address)).toMatch(/^addr_test/)
     expect(utxo.assets).toBeDefined()
@@ -69,7 +69,7 @@ describe("Devnet.Genesis", () => {
     
     const utxo = utxos[0]
     expect(utxo.transactionId).toBeDefined()
-    expect(Core.TransactionHash.toHex(utxo.transactionId).length).toBe(64)
+    expect(Cardano.TransactionHash.toHex(utxo.transactionId).length).toBe(64)
     expect(utxo.index).toBe(0n)
     expect(CoreAddress.toBech32(utxo.address)).toMatch(/^addr_test/)
     expect(utxo.assets).toBeDefined()
@@ -84,7 +84,7 @@ describe("Devnet.Genesis", () => {
     expect(calculated.length).toBe(queried.length)
 
     for (let i = 0; i < calculated.length; i++) {
-      expect(Core.TransactionHash.toHex(calculated[i].transactionId)).toBe(Core.TransactionHash.toHex(queried[i].transactionId))
+      expect(Cardano.TransactionHash.toHex(calculated[i].transactionId)).toBe(Cardano.TransactionHash.toHex(queried[i].transactionId))
       expect(calculated[i].index).toBe(queried[i].index)
       expect(CoreAddress.toBech32(calculated[i].address)).toBe(CoreAddress.toBech32(queried[i].address))
       expect(calculated[i].assets.lovelace).toEqual(queried[i].assets.lovelace)
@@ -120,9 +120,9 @@ describe("Devnet.Genesis", () => {
     expect(utxos[2].index).toBe(0n)
 
     // Each address gets unique pseudo-TxId
-    const txHash0 = Core.TransactionHash.toHex(utxos[0].transactionId)
-    const txHash1 = Core.TransactionHash.toHex(utxos[1].transactionId)
-    const txHash2 = Core.TransactionHash.toHex(utxos[2].transactionId)
+    const txHash0 = Cardano.TransactionHash.toHex(utxos[0].transactionId)
+    const txHash1 = Cardano.TransactionHash.toHex(utxos[1].transactionId)
+    const txHash2 = Cardano.TransactionHash.toHex(utxos[2].transactionId)
     expect(txHash0).not.toBe(txHash1)
     expect(txHash1).not.toBe(txHash2)
     expect(txHash0).not.toBe(txHash2)
diff --git a/packages/evolution-devnet/test/Devnet.integration.test.ts b/packages/evolution-devnet/test/Devnet.integration.test.ts
index cfaa8d0d..6eca2970 100644
--- a/packages/evolution-devnet/test/Devnet.integration.test.ts
+++ b/packages/evolution-devnet/test/Devnet.integration.test.ts
@@ -1,11 +1,11 @@
 import { afterAll, describe, expect, it } from "@effect/vitest"
 import * as Cluster from "@evolution-sdk/devnet/Cluster"
 import * as Container from "@evolution-sdk/devnet/Container"
-import * as AddressEras from "@evolution-sdk/evolution/core/AddressEras"
-import * as EnterpriseAddress from "@evolution-sdk/evolution/core/EnterpriseAddress"
-import * as KeyHash from "@evolution-sdk/evolution/core/KeyHash"
-import * as PrivateKey from "@evolution-sdk/evolution/core/PrivateKey"
-import * as VKey from "@evolution-sdk/evolution/core/VKey"
+import * as AddressEras from "@evolution-sdk/evolution/AddressEras"
+import * as EnterpriseAddress from "@evolution-sdk/evolution/EnterpriseAddress"
+import * as KeyHash from "@evolution-sdk/evolution/KeyHash"
+import * as PrivateKey from "@evolution-sdk/evolution/PrivateKey"
+import * as VKey from "@evolution-sdk/evolution/VKey"
 import Docker from "dockerode"
 import { Effect } from "effect"
 
diff --git a/packages/evolution-devnet/test/TxBuilder.AddSigner.test.ts b/packages/evolution-devnet/test/TxBuilder.AddSigner.test.ts
index 5413c568..60fcb3f0 100644
--- a/packages/evolution-devnet/test/TxBuilder.AddSigner.test.ts
+++ b/packages/evolution-devnet/test/TxBuilder.AddSigner.test.ts
@@ -9,16 +9,16 @@ import { afterAll, beforeAll, describe, expect, it } from "@effect/vitest"
 import * as Cluster from "@evolution-sdk/devnet/Cluster"
 import * as Config from "@evolution-sdk/devnet/Config"
 import * as Genesis from "@evolution-sdk/devnet/Genesis"
-import { Core } from "@evolution-sdk/evolution"
-import * as Address from "@evolution-sdk/evolution/core/Address"
-import * as KeyHash from "@evolution-sdk/evolution/core/KeyHash"
-import * as TransactionHash from "@evolution-sdk/evolution/core/TransactionHash"
+import { Cardano } from "@evolution-sdk/evolution"
+import * as Address from "@evolution-sdk/evolution/Address"
+import * as KeyHash from "@evolution-sdk/evolution/KeyHash"
 import { createClient } from "@evolution-sdk/evolution/sdk/client/ClientImpl"
+import * as TransactionHash from "@evolution-sdk/evolution/TransactionHash"
 
 describe("TxBuilder addSigner (Devnet Submit)", () => {
   let devnetCluster: Cluster.Cluster | undefined
   let genesisConfig: Config.ShelleyGenesis
-  let genesisUtxos: ReadonlyArray<Core.UTxO.UTxO> = []
+  let genesisUtxos: ReadonlyArray<Cardano.UTxO.UTxO> = []
 
   const TEST_MNEMONIC =
     "test test test test test test test test test test test test test test test test test test test test test test test sauce"
@@ -96,7 +96,7 @@ describe("TxBuilder addSigner (Devnet Submit)", () => {
       .addSigner({ keyHash: paymentCredential })
       .payToAddress({
         address: myAddress,
-        assets: Core.Assets.fromLovelace(5_000_000n)
+        assets: Cardano.Assets.fromLovelace(5_000_000n)
       })
       .build({ availableUtxos: [...genesisUtxos] })
 
@@ -145,7 +145,7 @@ describe("TxBuilder addSigner (Devnet Submit)", () => {
       .addSigner({ keyHash: credential2 })
       .payToAddress({
         address: address1,
-        assets: Core.Assets.fromLovelace(5_000_000n)
+        assets: Cardano.Assets.fromLovelace(5_000_000n)
       })
       .build({ availableUtxos: [...freshUtxos] })
 
diff --git a/packages/evolution-devnet/test/TxBuilder.Chain.test.ts b/packages/evolution-devnet/test/TxBuilder.Chain.test.ts
index 0f83d0ff..7e8bba02 100644
--- a/packages/evolution-devnet/test/TxBuilder.Chain.test.ts
+++ b/packages/evolution-devnet/test/TxBuilder.Chain.test.ts
@@ -2,16 +2,16 @@ import { afterAll, beforeAll, describe, expect, it } from "@effect/vitest"
 import * as Cluster from "@evolution-sdk/devnet/Cluster"
 import * as Config from "@evolution-sdk/devnet/Config"
 import * as Genesis from "@evolution-sdk/devnet/Genesis"
-import { Core } from "@evolution-sdk/evolution"
-import * as Address from "@evolution-sdk/evolution/core/Address"
-import * as TransactionHash from "@evolution-sdk/evolution/core/TransactionHash"
+import { Cardano } from "@evolution-sdk/evolution"
+import * as Address from "@evolution-sdk/evolution/Address"
 import type { SignBuilder } from "@evolution-sdk/evolution/sdk/builders/SignBuilder"
 import { createClient } from "@evolution-sdk/evolution/sdk/client/ClientImpl"
+import * as TransactionHash from "@evolution-sdk/evolution/TransactionHash"
 
 describe("TxBuilder.chainResult", () => {
   let devnetCluster: Cluster.Cluster | undefined
   let genesisConfig: Config.ShelleyGenesis
-  let genesisUtxos: ReadonlyArray<Core.UTxO.UTxO> = []
+  let genesisUtxos: ReadonlyArray<Cardano.UTxO.UTxO> = []
 
   const TEST_MNEMONIC =
     "test test test test test test test test test test test test test test test test test test test test test test test sauce"
@@ -86,7 +86,7 @@ describe("TxBuilder.chainResult", () => {
     for (let i = 0; i < TX_COUNT; i++) {
       const tx = await client
         .newTx()
-        .payToAddress({ address, assets: Core.Assets.fromLovelace(10_000_000n) })
+        .payToAddress({ address, assets: Cardano.Assets.fromLovelace(10_000_000n) })
         .build({ availableUtxos: available })
       txs.push(tx)
       available = [...tx.chainResult().available]
diff --git a/packages/evolution-devnet/test/TxBuilder.Compose.test.ts b/packages/evolution-devnet/test/TxBuilder.Compose.test.ts
index d7af0308..35eccc16 100644
--- a/packages/evolution-devnet/test/TxBuilder.Compose.test.ts
+++ b/packages/evolution-devnet/test/TxBuilder.Compose.test.ts
@@ -9,17 +9,17 @@ import { afterAll, beforeAll, describe, expect, it } from "@effect/vitest"
 import * as Cluster from "@evolution-sdk/devnet/Cluster"
 import * as Config from "@evolution-sdk/devnet/Config"
 import * as Genesis from "@evolution-sdk/devnet/Genesis"
-import { Core } from "@evolution-sdk/evolution"
-import * as Address from "@evolution-sdk/evolution/core/Address"
+import { Cardano } from "@evolution-sdk/evolution"
+import * as Address from "@evolution-sdk/evolution/Address"
 import { createClient } from "@evolution-sdk/evolution/sdk/client/ClientImpl"
 
 // Alias for readability
-const Time = Core.Time
+const Time = Cardano.Time
 
 describe("TxBuilder compose (Devnet Submit)", () => {
   let devnetCluster: Cluster.Cluster | undefined
   let genesisConfig: Config.ShelleyGenesis
-  let genesisUtxos: ReadonlyArray<Core.UTxO.UTxO> = []
+  let genesisUtxos: ReadonlyArray<Cardano.UTxO.UTxO> = []
 
   const TEST_MNEMONIC =
     "test test test test test test test test test test test test test test test test test test test test test test test sauce"
@@ -89,7 +89,7 @@ describe("TxBuilder compose (Devnet Submit)", () => {
     // Create a payment builder
     const paymentBuilder = client.newTx().payToAddress({
       address: myAddress,
-      assets: Core.Assets.fromLovelace(5_000_000n)
+      assets: Cardano.Assets.fromLovelace(5_000_000n)
     })
 
     // Create a validity builder
@@ -113,7 +113,7 @@ describe("TxBuilder compose (Devnet Submit)", () => {
     // Submit and confirm
     const submitBuilder = await signBuilder.sign()
     const txHash = await submitBuilder.submit()
-    expect(Core.TransactionHash.toHex(txHash).length).toBe(64)
+    expect(Cardano.TransactionHash.toHex(txHash).length).toBe(64)
 
     const confirmed = await client.awaitTx(txHash, 1000)
     expect(confirmed).toBe(true)
@@ -129,17 +129,17 @@ describe("TxBuilder compose (Devnet Submit)", () => {
     // Create separate payment builders for different addresses
     const payment1 = client1.newTx().payToAddress({
       address: address1,
-      assets: Core.Assets.fromLovelace(3_000_000n)
+      assets: Cardano.Assets.fromLovelace(3_000_000n)
     })
 
     const payment2 = client1.newTx().payToAddress({
       address: address2,
-      assets: Core.Assets.fromLovelace(2_000_000n)
+      assets: Cardano.Assets.fromLovelace(2_000_000n)
     })
 
     const payment3 = client1.newTx().payToAddress({
       address: address1,
-      assets: Core.Assets.fromLovelace(4_000_000n)
+      assets: Cardano.Assets.fromLovelace(4_000_000n)
     })
 
     // Compose all payments into single transaction
@@ -158,7 +158,7 @@ describe("TxBuilder compose (Devnet Submit)", () => {
     // Submit and confirm
     const submitBuilder = await signBuilder.sign()
     const txHash = await submitBuilder.submit()
-    expect(Core.TransactionHash.toHex(txHash).length).toBe(64)
+    expect(Cardano.TransactionHash.toHex(txHash).length).toBe(64)
 
     const confirmed = await client1.awaitTx(txHash, 1000)
     expect(confirmed).toBe(true)
@@ -184,7 +184,7 @@ describe("TxBuilder compose (Devnet Submit)", () => {
     
     const paymentBuilder = client.newTx().payToAddress({
       address: myAddress,
-      assets: Core.Assets.fromLovelace(6_000_000n)
+      assets: Cardano.Assets.fromLovelace(6_000_000n)
     })
 
     // Compose all together
@@ -205,7 +205,7 @@ describe("TxBuilder compose (Devnet Submit)", () => {
     // Submit and confirm
     const submitBuilder = await signBuilder.sign()
     const txHash = await submitBuilder.submit()
-    expect(Core.TransactionHash.toHex(txHash).length).toBe(64)
+    expect(Cardano.TransactionHash.toHex(txHash).length).toBe(64)
 
     const confirmed = await client.awaitTx(txHash, 1000)
     expect(confirmed).toBe(true)
@@ -227,7 +227,7 @@ describe("TxBuilder compose (Devnet Submit)", () => {
     
     const paymentBuilder = client.newTx().payToAddress({
       address: myAddress,
-      assets: Core.Assets.fromLovelace(10_000_000n)
+      assets: Cardano.Assets.fromLovelace(10_000_000n)
     })
     
     const metadataBuilder = client.newTx().attachMetadata({
@@ -254,7 +254,7 @@ describe("TxBuilder compose (Devnet Submit)", () => {
     // Submit and confirm
     const submitBuilder = await signBuilder.sign()
     const txHash = await submitBuilder.submit()
-    expect(Core.TransactionHash.toHex(txHash).length).toBe(64)
+    expect(Cardano.TransactionHash.toHex(txHash).length).toBe(64)
 
     const confirmed = await client.awaitTx(txHash, 1000)
     expect(confirmed).toBe(true)
@@ -269,7 +269,7 @@ describe("TxBuilder compose (Devnet Submit)", () => {
       .newTx()
       .payToAddress({
         address: myAddress,
-        assets: Core.Assets.fromLovelace(1_000_000n)
+        assets: Cardano.Assets.fromLovelace(1_000_000n)
       })
       .attachMetadata({
         label: 1n,
@@ -286,7 +286,7 @@ describe("TxBuilder compose (Devnet Submit)", () => {
     // Add another operation
     builder.payToAddress({
       address: myAddress,
-      assets: Core.Assets.fromLovelace(2_000_000n)
+      assets: Cardano.Assets.fromLovelace(2_000_000n)
     })
 
     // Get programs again - should have 3 now
@@ -307,7 +307,7 @@ describe("TxBuilder compose (Devnet Submit)", () => {
     // Create builders from different clients
     const builder1 = client1.newTx().payToAddress({
       address: address1,
-      assets: Core.Assets.fromLovelace(5_000_000n)
+      assets: Cardano.Assets.fromLovelace(5_000_000n)
     })
 
     const builder2 = client2.newTx().attachMetadata({
@@ -322,7 +322,7 @@ describe("TxBuilder compose (Devnet Submit)", () => {
       .compose(builder2)
       .payToAddress({
         address: address2,
-        assets: Core.Assets.fromLovelace(3_000_000n)
+        assets: Cardano.Assets.fromLovelace(3_000_000n)
       })
       .build()
 
@@ -335,7 +335,7 @@ describe("TxBuilder compose (Devnet Submit)", () => {
     // Submit and confirm
     const submitBuilder = await signBuilder.sign()
     const txHash = await submitBuilder.submit()
-    expect(Core.TransactionHash.toHex(txHash).length).toBe(64)
+    expect(Cardano.TransactionHash.toHex(txHash).length).toBe(64)
 
     const confirmed = await client1.awaitTx(txHash, 1000)
     expect(confirmed).toBe(true)
diff --git a/packages/evolution-devnet/test/TxBuilder.Governance.test.ts b/packages/evolution-devnet/test/TxBuilder.Governance.test.ts
index 1dcca53f..c6501c29 100644
--- a/packages/evolution-devnet/test/TxBuilder.Governance.test.ts
+++ b/packages/evolution-devnet/test/TxBuilder.Governance.test.ts
@@ -7,21 +7,20 @@ import { afterAll, beforeAll, describe, expect, it } from "@effect/vitest"
 import * as Cluster from "@evolution-sdk/devnet/Cluster"
 import * as Config from "@evolution-sdk/devnet/Config"
 import * as Genesis from "@evolution-sdk/devnet/Genesis"
-import type { Core } from "@evolution-sdk/evolution"
-import * as Address from "@evolution-sdk/evolution/core/Address"
-import * as Anchor from "@evolution-sdk/evolution/core/Anchor"
-import * as Bytes from "@evolution-sdk/evolution/core/Bytes"
-import * as Bytes32 from "@evolution-sdk/evolution/core/Bytes32"
-import * as Credential from "@evolution-sdk/evolution/core/Credential"
-import * as KeyHash from "@evolution-sdk/evolution/core/KeyHash"
-import * as Url from "@evolution-sdk/evolution/core/Url"
+import * as Address from "@evolution-sdk/evolution/Address"
+import * as Anchor from "@evolution-sdk/evolution/Anchor"
+import * as Bytes from "@evolution-sdk/evolution/Bytes"
+import * as Bytes32 from "@evolution-sdk/evolution/Bytes32"
+import * as Credential from "@evolution-sdk/evolution/Credential"
+import * as KeyHash from "@evolution-sdk/evolution/KeyHash"
 import { createClient } from "@evolution-sdk/evolution/sdk/client/ClientImpl"
+import * as Url from "@evolution-sdk/evolution/Url"
 
 describe("TxBuilder Governance Operations", () => {
   let devnetCluster: Cluster.Cluster | undefined
   let genesisConfig: Config.ShelleyGenesis
   let conwayGenesis: Config.ConwayGenesis
-  const genesisUtxosByAccount: Map<number, Core.UTxO.UTxO> = new Map()
+  const genesisUtxosByAccount: Map<number, Cardano.UTxO.UTxO> = new Map()
 
   const TEST_MNEMONIC =
     "test test test test test test test test test test test test test test test test test test test test test test test sauce"
diff --git a/packages/evolution-devnet/test/TxBuilder.Metadata.test.ts b/packages/evolution-devnet/test/TxBuilder.Metadata.test.ts
index 0612a687..edd99e07 100644
--- a/packages/evolution-devnet/test/TxBuilder.Metadata.test.ts
+++ b/packages/evolution-devnet/test/TxBuilder.Metadata.test.ts
@@ -9,16 +9,16 @@ import { afterAll, beforeAll, describe, expect, it } from "@effect/vitest"
 import * as Cluster from "@evolution-sdk/devnet/Cluster"
 import * as Config from "@evolution-sdk/devnet/Config"
 import * as Genesis from "@evolution-sdk/devnet/Genesis"
-import { Core } from "@evolution-sdk/evolution"
-import * as Address from "@evolution-sdk/evolution/core/Address"
-import * as TransactionHash from "@evolution-sdk/evolution/core/TransactionHash"
-import { fromEntries } from "@evolution-sdk/evolution/core/TransactionMetadatum"
+import { Cardano } from "@evolution-sdk/evolution"
+import * as Address from "@evolution-sdk/evolution/Address"
 import { createClient } from "@evolution-sdk/evolution/sdk/client/ClientImpl"
+import * as TransactionHash from "@evolution-sdk/evolution/TransactionHash"
+import { fromEntries } from "@evolution-sdk/evolution/TransactionMetadatum"
 
 describe("TxBuilder attachMetadata (Devnet Submit)", () => {
   let devnetCluster: Cluster.Cluster | undefined
   let genesisConfig: Config.ShelleyGenesis
-  let genesisUtxos: ReadonlyArray<Core.UTxO.UTxO> = []
+  let genesisUtxos: ReadonlyArray<Cardano.UTxO.UTxO> = []
 
   const TEST_MNEMONIC =
     "test test test test test test test test test test test test test test test test test test test test test test test sauce"
@@ -93,7 +93,7 @@ describe("TxBuilder attachMetadata (Devnet Submit)", () => {
       })
       .payToAddress({
         address: myAddress,
-        assets: Core.Assets.fromLovelace(5_000_000n)
+        assets: Cardano.Assets.fromLovelace(5_000_000n)
       })
       .build({ availableUtxos: [...genesisUtxos] })
 
@@ -141,7 +141,7 @@ describe("TxBuilder attachMetadata (Devnet Submit)", () => {
       })
       .payToAddress({
         address: myAddress,
-        assets: Core.Assets.fromLovelace(5_000_000n)
+        assets: Cardano.Assets.fromLovelace(5_000_000n)
       })
       .build()
 
@@ -206,7 +206,7 @@ describe("TxBuilder attachMetadata (Devnet Submit)", () => {
       })
       .payToAddress({
         address: myAddress,
-        assets: Core.Assets.fromLovelace(5_000_000n)
+        assets: Cardano.Assets.fromLovelace(5_000_000n)
       })
       .build()
 
diff --git a/packages/evolution-devnet/test/TxBuilder.Mint.test.ts b/packages/evolution-devnet/test/TxBuilder.Mint.test.ts
index f6df0bb9..ba247682 100644
--- a/packages/evolution-devnet/test/TxBuilder.Mint.test.ts
+++ b/packages/evolution-devnet/test/TxBuilder.Mint.test.ts
@@ -2,17 +2,17 @@ import { afterAll, beforeAll, describe, expect, it } from "@effect/vitest"
 import * as Cluster from "@evolution-sdk/devnet/Cluster"
 import * as Config from "@evolution-sdk/devnet/Config"
 import * as Genesis from "@evolution-sdk/devnet/Genesis"
-import { Core } from "@evolution-sdk/evolution"
-import * as CoreAddress from "@evolution-sdk/evolution/core/Address"
-import * as AssetName from "@evolution-sdk/evolution/core/AssetName"
-import * as NativeScripts from "@evolution-sdk/evolution/core/NativeScripts"
-import * as PolicyId from "@evolution-sdk/evolution/core/PolicyId"
-import * as ScriptHash from "@evolution-sdk/evolution/core/ScriptHash"
-import * as Text from "@evolution-sdk/evolution/core/Text"
-import * as TransactionHash from "@evolution-sdk/evolution/core/TransactionHash"
+import { Cardano } from "@evolution-sdk/evolution"
+import * as CoreAddress from "@evolution-sdk/evolution/Address"
+import * as AssetName from "@evolution-sdk/evolution/AssetName"
+import * as NativeScripts from "@evolution-sdk/evolution/NativeScripts"
+import * as PolicyId from "@evolution-sdk/evolution/PolicyId"
+import * as ScriptHash from "@evolution-sdk/evolution/ScriptHash"
 import { createClient } from "@evolution-sdk/evolution/sdk/client/ClientImpl"
+import * as Text from "@evolution-sdk/evolution/Text"
+import * as TransactionHash from "@evolution-sdk/evolution/TransactionHash"
 
-const CoreAssets = Core.Assets
+const CoreAssets = Cardano.Assets
 
 describe("TxBuilder Minting (Devnet Submit)", () => {
   // ============================================================================
@@ -21,7 +21,7 @@ describe("TxBuilder Minting (Devnet Submit)", () => {
 
   let devnetCluster: Cluster.Cluster | undefined
   let genesisConfig: Config.ShelleyGenesis
-  let genesisUtxos: ReadonlyArray<Core.UTxO.UTxO> = []
+  let genesisUtxos: ReadonlyArray<Cardano.UTxO.UTxO> = []
   let nativeScript: NativeScripts.NativeScript
   let policyId: string
 
diff --git a/packages/evolution-devnet/test/TxBuilder.NativeScript.test.ts b/packages/evolution-devnet/test/TxBuilder.NativeScript.test.ts
index 70e95387..9d63add5 100644
--- a/packages/evolution-devnet/test/TxBuilder.NativeScript.test.ts
+++ b/packages/evolution-devnet/test/TxBuilder.NativeScript.test.ts
@@ -11,14 +11,14 @@ import { afterAll, beforeAll, describe, expect, it } from "@effect/vitest"
 import * as Cluster from "@evolution-sdk/devnet/Cluster"
 import * as Config from "@evolution-sdk/devnet/Config"
 import * as Genesis from "@evolution-sdk/devnet/Genesis"
-import { Core } from "@evolution-sdk/evolution"
-import * as Address from "@evolution-sdk/evolution/core/Address"
-import * as NativeScripts from "@evolution-sdk/evolution/core/NativeScripts"
-import * as ScriptHash from "@evolution-sdk/evolution/core/ScriptHash"
-import * as Text from "@evolution-sdk/evolution/core/Text"
-import * as TransactionHash from "@evolution-sdk/evolution/core/TransactionHash"
-import * as UTxO from "@evolution-sdk/evolution/core/UTxO"
+import { Cardano } from "@evolution-sdk/evolution"
+import * as Address from "@evolution-sdk/evolution/Address"
+import * as NativeScripts from "@evolution-sdk/evolution/NativeScripts"
+import * as ScriptHash from "@evolution-sdk/evolution/ScriptHash"
 import { createClient } from "@evolution-sdk/evolution/sdk/client/ClientImpl"
+import * as Text from "@evolution-sdk/evolution/Text"
+import * as TransactionHash from "@evolution-sdk/evolution/TransactionHash"
+import * as UTxO from "@evolution-sdk/evolution/UTxO"
 
 // Time utility functions (duplicated from core since Time module is not externally accessible)
 const now = (): bigint => BigInt(Date.now())
@@ -35,7 +35,7 @@ const slotToUnixTime = (slot: bigint, slotConfig: Cluster.SlotConfig): bigint =>
 describe("TxBuilder NativeScript (Devnet Submit)", () => {
   let devnetCluster: Cluster.Cluster | undefined
   let genesisConfig: Config.ShelleyGenesis
-  let genesisUtxos: ReadonlyArray<Core.UTxO.UTxO> = []
+  let genesisUtxos: ReadonlyArray<Cardano.UTxO.UTxO> = []
 
   const TEST_MNEMONIC =
     "test test test test test test test test test test test test test test test test test test test test test test test sauce"
@@ -127,11 +127,11 @@ describe("TxBuilder NativeScript (Devnet Submit)", () => {
       .newTx()
       .attachScript({ script: multiSigScript })
       .mintAssets({
-        assets: Core.Assets.fromRecord({ [unit]: 500n })
+        assets: Cardano.Assets.fromRecord({ [unit]: 500n })
       })
       .payToAddress({
         address: address1,
-        assets: Core.Assets.fromLovelace(2_000_000n)
+        assets: Cardano.Assets.fromLovelace(2_000_000n)
       })
       .build({ availableUtxos: [...genesisUtxos] })
 
@@ -189,11 +189,11 @@ describe("TxBuilder NativeScript (Devnet Submit)", () => {
       .newTx()
       .attachScript({ script: anyScript })
       .mintAssets({
-        assets: Core.Assets.fromRecord({ [unit]: 100n })
+        assets: Cardano.Assets.fromRecord({ [unit]: 100n })
       })
       .payToAddress({
         address: address1,
-        assets: Core.Assets.fromLovelace(2_000_000n)
+        assets: Cardano.Assets.fromLovelace(2_000_000n)
       })
       .build()
 
@@ -245,11 +245,11 @@ describe("TxBuilder NativeScript (Devnet Submit)", () => {
       .newTx()
       .attachScript({ script: nOfKScript })
       .mintAssets({
-        assets: Core.Assets.fromRecord({ [unit]: 200n })
+        assets: Cardano.Assets.fromRecord({ [unit]: 200n })
       })
       .payToAddress({
         address: address1,
-        assets: Core.Assets.fromLovelace(2_000_000n)
+        assets: Cardano.Assets.fromLovelace(2_000_000n)
       })
       .build()
 
@@ -308,11 +308,11 @@ describe("TxBuilder NativeScript (Devnet Submit)", () => {
       .attachScript({ script: timelockScript })
       .setValidity({ to: futureUnixTime })
       .mintAssets({
-        assets: Core.Assets.fromRecord({ [unit]: 50n })
+        assets: Cardano.Assets.fromRecord({ [unit]: 50n })
       })
       .payToAddress({
         address: myAddress,
-        assets: Core.Assets.fromLovelace(2_000_000n)
+        assets: Cardano.Assets.fromLovelace(2_000_000n)
       })
       .build()
 
@@ -376,11 +376,11 @@ describe("TxBuilder NativeScript (Devnet Submit)", () => {
       .attachScript({ script: complexScript })
       .setValidity({ to: beforeUnixTime })
       .mintAssets({
-        assets: Core.Assets.fromRecord({ [unit]: 25n })
+        assets: Cardano.Assets.fromRecord({ [unit]: 25n })
       })
       .payToAddress({
         address: myAddress,
-        assets: Core.Assets.fromLovelace(2_000_000n)
+        assets: Cardano.Assets.fromLovelace(2_000_000n)
       })
       .build()
 
@@ -432,7 +432,7 @@ describe("TxBuilder NativeScript (Devnet Submit)", () => {
       .newTx()
       .payToAddress({
         address: scriptAddress,
-        assets: Core.Assets.fromLovelace(10_000_000n)
+        assets: Cardano.Assets.fromLovelace(10_000_000n)
       })
       .build()
 
@@ -459,7 +459,7 @@ describe("TxBuilder NativeScript (Devnet Submit)", () => {
       .collectFrom({ inputs: [scriptUtxo!] })
       .payToAddress({
         address: address1,
-        assets: Core.Assets.fromLovelace(5_000_000n)
+        assets: Cardano.Assets.fromLovelace(5_000_000n)
       })
       .build()
 
@@ -505,7 +505,7 @@ describe("TxBuilder NativeScript (Devnet Submit)", () => {
       .newTx()
       .payToAddress({
         address: address1,
-        assets: Core.Assets.fromLovelace(5_000_000n),
+        assets: Cardano.Assets.fromLovelace(5_000_000n),
         script: multiSigScript
       })
       .build()
@@ -533,11 +533,11 @@ describe("TxBuilder NativeScript (Devnet Submit)", () => {
       .newTx()
       .readFrom({ referenceInputs: [refScriptUtxo!] }) // Reference the UTxO with the script
       .mintAssets({
-        assets: Core.Assets.fromRecord({ [unit]: 100n })
+        assets: Cardano.Assets.fromRecord({ [unit]: 100n })
       })
       .payToAddress({
         address: address1,
-        assets: Core.Assets.fromLovelace(2_000_000n)
+        assets: Cardano.Assets.fromLovelace(2_000_000n)
       })
       .build()
 
@@ -591,7 +591,7 @@ describe("TxBuilder NativeScript (Devnet Submit)", () => {
       .newTx()
       .payToAddress({
         address: address1,
-        assets: Core.Assets.fromLovelace(5_000_000n),
+        assets: Cardano.Assets.fromLovelace(5_000_000n),
         script: multiSigScript
       })
       .build()
@@ -608,7 +608,7 @@ describe("TxBuilder NativeScript (Devnet Submit)", () => {
       .newTx()
       .payToAddress({
         address: scriptAddress,
-        assets: Core.Assets.fromLovelace(10_000_000n)
+        assets: Cardano.Assets.fromLovelace(10_000_000n)
       })
       .build()
 
@@ -641,7 +641,7 @@ describe("TxBuilder NativeScript (Devnet Submit)", () => {
       .collectFrom({ inputs: [scriptUtxo!] }) // Spend from the script address
       .payToAddress({
         address: address1,
-        assets: Core.Assets.fromLovelace(5_000_000n)
+        assets: Cardano.Assets.fromLovelace(5_000_000n)
       })
       .build()
 
diff --git a/packages/evolution-devnet/test/TxBuilder.PlutusMint.test.ts b/packages/evolution-devnet/test/TxBuilder.PlutusMint.test.ts
index cefe3ed9..0e330cf5 100644
--- a/packages/evolution-devnet/test/TxBuilder.PlutusMint.test.ts
+++ b/packages/evolution-devnet/test/TxBuilder.PlutusMint.test.ts
@@ -10,19 +10,19 @@ import { afterAll, beforeAll, describe, expect, it } from "@effect/vitest"
 import * as Cluster from "@evolution-sdk/devnet/Cluster"
 import * as Config from "@evolution-sdk/devnet/Config"
 import * as Genesis from "@evolution-sdk/devnet/Genesis"
-import { Core } from "@evolution-sdk/evolution"
-import * as CoreAddress from "@evolution-sdk/evolution/core/Address"
-import * as AssetName from "@evolution-sdk/evolution/core/AssetName"
-import * as Bytes from "@evolution-sdk/evolution/core/Bytes"
-import * as Data from "@evolution-sdk/evolution/core/Data"
-import * as PlutusV3 from "@evolution-sdk/evolution/core/PlutusV3"
-import * as PolicyId from "@evolution-sdk/evolution/core/PolicyId"
-import * as ScriptHash from "@evolution-sdk/evolution/core/ScriptHash"
-import * as Text from "@evolution-sdk/evolution/core/Text"
-import * as TransactionHash from "@evolution-sdk/evolution/core/TransactionHash"
+import { Cardano } from "@evolution-sdk/evolution"
+import * as CoreAddress from "@evolution-sdk/evolution/Address"
+import * as AssetName from "@evolution-sdk/evolution/AssetName"
+import * as Bytes from "@evolution-sdk/evolution/Bytes"
+import * as Data from "@evolution-sdk/evolution/Data"
+import * as PlutusV3 from "@evolution-sdk/evolution/PlutusV3"
+import * as PolicyId from "@evolution-sdk/evolution/PolicyId"
+import * as ScriptHash from "@evolution-sdk/evolution/ScriptHash"
 import { createClient } from "@evolution-sdk/evolution/sdk/client/ClientImpl"
+import * as Text from "@evolution-sdk/evolution/Text"
+import * as TransactionHash from "@evolution-sdk/evolution/TransactionHash"
 
-const CoreAssets = Core.Assets
+const CoreAssets = Cardano.Assets
 
 describe("TxBuilder Plutus Minting (Devnet Submit)", () => {
   // ============================================================================
@@ -31,7 +31,7 @@ describe("TxBuilder Plutus Minting (Devnet Submit)", () => {
 
   let devnetCluster: Cluster.Cluster | undefined
   let genesisConfig: Config.ShelleyGenesis
-  let genesisUtxos: ReadonlyArray<Core.UTxO.UTxO> = []
+  let genesisUtxos: ReadonlyArray<Cardano.UTxO.UTxO> = []
 
   const TEST_MNEMONIC = "test test test test test test test test test test test test test test test test test test test test test test test sauce"
 
diff --git a/packages/evolution-devnet/test/TxBuilder.Pool.test.ts b/packages/evolution-devnet/test/TxBuilder.Pool.test.ts
index e55ca6db..796b1313 100644
--- a/packages/evolution-devnet/test/TxBuilder.Pool.test.ts
+++ b/packages/evolution-devnet/test/TxBuilder.Pool.test.ts
@@ -7,26 +7,25 @@ import { afterAll, beforeAll, describe, expect, it } from "@effect/vitest"
 import * as Cluster from "@evolution-sdk/devnet/Cluster"
 import * as Config from "@evolution-sdk/devnet/Config"
 import * as Genesis from "@evolution-sdk/devnet/Genesis"
-import type { Core } from "@evolution-sdk/evolution"
-import * as Address from "@evolution-sdk/evolution/core/Address"
-import * as Bytes32 from "@evolution-sdk/evolution/core/Bytes32"
-import type * as EpochNo from "@evolution-sdk/evolution/core/EpochNo"
-import * as IPv4 from "@evolution-sdk/evolution/core/IPv4"
-import * as KeyHash from "@evolution-sdk/evolution/core/KeyHash"
-import * as PoolKeyHash from "@evolution-sdk/evolution/core/PoolKeyHash"
-import * as PoolMetadata from "@evolution-sdk/evolution/core/PoolMetadata"
-import * as PoolParams from "@evolution-sdk/evolution/core/PoolParams"
-import * as RewardAccount from "@evolution-sdk/evolution/core/RewardAccount"
-import * as SingleHostAddr from "@evolution-sdk/evolution/core/SingleHostAddr"
-import * as UnitInterval from "@evolution-sdk/evolution/core/UnitInterval"
-import * as Url from "@evolution-sdk/evolution/core/Url"
-import * as VrfKeyHash from "@evolution-sdk/evolution/core/VrfKeyHash"
+import * as Address from "@evolution-sdk/evolution/Address"
+import * as Bytes32 from "@evolution-sdk/evolution/Bytes32"
+import type * as EpochNo from "@evolution-sdk/evolution/EpochNo"
+import * as IPv4 from "@evolution-sdk/evolution/IPv4"
+import * as KeyHash from "@evolution-sdk/evolution/KeyHash"
+import * as PoolKeyHash from "@evolution-sdk/evolution/PoolKeyHash"
+import * as PoolMetadata from "@evolution-sdk/evolution/PoolMetadata"
+import * as PoolParams from "@evolution-sdk/evolution/PoolParams"
+import * as RewardAccount from "@evolution-sdk/evolution/RewardAccount"
 import { createClient } from "@evolution-sdk/evolution/sdk/client/ClientImpl"
+import * as SingleHostAddr from "@evolution-sdk/evolution/SingleHostAddr"
+import * as UnitInterval from "@evolution-sdk/evolution/UnitInterval"
+import * as Url from "@evolution-sdk/evolution/Url"
+import * as VrfKeyHash from "@evolution-sdk/evolution/VrfKeyHash"
 
 describe("TxBuilder Pool Operations", () => {
   let devnetCluster: Cluster.Cluster | undefined
   let genesisConfig: Config.ShelleyGenesis
-  const genesisUtxosByAccount: Map<number, Core.UTxO.UTxO> = new Map()
+  const genesisUtxosByAccount: Map<number, Cardano.UTxO.UTxO> = new Map()
 
   const TEST_MNEMONIC =
     "test test test test test test test test test test test test test test test test test test test test test test test sauce"
diff --git a/packages/evolution-devnet/test/TxBuilder.RedeemerBuilder.test.ts b/packages/evolution-devnet/test/TxBuilder.RedeemerBuilder.test.ts
index 79ecbd33..a39a90c1 100644
--- a/packages/evolution-devnet/test/TxBuilder.RedeemerBuilder.test.ts
+++ b/packages/evolution-devnet/test/TxBuilder.RedeemerBuilder.test.ts
@@ -9,23 +9,23 @@ import { afterAll, beforeAll, describe, expect, it } from "@effect/vitest"
 import * as Cluster from "@evolution-sdk/devnet/Cluster"
 import * as Config from "@evolution-sdk/devnet/Config"
 import * as Genesis from "@evolution-sdk/devnet/Genesis"
-import { Core } from "@evolution-sdk/evolution"
-import * as CoreAddress from "@evolution-sdk/evolution/core/Address"
-import * as AssetName from "@evolution-sdk/evolution/core/AssetName"
-import * as Bytes from "@evolution-sdk/evolution/core/Bytes"
-import * as Data from "@evolution-sdk/evolution/core/Data"
-import * as DatumOption from "@evolution-sdk/evolution/core/DatumOption"
-import * as PlutusV3 from "@evolution-sdk/evolution/core/PlutusV3"
-import * as PolicyId from "@evolution-sdk/evolution/core/PolicyId"
-import * as ScriptHash from "@evolution-sdk/evolution/core/ScriptHash"
-import * as Text from "@evolution-sdk/evolution/core/Text"
-import * as TransactionHash from "@evolution-sdk/evolution/core/TransactionHash"
+import { Cardano } from "@evolution-sdk/evolution"
+import * as CoreAddress from "@evolution-sdk/evolution/Address"
+import * as AssetName from "@evolution-sdk/evolution/AssetName"
+import * as Bytes from "@evolution-sdk/evolution/Bytes"
+import * as Data from "@evolution-sdk/evolution/Data"
+import * as DatumOption from "@evolution-sdk/evolution/DatumOption"
+import * as PlutusV3 from "@evolution-sdk/evolution/PlutusV3"
+import * as PolicyId from "@evolution-sdk/evolution/PolicyId"
+import * as ScriptHash from "@evolution-sdk/evolution/ScriptHash"
 import { createClient } from "@evolution-sdk/evolution/sdk/client/ClientImpl"
+import * as Text from "@evolution-sdk/evolution/Text"
+import * as TransactionHash from "@evolution-sdk/evolution/TransactionHash"
 import { Schema } from "effect"
 
 import plutusJson from "../../evolution/test/spec/plutus.json"
 
-const CoreAssets = Core.Assets
+const CoreAssets = Cardano.Assets
 
 const getMintMultiValidator = () => {
   const validator = plutusJson.validators.find((v) => v.title === "mint_multi_validator.mint_multi_validator.spend")
@@ -45,7 +45,7 @@ const { compiledCode: MINT_MULTI_COMPILED_CODE, hash: MINT_MULTI_POLICY_ID_HEX }
 describe("TxBuilder RedeemerBuilder", () => {
   let devnetCluster: Cluster.Cluster | undefined
   let genesisConfig: Config.ShelleyGenesis
-  let genesisUtxos: ReadonlyArray<Core.UTxO.UTxO> = []
+  let genesisUtxos: ReadonlyArray<Cardano.UTxO.UTxO> = []
 
   const TEST_MNEMONIC =
     "test test test test test test test test test test test test test test test test test test test test test test test sauce"
@@ -61,7 +61,7 @@ describe("TxBuilder RedeemerBuilder", () => {
   const makeCounterDatum = (counter: bigint): Data.Data => Data.constr(0n, [Data.int(counter)])
 
   /** Parse counter value from UTxO inline datum */
-  const parseCounterDatum = (utxo: Core.UTxO.UTxO): bigint => {
+  const parseCounterDatum = (utxo: Cardano.UTxO.UTxO): bigint => {
     const datumOption = utxo.datumOption
     if (!datumOption || datumOption._tag !== "InlineDatum") {
       throw new Error("UTxO has no inline datum")
@@ -230,7 +230,7 @@ describe("TxBuilder RedeemerBuilder", () => {
       .attachScript({ script: mintMultiScript })
       .collectFrom({
         inputs: scriptUtxos,
-        redeemer: ({ index, utxo }: { index: number; utxo: Core.UTxO.UTxO }): Data.Data => {
+        redeemer: ({ index, utxo }: { index: number; utxo: Cardano.UTxO.UTxO }): Data.Data => {
           const datumCounter = parseCounterDatum(utxo)
           return makeSpendRedeemer(datumCounter + BigInt(index))
         }
@@ -238,7 +238,7 @@ describe("TxBuilder RedeemerBuilder", () => {
       .mintAssets({
         assets: CoreAssets.fromRecord({ [unit]: -300n }),
         redeemer: {
-          all: (inputs: ReadonlyArray<{ index: number; utxo: Core.UTxO.UTxO }>): Data.Data => {
+          all: (inputs: ReadonlyArray<{ index: number; utxo: Cardano.UTxO.UTxO }>): Data.Data => {
             const entries: Array<[bigint, bigint]> = inputs.map((input) => {
               const datumCounter = parseCounterDatum(input.utxo)
               return [BigInt(input.index), datumCounter + BigInt(input.index)]
diff --git a/packages/evolution-devnet/test/TxBuilder.ScriptStake.test.ts b/packages/evolution-devnet/test/TxBuilder.ScriptStake.test.ts
index 952c1e91..81161e45 100644
--- a/packages/evolution-devnet/test/TxBuilder.ScriptStake.test.ts
+++ b/packages/evolution-devnet/test/TxBuilder.ScriptStake.test.ts
@@ -17,13 +17,13 @@ import { afterAll, beforeAll, describe, expect, it } from "@effect/vitest"
 import * as Cluster from "@evolution-sdk/devnet/Cluster"
 import * as Config from "@evolution-sdk/devnet/Config"
 import * as Genesis from "@evolution-sdk/devnet/Genesis"
-import { Core } from "@evolution-sdk/evolution"
-import * as CoreAddress from "@evolution-sdk/evolution/core/Address"
-import * as Bytes from "@evolution-sdk/evolution/core/Bytes"
-import * as Data from "@evolution-sdk/evolution/core/Data"
-import * as DatumOption from "@evolution-sdk/evolution/core/DatumOption"
-import * as PlutusV3 from "@evolution-sdk/evolution/core/PlutusV3"
-import * as ScriptHash from "@evolution-sdk/evolution/core/ScriptHash"
+import { Cardano } from "@evolution-sdk/evolution"
+import * as CoreAddress from "@evolution-sdk/evolution/Address"
+import * as Bytes from "@evolution-sdk/evolution/Bytes"
+import * as Data from "@evolution-sdk/evolution/Data"
+import * as DatumOption from "@evolution-sdk/evolution/DatumOption"
+import * as PlutusV3 from "@evolution-sdk/evolution/PlutusV3"
+import * as ScriptHash from "@evolution-sdk/evolution/ScriptHash"
 import { createClient } from "@evolution-sdk/evolution/sdk/client/ClientImpl"
 
 import plutusJson from "../../evolution/test/spec/plutus.json"
@@ -46,7 +46,7 @@ const { compiledCode: STAKE_MULTI_COMPILED_CODE, hash: STAKE_MULTI_SCRIPT_HASH }
 describe("TxBuilder Script Stake Operations", () => {
   let devnetCluster: Cluster.Cluster | undefined
   let genesisConfig: Config.ShelleyGenesis
-  let genesisUtxos: ReadonlyArray<Core.UTxO.UTxO> = []
+  let genesisUtxos: ReadonlyArray<Cardano.UTxO.UTxO> = []
 
   const TEST_MNEMONIC =
     "test test test test test test test test test test test test test test test test test test test test test test test sauce"
@@ -74,7 +74,7 @@ describe("TxBuilder Script Stake Operations", () => {
   const scriptStakeCredential = scriptHashValue
 
   // Script payment address (for funding UTxOs)
-  const getScriptPaymentAddress = (): Core.Address.Address => {
+  const getScriptPaymentAddress = (): Cardano.Address.Address => {
     return CoreAddress.Address.make({
       networkId: 0,
       paymentCredential: scriptHashValue
@@ -183,12 +183,12 @@ describe("TxBuilder Script Stake Operations", () => {
       .newTx()
       .payToAddress({
         address: scriptPaymentAddress,
-        assets: Core.Assets.fromLovelace(10_000_000n),
+        assets: Cardano.Assets.fromLovelace(10_000_000n),
         datum: unitDatum
       })
       .payToAddress({
         address: scriptPaymentAddress,
-        assets: Core.Assets.fromLovelace(15_000_000n),
+        assets: Cardano.Assets.fromLovelace(15_000_000n),
         datum: unitDatum
       })
       .build()
@@ -233,8 +233,8 @@ describe("TxBuilder Script Stake Operations", () => {
     const outputPerUtxo = utxosToSpend.reduce((acc, u) => acc + u.assets.lovelace, 0n) / 2n
 
     txBuilder = txBuilder
-      .payToAddress({ address: scriptPaymentAddress, assets: Core.Assets.fromLovelace(outputPerUtxo), datum: unitDatum })
-      .payToAddress({ address: scriptPaymentAddress, assets: Core.Assets.fromLovelace(outputPerUtxo), datum: unitDatum })
+      .payToAddress({ address: scriptPaymentAddress, assets: Cardano.Assets.fromLovelace(outputPerUtxo), datum: unitDatum })
+      .payToAddress({ address: scriptPaymentAddress, assets: Cardano.Assets.fromLovelace(outputPerUtxo), datum: unitDatum })
 
     const coordSignBuilder = await txBuilder.build()
     const coordSubmitBuilder = await coordSignBuilder.sign()
@@ -286,7 +286,7 @@ describe("TxBuilder Script Stake Operations", () => {
     const unitDatum = new DatumOption.InlineDatum({ data: Data.constr(0n, []) })
     const fundSignBuilder = await client
       .newTx()
-      .payToAddress({ address: scriptPaymentAddress, assets: Core.Assets.fromLovelace(10_000_000n), datum: unitDatum })
+      .payToAddress({ address: scriptPaymentAddress, assets: Cardano.Assets.fromLovelace(10_000_000n), datum: unitDatum })
       .build()
     await client.awaitTx(await (await fundSignBuilder.sign()).submit(), 1000)
     await new Promise((resolve) => setTimeout(resolve, 2000))
@@ -312,7 +312,7 @@ describe("TxBuilder Script Stake Operations", () => {
       })
       .payToAddress({
         address: scriptPaymentAddress,
-        assets: Core.Assets.fromLovelace(utxoToSpend.assets.lovelace - 1_000_000n),
+        assets: Cardano.Assets.fromLovelace(utxoToSpend.assets.lovelace - 1_000_000n),
         datum: unitDatum
       })
       .attachScript({ script: stakeScript })
diff --git a/packages/evolution-devnet/test/TxBuilder.Scripts.test.ts b/packages/evolution-devnet/test/TxBuilder.Scripts.test.ts
index 4bc94764..57226eb6 100644
--- a/packages/evolution-devnet/test/TxBuilder.Scripts.test.ts
+++ b/packages/evolution-devnet/test/TxBuilder.Scripts.test.ts
@@ -1,11 +1,11 @@
 import { afterAll, beforeAll, describe, expect, it } from "@effect/vitest"
 import { createAikenEvaluator } from "@evolution-sdk/aiken-uplc"
-import { Core } from "@evolution-sdk/evolution"
-import * as CoreAddress from "@evolution-sdk/evolution/core/Address"
-import * as Bytes from "@evolution-sdk/evolution/core/Bytes"
-import * as Data from "@evolution-sdk/evolution/core/Data"
-import * as PlutusV2 from "@evolution-sdk/evolution/core/PlutusV2"
-import * as ScriptHash from "@evolution-sdk/evolution/core/ScriptHash"
+import { Cardano } from "@evolution-sdk/evolution"
+import * as CoreAddress from "@evolution-sdk/evolution/Address"
+import * as Bytes from "@evolution-sdk/evolution/Bytes"
+import * as Data from "@evolution-sdk/evolution/Data"
+import * as PlutusV2 from "@evolution-sdk/evolution/PlutusV2"
+import * as ScriptHash from "@evolution-sdk/evolution/ScriptHash"
 import type { TxBuilderConfig } from "@evolution-sdk/evolution/sdk/builders/TransactionBuilder"
 import { makeTxBuilder } from "@evolution-sdk/evolution/sdk/builders/TransactionBuilder"
 import { KupmiosProvider } from "@evolution-sdk/evolution/sdk/provider/Kupmios"
@@ -14,8 +14,8 @@ import { Schema } from "effect"
 import * as Cluster from "../src/Cluster.js"
 import { createCoreTestUtxo } from "./utils/utxo-helpers.js"
 
-// Alias for Core.Assets
-const CoreAssets = Core.Assets
+// Alias for Cardano.Assets
+const CoreAssets = Cardano.Assets
 
 describe("TxBuilder Script Handling", () => {
   // ============================================================================
diff --git a/packages/evolution-devnet/test/TxBuilder.Stake.test.ts b/packages/evolution-devnet/test/TxBuilder.Stake.test.ts
index f7c29e4d..4e115674 100644
--- a/packages/evolution-devnet/test/TxBuilder.Stake.test.ts
+++ b/packages/evolution-devnet/test/TxBuilder.Stake.test.ts
@@ -15,10 +15,9 @@ import { afterAll, beforeAll, describe, expect, it } from "@effect/vitest"
 import * as Cluster from "@evolution-sdk/devnet/Cluster"
 import * as Config from "@evolution-sdk/devnet/Config"
 import * as Genesis from "@evolution-sdk/devnet/Genesis"
-import type { Core } from "@evolution-sdk/evolution"
-import * as Address from "@evolution-sdk/evolution/core/Address"
-import * as DRep from "@evolution-sdk/evolution/core/DRep"
-import * as PoolKeyHash from "@evolution-sdk/evolution/core/PoolKeyHash"
+import * as Address from "@evolution-sdk/evolution/Address"
+import * as DRep from "@evolution-sdk/evolution/DRep"
+import * as PoolKeyHash from "@evolution-sdk/evolution/PoolKeyHash"
 import { createClient } from "@evolution-sdk/evolution/sdk/client/ClientImpl"
 
 // Default devnet stake pool ID from Config.ts
@@ -28,7 +27,7 @@ describe("TxBuilder Stake Operations", () => {
   let devnetCluster: Cluster.Cluster | undefined
   let genesisConfig: Config.ShelleyGenesis
   // Store genesis UTxOs per account index for independent tests
-  const genesisUtxosByAccount: Map<number, Core.UTxO.UTxO> = new Map()
+  const genesisUtxosByAccount: Map<number, Cardano.UTxO.UTxO> = new Map()
 
   const TEST_MNEMONIC =
     "test test test test test test test test test test test test test test test test test test test test test test test sauce"
diff --git a/packages/evolution-devnet/test/TxBuilder.Validity.test.ts b/packages/evolution-devnet/test/TxBuilder.Validity.test.ts
index 93d64cf5..b4bec974 100644
--- a/packages/evolution-devnet/test/TxBuilder.Validity.test.ts
+++ b/packages/evolution-devnet/test/TxBuilder.Validity.test.ts
@@ -15,17 +15,17 @@ import { afterAll, beforeAll, describe, expect, it } from "@effect/vitest"
 import * as Cluster from "@evolution-sdk/devnet/Cluster"
 import * as Config from "@evolution-sdk/devnet/Config"
 import * as Genesis from "@evolution-sdk/devnet/Genesis"
-import { Core } from "@evolution-sdk/evolution"
-import * as Address from "@evolution-sdk/evolution/core/Address"
+import { Cardano } from "@evolution-sdk/evolution"
+import * as Address from "@evolution-sdk/evolution/Address"
 import { createClient } from "@evolution-sdk/evolution/sdk/client/ClientImpl"
 
 // Alias for readability
-const Time = Core.Time
+const Time = Cardano.Time
 
 describe("TxBuilder Validity Interval", () => {
   let devnetCluster: Cluster.Cluster | undefined
   let genesisConfig: Config.ShelleyGenesis
-  let genesisUtxos: ReadonlyArray<Core.UTxO.UTxO> = []
+  let genesisUtxos: ReadonlyArray<Cardano.UTxO.UTxO> = []
 
   const TEST_MNEMONIC =
     "test test test test test test test test test test test test test test test test test test test test test test test sauce"
@@ -102,7 +102,7 @@ describe("TxBuilder Validity Interval", () => {
       .setValidity({ to: ttl })
       .payToAddress({
         address: myAddress,
-        assets: Core.Assets.fromLovelace(5_000_000n)
+        assets: Cardano.Assets.fromLovelace(5_000_000n)
       })
       .build({ availableUtxos: [...genesisUtxos] })
 
@@ -117,7 +117,7 @@ describe("TxBuilder Validity Interval", () => {
     // Submit and confirm
     const submitBuilder = await signBuilder.sign()
     const txHash = await submitBuilder.submit()
-    expect(Core.TransactionHash.toHex(txHash).length).toBe(64)
+    expect(Cardano.TransactionHash.toHex(txHash).length).toBe(64)
 
     const confirmed = await client.awaitTx(txHash, 1000)
     expect(confirmed).toBe(true)
@@ -136,7 +136,7 @@ describe("TxBuilder Validity Interval", () => {
       .setValidity({ from, to })
       .payToAddress({
         address: myAddress,
-        assets: Core.Assets.fromLovelace(5_000_000n)
+        assets: Cardano.Assets.fromLovelace(5_000_000n)
       })
       .build()
 
@@ -157,7 +157,7 @@ describe("TxBuilder Validity Interval", () => {
     // Submit and confirm
     const submitBuilder = await signBuilder.sign()
     const txHash = await submitBuilder.submit()
-    expect(Core.TransactionHash.toHex(txHash).length).toBe(64)
+    expect(Cardano.TransactionHash.toHex(txHash).length).toBe(64)
 
     const confirmed = await client.awaitTx(txHash, 1000)
     expect(confirmed).toBe(true)
@@ -175,7 +175,7 @@ describe("TxBuilder Validity Interval", () => {
       .setValidity({ to: expiredTtl })
       .payToAddress({
         address: myAddress,
-        assets: Core.Assets.fromLovelace(5_000_000n)
+        assets: Cardano.Assets.fromLovelace(5_000_000n)
       })
       .build({ availableUtxos: [...genesisUtxos] })
 
@@ -198,7 +198,7 @@ describe("TxBuilder Validity Interval", () => {
       .setValidity({ from, to })
       .payToAddress({
         address: myAddress,
-        assets: Core.Assets.fromLovelace(5_000_000n)
+        assets: Cardano.Assets.fromLovelace(5_000_000n)
       })
       .build({ availableUtxos: [...genesisUtxos] })
 
diff --git a/packages/evolution-devnet/test/TxBuilder.Vote.test.ts b/packages/evolution-devnet/test/TxBuilder.Vote.test.ts
index 3b811a48..380c7264 100644
--- a/packages/evolution-devnet/test/TxBuilder.Vote.test.ts
+++ b/packages/evolution-devnet/test/TxBuilder.Vote.test.ts
@@ -7,27 +7,26 @@ import { afterAll, beforeAll, describe, expect, it } from "@effect/vitest"
 import * as Cluster from "@evolution-sdk/devnet/Cluster"
 import * as Config from "@evolution-sdk/devnet/Config"
 import * as Genesis from "@evolution-sdk/devnet/Genesis"
-import type { Core } from "@evolution-sdk/evolution"
-import * as Address from "@evolution-sdk/evolution/core/Address"
-import * as Anchor from "@evolution-sdk/evolution/core/Anchor"
-import * as Bytes32 from "@evolution-sdk/evolution/core/Bytes32"
-import * as Constitution from "@evolution-sdk/evolution/core/Constitution"
-import * as DRep from "@evolution-sdk/evolution/core/DRep"
-import * as GovernanceAction from "@evolution-sdk/evolution/core/GovernanceAction"
-import * as KeyHash from "@evolution-sdk/evolution/core/KeyHash"
-import * as ProtocolParamUpdate from "@evolution-sdk/evolution/core/ProtocolParamUpdate"
-import * as ProtocolVersion from "@evolution-sdk/evolution/core/ProtocolVersion"
-import * as RewardAccount from "@evolution-sdk/evolution/core/RewardAccount"
-import * as UnitInterval from "@evolution-sdk/evolution/core/UnitInterval"
-import * as Url from "@evolution-sdk/evolution/core/Url"
-import * as VotingProcedures from "@evolution-sdk/evolution/core/VotingProcedures"
+import * as Address from "@evolution-sdk/evolution/Address"
+import * as Anchor from "@evolution-sdk/evolution/Anchor"
+import * as Bytes32 from "@evolution-sdk/evolution/Bytes32"
+import * as Constitution from "@evolution-sdk/evolution/Constitution"
+import * as DRep from "@evolution-sdk/evolution/DRep"
+import * as GovernanceAction from "@evolution-sdk/evolution/GovernanceAction"
+import * as KeyHash from "@evolution-sdk/evolution/KeyHash"
+import * as ProtocolParamUpdate from "@evolution-sdk/evolution/ProtocolParamUpdate"
+import * as ProtocolVersion from "@evolution-sdk/evolution/ProtocolVersion"
+import * as RewardAccount from "@evolution-sdk/evolution/RewardAccount"
 import { createClient } from "@evolution-sdk/evolution/sdk/client/ClientImpl"
+import * as UnitInterval from "@evolution-sdk/evolution/UnitInterval"
+import * as Url from "@evolution-sdk/evolution/Url"
+import * as VotingProcedures from "@evolution-sdk/evolution/VotingProcedures"
 
 describe("TxBuilder Vote Operations (script-free)", () => {
   let devnetCluster: Cluster.Cluster | undefined
   let genesisConfig: Config.ShelleyGenesis
   let conwayGenesis: Config.ConwayGenesis
-  const genesisUtxosByAccount: Map<number, Core.UTxO.UTxO> = new Map()
+  const genesisUtxosByAccount: Map<number, Cardano.UTxO.UTxO> = new Map()
 
   const TEST_MNEMONIC =
     "test test test test test test test test test test test test test test test test test test test test test test test sauce"
diff --git a/packages/evolution-devnet/test/TxBuilder.VoteValidators.test.ts b/packages/evolution-devnet/test/TxBuilder.VoteValidators.test.ts
index 37488812..40904cfa 100644
--- a/packages/evolution-devnet/test/TxBuilder.VoteValidators.test.ts
+++ b/packages/evolution-devnet/test/TxBuilder.VoteValidators.test.ts
@@ -10,27 +10,27 @@ import { afterAll, beforeAll, describe, expect, it } from "@effect/vitest"
 import * as Cluster from "@evolution-sdk/devnet/Cluster"
 import * as Config from "@evolution-sdk/devnet/Config"
 import * as Genesis from "@evolution-sdk/devnet/Genesis"
-import { Core } from "@evolution-sdk/evolution"
-import * as Address from "@evolution-sdk/evolution/core/Address"
-import * as Anchor from "@evolution-sdk/evolution/core/Anchor"
-import * as Bytes from "@evolution-sdk/evolution/core/Bytes"
-import * as Bytes32 from "@evolution-sdk/evolution/core/Bytes32"
-import * as Data from "@evolution-sdk/evolution/core/Data"
-import * as DatumOption from "@evolution-sdk/evolution/core/DatumOption"
-import * as DRep from "@evolution-sdk/evolution/core/DRep"
-import * as GovernanceAction from "@evolution-sdk/evolution/core/GovernanceAction"
-import * as PlutusV3 from "@evolution-sdk/evolution/core/PlutusV3"
-import * as RewardAccount from "@evolution-sdk/evolution/core/RewardAccount"
-import * as ScriptHash from "@evolution-sdk/evolution/core/ScriptHash"
-import * as TransactionHash from "@evolution-sdk/evolution/core/TransactionHash"
-import * as Url from "@evolution-sdk/evolution/core/Url"
-import * as VotingProcedures from "@evolution-sdk/evolution/core/VotingProcedures"
+import { Cardano } from "@evolution-sdk/evolution"
+import * as Address from "@evolution-sdk/evolution/Address"
+import * as Anchor from "@evolution-sdk/evolution/Anchor"
+import * as Bytes from "@evolution-sdk/evolution/Bytes"
+import * as Bytes32 from "@evolution-sdk/evolution/Bytes32"
+import * as Data from "@evolution-sdk/evolution/Data"
+import * as DatumOption from "@evolution-sdk/evolution/DatumOption"
+import * as DRep from "@evolution-sdk/evolution/DRep"
+import * as GovernanceAction from "@evolution-sdk/evolution/GovernanceAction"
+import * as PlutusV3 from "@evolution-sdk/evolution/PlutusV3"
+import * as RewardAccount from "@evolution-sdk/evolution/RewardAccount"
+import * as ScriptHash from "@evolution-sdk/evolution/ScriptHash"
 import { createClient } from "@evolution-sdk/evolution/sdk/client/ClientImpl"
+import * as TransactionHash from "@evolution-sdk/evolution/TransactionHash"
+import * as Url from "@evolution-sdk/evolution/Url"
+import * as VotingProcedures from "@evolution-sdk/evolution/VotingProcedures"
 
 import plutusJson from "../../evolution/test/spec/plutus.json"
 
 // Alias for readability
-const Time = Core.Time
+const Time = Cardano.Time
 
 const TEST_MNEMONIC =
   "test test test test test test test test test test test test test test test test test test test test test test test sauce"
@@ -69,7 +69,7 @@ describe("TxBuilder Vote Validator (script DRep)", () => {
       }
     })
   }
-  const genesisUtxosByAccount: Map<number, Core.UTxO.UTxO> = new Map()
+  const genesisUtxosByAccount: Map<number, Cardano.UTxO.UTxO> = new Map()
 
   beforeAll(async () => {
     const accounts = [0, 1].map(accountIndex =>
@@ -288,7 +288,7 @@ describe("TxBuilder Vote Validator (script DRep)", () => {
       .newTx()
       .payToAddress({
         address: address0,
-        assets: Core.Assets.fromLovelace(5_000_000n),
+        assets: Cardano.Assets.fromLovelace(5_000_000n),
         datum: new DatumOption.InlineDatum({ data: configDatum })
       })
       .build()
@@ -301,7 +301,7 @@ describe("TxBuilder Vote Validator (script DRep)", () => {
     // Find config UTxO
     const allUtxos = await client0.getUtxos(address0)
     const configUtxo = allUtxos.find(u => 
-      Core.UTxO.toOutRefString(u).startsWith(TransactionHash.toHex(configTxHash)) && 
+      Cardano.UTxO.toOutRefString(u).startsWith(TransactionHash.toHex(configTxHash)) && 
       u.assets.lovelace === 5_000_000n
     )
     if (!configUtxo) throw new Error("Config UTxO not found")
@@ -422,7 +422,7 @@ describe("TxBuilder Vote Validator (script DRep)", () => {
       .newTx()
       .payToAddress({
         address: address0,
-        assets: Core.Assets.fromLovelace(5_000_000n),
+        assets: Cardano.Assets.fromLovelace(5_000_000n),
         datum: new DatumOption.InlineDatum({ data: configDatum })
       })
       .build()
@@ -435,7 +435,7 @@ describe("TxBuilder Vote Validator (script DRep)", () => {
     // Find config UTxO
     const allUtxos = await client0.getUtxos(address0)
     const configUtxo = allUtxos.find(u => 
-      Core.UTxO.toOutRefString(u).startsWith(TransactionHash.toHex(configTxHash)) && 
+      Cardano.UTxO.toOutRefString(u).startsWith(TransactionHash.toHex(configTxHash)) && 
       u.assets.lovelace === 5_000_000n
     )
     if (!configUtxo) throw new Error("Config UTxO not found")
diff --git a/packages/evolution-devnet/test/utils/utxo-helpers.ts b/packages/evolution-devnet/test/utils/utxo-helpers.ts
index 28f5e226..aeebb397 100644
--- a/packages/evolution-devnet/test/utils/utxo-helpers.ts
+++ b/packages/evolution-devnet/test/utils/utxo-helpers.ts
@@ -1,14 +1,14 @@
-import { Core } from "@evolution-sdk/evolution"
-import * as CoreAddress from "@evolution-sdk/evolution/core/Address"
-import * as CoreData from "@evolution-sdk/evolution/core/Data"
-import * as CoreDatumOption from "@evolution-sdk/evolution/core/DatumOption"
-import type * as CoreScript from "@evolution-sdk/evolution/core/Script"
-import * as CoreTransactionHash from "@evolution-sdk/evolution/core/TransactionHash"
-import * as CoreUTxO from "@evolution-sdk/evolution/core/UTxO"
+import { Cardano } from "@evolution-sdk/evolution"
+import * as CoreAddress from "@evolution-sdk/evolution/Address"
+import * as CoreData from "@evolution-sdk/evolution/Data"
+import * as CoreDatumOption from "@evolution-sdk/evolution/DatumOption"
+import type * as CoreScript from "@evolution-sdk/evolution/Script"
 import type * as Datum from "@evolution-sdk/evolution/sdk/Datum"
+import * as CoreTransactionHash from "@evolution-sdk/evolution/TransactionHash"
+import * as CoreUTxO from "@evolution-sdk/evolution/UTxO"
 
-// Alias for Core.Assets
-const CoreAssets = Core.Assets
+// Alias for Cardano.Assets
+const CoreAssets = Cardano.Assets
 
 /**
  * Default test address used when no address is provided.
diff --git a/packages/evolution/docgen.json b/packages/evolution/docgen.json
index cc0cc8c8..11d71619 100644
--- a/packages/evolution/docgen.json
+++ b/packages/evolution/docgen.json
@@ -11,7 +11,7 @@
   "enforceExports": false,
   "skipExamplesValidation": true,
   "skipModulesValidation": true,
-  "exclude": ["**/*.test.ts", "**/*.spec.ts", "**/test/**", "**/tests/**", "**/internal/**", "**/index.ts", "**/debug/**"],
+  "exclude": ["**/*.test.ts", "**/*.spec.ts", "**/test/**", "**/tests/**", "**/internal/**", "**/index.ts", "**/debug/**", "**/Cardano.ts"],
   "projectHomepage": "https://github.com/IntersectMBO/evolution-sdk",
   "docsHomepage": "TBD",
   "projectName": "Evolution SDK",
diff --git a/packages/evolution/docs/modules/core/Address.ts.md b/packages/evolution/docs/modules/Address.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/Address.ts.md
rename to packages/evolution/docs/modules/Address.ts.md
index 48d60eb3..ec0a4377 100644
--- a/packages/evolution/docs/modules/core/Address.ts.md
+++ b/packages/evolution/docs/modules/Address.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/Address.ts
-nav_order: 4
+title: Address.ts
+nav_order: 1
 parent: Modules
 ---
 
@@ -225,7 +225,7 @@ export declare const getAddressDetails: (address: string) => AddressDetails | un
 **Example**
 
 ```typescript
-import * as Address from "@evolution-sdk/evolution/core/Address"
+import * as Address from "@evolution-sdk/evolution/Address"
 
 const details = Address.getAddressDetails("addr_test1qp...")
 if (details) {
diff --git a/packages/evolution/docs/modules/core/AddressEras.ts.md b/packages/evolution/docs/modules/AddressEras.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/AddressEras.ts.md
rename to packages/evolution/docs/modules/AddressEras.ts.md
index d817294b..e0635348 100644
--- a/packages/evolution/docs/modules/core/AddressEras.ts.md
+++ b/packages/evolution/docs/modules/AddressEras.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/AddressEras.ts
-nav_order: 5
+title: AddressEras.ts
+nav_order: 2
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/AddressTag.ts.md b/packages/evolution/docs/modules/AddressTag.ts.md
similarity index 93%
rename from packages/evolution/docs/modules/core/AddressTag.ts.md
rename to packages/evolution/docs/modules/AddressTag.ts.md
index 66c0336d..7cc37b24 100644
--- a/packages/evolution/docs/modules/core/AddressTag.ts.md
+++ b/packages/evolution/docs/modules/AddressTag.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/AddressTag.ts
-nav_order: 6
+title: AddressTag.ts
+nav_order: 3
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/Anchor.ts.md b/packages/evolution/docs/modules/Anchor.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/Anchor.ts.md
rename to packages/evolution/docs/modules/Anchor.ts.md
index 518ca7f8..9546945e 100644
--- a/packages/evolution/docs/modules/core/Anchor.ts.md
+++ b/packages/evolution/docs/modules/Anchor.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/Anchor.ts
-nav_order: 7
+title: Anchor.ts
+nav_order: 4
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/AssetName.ts.md b/packages/evolution/docs/modules/AssetName.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/AssetName.ts.md
rename to packages/evolution/docs/modules/AssetName.ts.md
index f61da350..2de8938c 100644
--- a/packages/evolution/docs/modules/core/AssetName.ts.md
+++ b/packages/evolution/docs/modules/AssetName.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/AssetName.ts
-nav_order: 8
+title: AssetName.ts
+nav_order: 5
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/Assets/Label.ts.md b/packages/evolution/docs/modules/Assets/Label.ts.md
similarity index 86%
rename from packages/evolution/docs/modules/core/Assets/Label.ts.md
rename to packages/evolution/docs/modules/Assets/Label.ts.md
index 8ca2f726..de6c5148 100644
--- a/packages/evolution/docs/modules/core/Assets/Label.ts.md
+++ b/packages/evolution/docs/modules/Assets/Label.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/Assets/Label.ts
-nav_order: 9
+title: Assets/Label.ts
+nav_order: 6
 parent: Modules
 ---
 
@@ -36,7 +36,7 @@ export declare const fromLabel: (label: string) => number | undefined
 **Example**
 
 ```typescript
-import * as Label from "@evolution-sdk/evolution/core/Assets/Label"
+import * as Label from "@evolution-sdk/evolution/Assets/Label"
 
 const num = Label.fromLabel("000de140")
 // => 222
@@ -63,7 +63,7 @@ export declare const toLabel: (num: number) => string
 **Example**
 
 ```typescript
-import * as Label from "@evolution-sdk/evolution/core/Assets/Label"
+import * as Label from "@evolution-sdk/evolution/Assets/Label"
 
 const label = Label.toLabel(222)
 // => "000de140"
@@ -91,7 +91,7 @@ export declare const LabelFromHex: Schema.transformOrFail<
 **Example**
 
 ```typescript
-import * as Label from "@evolution-sdk/evolution/core/Assets/Label"
+import * as Label from "@evolution-sdk/evolution/Assets/Label"
 import { Schema } from "effect"
 
 const decoded = Schema.decodeSync(Label.LabelFromHex)("000de140")
diff --git a/packages/evolution/docs/modules/core/Assets/Unit.ts.md b/packages/evolution/docs/modules/Assets/Unit.ts.md
similarity index 97%
rename from packages/evolution/docs/modules/core/Assets/Unit.ts.md
rename to packages/evolution/docs/modules/Assets/Unit.ts.md
index 04f11d1d..ee7cda2a 100644
--- a/packages/evolution/docs/modules/core/Assets/Unit.ts.md
+++ b/packages/evolution/docs/modules/Assets/Unit.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/Assets/Unit.ts
-nav_order: 10
+title: Assets/Unit.ts
+nav_order: 7
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/AuxiliaryData.ts.md b/packages/evolution/docs/modules/AuxiliaryData.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/AuxiliaryData.ts.md
rename to packages/evolution/docs/modules/AuxiliaryData.ts.md
index 080c3f66..c98882a0 100644
--- a/packages/evolution/docs/modules/core/AuxiliaryData.ts.md
+++ b/packages/evolution/docs/modules/AuxiliaryData.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/AuxiliaryData.ts
-nav_order: 11
+title: AuxiliaryData.ts
+nav_order: 8
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/AuxiliaryDataHash.ts.md b/packages/evolution/docs/modules/AuxiliaryDataHash.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/AuxiliaryDataHash.ts.md
rename to packages/evolution/docs/modules/AuxiliaryDataHash.ts.md
index 7460cd73..9afd1dbc 100644
--- a/packages/evolution/docs/modules/core/AuxiliaryDataHash.ts.md
+++ b/packages/evolution/docs/modules/AuxiliaryDataHash.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/AuxiliaryDataHash.ts
-nav_order: 12
+title: AuxiliaryDataHash.ts
+nav_order: 9
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/BaseAddress.ts.md b/packages/evolution/docs/modules/BaseAddress.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/BaseAddress.ts.md
rename to packages/evolution/docs/modules/BaseAddress.ts.md
index ec16101d..6d71b36c 100644
--- a/packages/evolution/docs/modules/core/BaseAddress.ts.md
+++ b/packages/evolution/docs/modules/BaseAddress.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/BaseAddress.ts
-nav_order: 13
+title: BaseAddress.ts
+nav_order: 10
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/Bech32.ts.md b/packages/evolution/docs/modules/Bech32.ts.md
similarity index 96%
rename from packages/evolution/docs/modules/core/Bech32.ts.md
rename to packages/evolution/docs/modules/Bech32.ts.md
index 562d7a17..bcb982c3 100644
--- a/packages/evolution/docs/modules/core/Bech32.ts.md
+++ b/packages/evolution/docs/modules/Bech32.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/Bech32.ts
-nav_order: 14
+title: Bech32.ts
+nav_order: 11
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/BigInt.ts.md b/packages/evolution/docs/modules/BigInt.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/BigInt.ts.md
rename to packages/evolution/docs/modules/BigInt.ts.md
index adcf608c..23d0c802 100644
--- a/packages/evolution/docs/modules/core/BigInt.ts.md
+++ b/packages/evolution/docs/modules/BigInt.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/BigInt.ts
-nav_order: 15
+title: BigInt.ts
+nav_order: 12
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/Bip32PrivateKey.ts.md b/packages/evolution/docs/modules/Bip32PrivateKey.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/Bip32PrivateKey.ts.md
rename to packages/evolution/docs/modules/Bip32PrivateKey.ts.md
index 8b7fdd2c..00267563 100644
--- a/packages/evolution/docs/modules/core/Bip32PrivateKey.ts.md
+++ b/packages/evolution/docs/modules/Bip32PrivateKey.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/Bip32PrivateKey.ts
-nav_order: 16
+title: Bip32PrivateKey.ts
+nav_order: 13
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/Bip32PublicKey.ts.md b/packages/evolution/docs/modules/Bip32PublicKey.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/Bip32PublicKey.ts.md
rename to packages/evolution/docs/modules/Bip32PublicKey.ts.md
index aa16ac40..954beb4a 100644
--- a/packages/evolution/docs/modules/core/Bip32PublicKey.ts.md
+++ b/packages/evolution/docs/modules/Bip32PublicKey.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/Bip32PublicKey.ts
-nav_order: 17
+title: Bip32PublicKey.ts
+nav_order: 14
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/Block.ts.md b/packages/evolution/docs/modules/Block.ts.md
similarity index 96%
rename from packages/evolution/docs/modules/core/Block.ts.md
rename to packages/evolution/docs/modules/Block.ts.md
index 3ba086d3..3a714e2a 100644
--- a/packages/evolution/docs/modules/core/Block.ts.md
+++ b/packages/evolution/docs/modules/Block.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/Block.ts
-nav_order: 18
+title: Block.ts
+nav_order: 15
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/BlockBodyHash.ts.md b/packages/evolution/docs/modules/BlockBodyHash.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/BlockBodyHash.ts.md
rename to packages/evolution/docs/modules/BlockBodyHash.ts.md
index ea9d6bf3..17825ff5 100644
--- a/packages/evolution/docs/modules/core/BlockBodyHash.ts.md
+++ b/packages/evolution/docs/modules/BlockBodyHash.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/BlockBodyHash.ts
-nav_order: 19
+title: BlockBodyHash.ts
+nav_order: 16
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/BlockHeaderHash.ts.md b/packages/evolution/docs/modules/BlockHeaderHash.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/BlockHeaderHash.ts.md
rename to packages/evolution/docs/modules/BlockHeaderHash.ts.md
index 9a032147..69e8388f 100644
--- a/packages/evolution/docs/modules/core/BlockHeaderHash.ts.md
+++ b/packages/evolution/docs/modules/BlockHeaderHash.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/BlockHeaderHash.ts
-nav_order: 20
+title: BlockHeaderHash.ts
+nav_order: 17
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/BootstrapWitness.ts.md b/packages/evolution/docs/modules/BootstrapWitness.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/BootstrapWitness.ts.md
rename to packages/evolution/docs/modules/BootstrapWitness.ts.md
index 3d099642..60890392 100644
--- a/packages/evolution/docs/modules/core/BootstrapWitness.ts.md
+++ b/packages/evolution/docs/modules/BootstrapWitness.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/BootstrapWitness.ts
+title: BootstrapWitness.ts
 nav_order: 21
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/BoundedBytes.ts.md b/packages/evolution/docs/modules/BoundedBytes.ts.md
similarity index 97%
rename from packages/evolution/docs/modules/core/BoundedBytes.ts.md
rename to packages/evolution/docs/modules/BoundedBytes.ts.md
index 3e8b3ac9..3bd71d42 100644
--- a/packages/evolution/docs/modules/core/BoundedBytes.ts.md
+++ b/packages/evolution/docs/modules/BoundedBytes.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/BoundedBytes.ts
+title: BoundedBytes.ts
 nav_order: 22
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/ByronAddress.ts.md b/packages/evolution/docs/modules/ByronAddress.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/ByronAddress.ts.md
rename to packages/evolution/docs/modules/ByronAddress.ts.md
index 2cd92c55..07383a84 100644
--- a/packages/evolution/docs/modules/core/ByronAddress.ts.md
+++ b/packages/evolution/docs/modules/ByronAddress.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/ByronAddress.ts
+title: ByronAddress.ts
 nav_order: 23
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Bytes.ts.md b/packages/evolution/docs/modules/Bytes.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/Bytes.ts.md
rename to packages/evolution/docs/modules/Bytes.ts.md
index 79658e4f..bf39e1c9 100644
--- a/packages/evolution/docs/modules/core/Bytes.ts.md
+++ b/packages/evolution/docs/modules/Bytes.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Bytes.ts
+title: Bytes.ts
 nav_order: 24
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Bytes128.ts.md b/packages/evolution/docs/modules/Bytes128.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/Bytes128.ts.md
rename to packages/evolution/docs/modules/Bytes128.ts.md
index 994f1bfd..34b5f4d3 100644
--- a/packages/evolution/docs/modules/core/Bytes128.ts.md
+++ b/packages/evolution/docs/modules/Bytes128.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Bytes128.ts
+title: Bytes128.ts
 nav_order: 25
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Bytes16.ts.md b/packages/evolution/docs/modules/Bytes16.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/Bytes16.ts.md
rename to packages/evolution/docs/modules/Bytes16.ts.md
index 6f4dee4b..5520c0c7 100644
--- a/packages/evolution/docs/modules/core/Bytes16.ts.md
+++ b/packages/evolution/docs/modules/Bytes16.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Bytes16.ts
+title: Bytes16.ts
 nav_order: 26
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Bytes29.ts.md b/packages/evolution/docs/modules/Bytes29.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/Bytes29.ts.md
rename to packages/evolution/docs/modules/Bytes29.ts.md
index 62f3799a..c317a7b2 100644
--- a/packages/evolution/docs/modules/core/Bytes29.ts.md
+++ b/packages/evolution/docs/modules/Bytes29.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Bytes29.ts
+title: Bytes29.ts
 nav_order: 27
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Bytes32.ts.md b/packages/evolution/docs/modules/Bytes32.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/Bytes32.ts.md
rename to packages/evolution/docs/modules/Bytes32.ts.md
index cd671357..a3d4c037 100644
--- a/packages/evolution/docs/modules/core/Bytes32.ts.md
+++ b/packages/evolution/docs/modules/Bytes32.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Bytes32.ts
+title: Bytes32.ts
 nav_order: 28
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Bytes4.ts.md b/packages/evolution/docs/modules/Bytes4.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/Bytes4.ts.md
rename to packages/evolution/docs/modules/Bytes4.ts.md
index 3835a10c..bac67e6b 100644
--- a/packages/evolution/docs/modules/core/Bytes4.ts.md
+++ b/packages/evolution/docs/modules/Bytes4.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Bytes4.ts
+title: Bytes4.ts
 nav_order: 29
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Bytes448.ts.md b/packages/evolution/docs/modules/Bytes448.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/Bytes448.ts.md
rename to packages/evolution/docs/modules/Bytes448.ts.md
index 256fc50b..8c6e5ee8 100644
--- a/packages/evolution/docs/modules/core/Bytes448.ts.md
+++ b/packages/evolution/docs/modules/Bytes448.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Bytes448.ts
+title: Bytes448.ts
 nav_order: 30
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Bytes57.ts.md b/packages/evolution/docs/modules/Bytes57.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/Bytes57.ts.md
rename to packages/evolution/docs/modules/Bytes57.ts.md
index 46dddab9..ab581fa4 100644
--- a/packages/evolution/docs/modules/core/Bytes57.ts.md
+++ b/packages/evolution/docs/modules/Bytes57.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Bytes57.ts
+title: Bytes57.ts
 nav_order: 31
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Bytes64.ts.md b/packages/evolution/docs/modules/Bytes64.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/Bytes64.ts.md
rename to packages/evolution/docs/modules/Bytes64.ts.md
index a6d4dafe..af5ec22d 100644
--- a/packages/evolution/docs/modules/core/Bytes64.ts.md
+++ b/packages/evolution/docs/modules/Bytes64.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Bytes64.ts
+title: Bytes64.ts
 nav_order: 32
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Bytes80.ts.md b/packages/evolution/docs/modules/Bytes80.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/Bytes80.ts.md
rename to packages/evolution/docs/modules/Bytes80.ts.md
index 96a1fcae..9e708736 100644
--- a/packages/evolution/docs/modules/core/Bytes80.ts.md
+++ b/packages/evolution/docs/modules/Bytes80.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Bytes80.ts
+title: Bytes80.ts
 nav_order: 33
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Bytes96.ts.md b/packages/evolution/docs/modules/Bytes96.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/Bytes96.ts.md
rename to packages/evolution/docs/modules/Bytes96.ts.md
index f0931252..8f636891 100644
--- a/packages/evolution/docs/modules/core/Bytes96.ts.md
+++ b/packages/evolution/docs/modules/Bytes96.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Bytes96.ts
+title: Bytes96.ts
 nav_order: 34
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/CBOR.ts.md b/packages/evolution/docs/modules/CBOR.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/CBOR.ts.md
rename to packages/evolution/docs/modules/CBOR.ts.md
index 86c1a900..096fb2fc 100644
--- a/packages/evolution/docs/modules/core/CBOR.ts.md
+++ b/packages/evolution/docs/modules/CBOR.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/CBOR.ts
+title: CBOR.ts
 nav_order: 35
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Certificate.ts.md b/packages/evolution/docs/modules/Certificate.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/Certificate.ts.md
rename to packages/evolution/docs/modules/Certificate.ts.md
index bf0cf003..481f217d 100644
--- a/packages/evolution/docs/modules/core/Certificate.ts.md
+++ b/packages/evolution/docs/modules/Certificate.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Certificate.ts
+title: Certificate.ts
 nav_order: 36
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Codec.ts.md b/packages/evolution/docs/modules/Codec.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/Codec.ts.md
rename to packages/evolution/docs/modules/Codec.ts.md
index 7f681b8e..d727651c 100644
--- a/packages/evolution/docs/modules/core/Codec.ts.md
+++ b/packages/evolution/docs/modules/Codec.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Codec.ts
+title: Codec.ts
 nav_order: 37
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Coin.ts.md b/packages/evolution/docs/modules/Coin.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/Coin.ts.md
rename to packages/evolution/docs/modules/Coin.ts.md
index 5da74c2a..9263c69d 100644
--- a/packages/evolution/docs/modules/core/Coin.ts.md
+++ b/packages/evolution/docs/modules/Coin.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Coin.ts
+title: Coin.ts
 nav_order: 38
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Combinator.ts.md b/packages/evolution/docs/modules/Combinator.ts.md
similarity index 97%
rename from packages/evolution/docs/modules/core/Combinator.ts.md
rename to packages/evolution/docs/modules/Combinator.ts.md
index 1599247f..e1dc1f5e 100644
--- a/packages/evolution/docs/modules/core/Combinator.ts.md
+++ b/packages/evolution/docs/modules/Combinator.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Combinator.ts
+title: Combinator.ts
 nav_order: 39
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/CommitteeColdCredential.ts.md b/packages/evolution/docs/modules/CommitteeColdCredential.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/CommitteeColdCredential.ts.md
rename to packages/evolution/docs/modules/CommitteeColdCredential.ts.md
index fa13422e..f2864083 100644
--- a/packages/evolution/docs/modules/core/CommitteeColdCredential.ts.md
+++ b/packages/evolution/docs/modules/CommitteeColdCredential.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/CommitteeColdCredential.ts
+title: CommitteeColdCredential.ts
 nav_order: 40
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/CommitteeHotCredential.ts.md b/packages/evolution/docs/modules/CommitteeHotCredential.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/CommitteeHotCredential.ts.md
rename to packages/evolution/docs/modules/CommitteeHotCredential.ts.md
index 70ed25ab..37be8c45 100644
--- a/packages/evolution/docs/modules/core/CommitteeHotCredential.ts.md
+++ b/packages/evolution/docs/modules/CommitteeHotCredential.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/CommitteeHotCredential.ts
+title: CommitteeHotCredential.ts
 nav_order: 41
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Constitution.ts.md b/packages/evolution/docs/modules/Constitution.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/Constitution.ts.md
rename to packages/evolution/docs/modules/Constitution.ts.md
index 53bf2a7a..44585905 100644
--- a/packages/evolution/docs/modules/core/Constitution.ts.md
+++ b/packages/evolution/docs/modules/Constitution.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Constitution.ts
+title: Constitution.ts
 nav_order: 42
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/CostModel.ts.md b/packages/evolution/docs/modules/CostModel.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/CostModel.ts.md
rename to packages/evolution/docs/modules/CostModel.ts.md
index 06558da4..aef55adc 100644
--- a/packages/evolution/docs/modules/core/CostModel.ts.md
+++ b/packages/evolution/docs/modules/CostModel.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/CostModel.ts
+title: CostModel.ts
 nav_order: 43
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Credential.ts.md b/packages/evolution/docs/modules/Credential.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/Credential.ts.md
rename to packages/evolution/docs/modules/Credential.ts.md
index f3999ae8..f6ba15f4 100644
--- a/packages/evolution/docs/modules/core/Credential.ts.md
+++ b/packages/evolution/docs/modules/Credential.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Credential.ts
+title: Credential.ts
 nav_order: 44
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/DRep.ts.md b/packages/evolution/docs/modules/DRep.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/DRep.ts.md
rename to packages/evolution/docs/modules/DRep.ts.md
index 231788db..3be285b3 100644
--- a/packages/evolution/docs/modules/core/DRep.ts.md
+++ b/packages/evolution/docs/modules/DRep.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/DRep.ts
+title: DRep.ts
 nav_order: 49
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/DRepCredential.ts.md b/packages/evolution/docs/modules/DRepCredential.ts.md
similarity index 94%
rename from packages/evolution/docs/modules/core/DRepCredential.ts.md
rename to packages/evolution/docs/modules/DRepCredential.ts.md
index d1c1f0dd..124a73e6 100644
--- a/packages/evolution/docs/modules/core/DRepCredential.ts.md
+++ b/packages/evolution/docs/modules/DRepCredential.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/DRepCredential.ts
+title: DRepCredential.ts
 nav_order: 50
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Data.ts.md b/packages/evolution/docs/modules/Data.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/Data.ts.md
rename to packages/evolution/docs/modules/Data.ts.md
index bb7dc343..e7ea8c88 100644
--- a/packages/evolution/docs/modules/core/Data.ts.md
+++ b/packages/evolution/docs/modules/Data.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Data.ts
+title: Data.ts
 nav_order: 45
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/DataJson.ts.md b/packages/evolution/docs/modules/DataJson.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/DataJson.ts.md
rename to packages/evolution/docs/modules/DataJson.ts.md
index 8b9ea3d0..e6351447 100644
--- a/packages/evolution/docs/modules/core/DataJson.ts.md
+++ b/packages/evolution/docs/modules/DataJson.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/DataJson.ts
+title: DataJson.ts
 nav_order: 46
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/DatumOption.ts.md b/packages/evolution/docs/modules/DatumOption.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/DatumOption.ts.md
rename to packages/evolution/docs/modules/DatumOption.ts.md
index a1269f8d..5a2c3be5 100644
--- a/packages/evolution/docs/modules/core/DatumOption.ts.md
+++ b/packages/evolution/docs/modules/DatumOption.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/DatumOption.ts
+title: DatumOption.ts
 nav_order: 47
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/DnsName.ts.md b/packages/evolution/docs/modules/DnsName.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/DnsName.ts.md
rename to packages/evolution/docs/modules/DnsName.ts.md
index 3d047c66..04677e1c 100644
--- a/packages/evolution/docs/modules/core/DnsName.ts.md
+++ b/packages/evolution/docs/modules/DnsName.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/DnsName.ts
+title: DnsName.ts
 nav_order: 48
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Ed25519Signature.ts.md b/packages/evolution/docs/modules/Ed25519Signature.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/Ed25519Signature.ts.md
rename to packages/evolution/docs/modules/Ed25519Signature.ts.md
index 533224df..485b92d9 100644
--- a/packages/evolution/docs/modules/core/Ed25519Signature.ts.md
+++ b/packages/evolution/docs/modules/Ed25519Signature.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Ed25519Signature.ts
+title: Ed25519Signature.ts
 nav_order: 51
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/EnterpriseAddress.ts.md b/packages/evolution/docs/modules/EnterpriseAddress.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/EnterpriseAddress.ts.md
rename to packages/evolution/docs/modules/EnterpriseAddress.ts.md
index f1d280d7..bc42083d 100644
--- a/packages/evolution/docs/modules/core/EnterpriseAddress.ts.md
+++ b/packages/evolution/docs/modules/EnterpriseAddress.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/EnterpriseAddress.ts
+title: EnterpriseAddress.ts
 nav_order: 52
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/EpochNo.ts.md b/packages/evolution/docs/modules/EpochNo.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/EpochNo.ts.md
rename to packages/evolution/docs/modules/EpochNo.ts.md
index 7c57865b..77b0874d 100644
--- a/packages/evolution/docs/modules/core/EpochNo.ts.md
+++ b/packages/evolution/docs/modules/EpochNo.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/EpochNo.ts
+title: EpochNo.ts
 nav_order: 53
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/FormatError.ts.md b/packages/evolution/docs/modules/FormatError.ts.md
similarity index 95%
rename from packages/evolution/docs/modules/core/FormatError.ts.md
rename to packages/evolution/docs/modules/FormatError.ts.md
index b00c49bd..8b8c4062 100644
--- a/packages/evolution/docs/modules/core/FormatError.ts.md
+++ b/packages/evolution/docs/modules/FormatError.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/FormatError.ts
+title: FormatError.ts
 nav_order: 54
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Function.ts.md b/packages/evolution/docs/modules/Function.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/Function.ts.md
rename to packages/evolution/docs/modules/Function.ts.md
index f90ee9f1..32458a1a 100644
--- a/packages/evolution/docs/modules/core/Function.ts.md
+++ b/packages/evolution/docs/modules/Function.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Function.ts
+title: Function.ts
 nav_order: 55
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/GovernanceAction.ts.md b/packages/evolution/docs/modules/GovernanceAction.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/GovernanceAction.ts.md
rename to packages/evolution/docs/modules/GovernanceAction.ts.md
index 74f5f2ee..d327b36e 100644
--- a/packages/evolution/docs/modules/core/GovernanceAction.ts.md
+++ b/packages/evolution/docs/modules/GovernanceAction.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/GovernanceAction.ts
+title: GovernanceAction.ts
 nav_order: 56
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Hash28.ts.md b/packages/evolution/docs/modules/Hash28.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/Hash28.ts.md
rename to packages/evolution/docs/modules/Hash28.ts.md
index 02220423..37a23335 100644
--- a/packages/evolution/docs/modules/core/Hash28.ts.md
+++ b/packages/evolution/docs/modules/Hash28.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Hash28.ts
+title: Hash28.ts
 nav_order: 57
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Header.ts.md b/packages/evolution/docs/modules/Header.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/Header.ts.md
rename to packages/evolution/docs/modules/Header.ts.md
index 5f226571..1fdba539 100644
--- a/packages/evolution/docs/modules/core/Header.ts.md
+++ b/packages/evolution/docs/modules/Header.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Header.ts
+title: Header.ts
 nav_order: 58
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/HeaderBody.ts.md b/packages/evolution/docs/modules/HeaderBody.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/HeaderBody.ts.md
rename to packages/evolution/docs/modules/HeaderBody.ts.md
index 78be5645..e755c5b6 100644
--- a/packages/evolution/docs/modules/core/HeaderBody.ts.md
+++ b/packages/evolution/docs/modules/HeaderBody.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/HeaderBody.ts
+title: HeaderBody.ts
 nav_order: 59
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/IPv4.ts.md b/packages/evolution/docs/modules/IPv4.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/IPv4.ts.md
rename to packages/evolution/docs/modules/IPv4.ts.md
index 6ecb7ff7..a74e8122 100644
--- a/packages/evolution/docs/modules/core/IPv4.ts.md
+++ b/packages/evolution/docs/modules/IPv4.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/IPv4.ts
+title: IPv4.ts
 nav_order: 60
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/IPv6.ts.md b/packages/evolution/docs/modules/IPv6.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/IPv6.ts.md
rename to packages/evolution/docs/modules/IPv6.ts.md
index b6c182d4..c4f29483 100644
--- a/packages/evolution/docs/modules/core/IPv6.ts.md
+++ b/packages/evolution/docs/modules/IPv6.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/IPv6.ts
+title: IPv6.ts
 nav_order: 61
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/KESVkey.ts.md b/packages/evolution/docs/modules/KESVkey.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/KESVkey.ts.md
rename to packages/evolution/docs/modules/KESVkey.ts.md
index e174d401..1e6df762 100644
--- a/packages/evolution/docs/modules/core/KESVkey.ts.md
+++ b/packages/evolution/docs/modules/KESVkey.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/KESVkey.ts
+title: KESVkey.ts
 nav_order: 63
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/KesSignature.ts.md b/packages/evolution/docs/modules/KesSignature.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/KesSignature.ts.md
rename to packages/evolution/docs/modules/KesSignature.ts.md
index 362a4366..a9dd33fa 100644
--- a/packages/evolution/docs/modules/core/KesSignature.ts.md
+++ b/packages/evolution/docs/modules/KesSignature.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/KesSignature.ts
+title: KesSignature.ts
 nav_order: 62
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/KeyHash.ts.md b/packages/evolution/docs/modules/KeyHash.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/KeyHash.ts.md
rename to packages/evolution/docs/modules/KeyHash.ts.md
index 3bdf8959..594b0cd7 100644
--- a/packages/evolution/docs/modules/core/KeyHash.ts.md
+++ b/packages/evolution/docs/modules/KeyHash.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/KeyHash.ts
+title: KeyHash.ts
 nav_order: 64
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Language.ts.md b/packages/evolution/docs/modules/Language.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/Language.ts.md
rename to packages/evolution/docs/modules/Language.ts.md
index dcd55821..fe594e86 100644
--- a/packages/evolution/docs/modules/core/Language.ts.md
+++ b/packages/evolution/docs/modules/Language.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Language.ts
+title: Language.ts
 nav_order: 65
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Metadata.ts.md b/packages/evolution/docs/modules/Metadata.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/Metadata.ts.md
rename to packages/evolution/docs/modules/Metadata.ts.md
index 74b50743..9649ca8f 100644
--- a/packages/evolution/docs/modules/core/Metadata.ts.md
+++ b/packages/evolution/docs/modules/Metadata.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Metadata.ts
+title: Metadata.ts
 nav_order: 73
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Mint.ts.md b/packages/evolution/docs/modules/Mint.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/Mint.ts.md
rename to packages/evolution/docs/modules/Mint.ts.md
index 28cce562..dd5f2eb1 100644
--- a/packages/evolution/docs/modules/core/Mint.ts.md
+++ b/packages/evolution/docs/modules/Mint.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Mint.ts
+title: Mint.ts
 nav_order: 74
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/MultiAsset.ts.md b/packages/evolution/docs/modules/MultiAsset.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/MultiAsset.ts.md
rename to packages/evolution/docs/modules/MultiAsset.ts.md
index 27f968c8..7bb8bbcc 100644
--- a/packages/evolution/docs/modules/core/MultiAsset.ts.md
+++ b/packages/evolution/docs/modules/MultiAsset.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/MultiAsset.ts
+title: MultiAsset.ts
 nav_order: 75
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/MultiHostName.ts.md b/packages/evolution/docs/modules/MultiHostName.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/MultiHostName.ts.md
rename to packages/evolution/docs/modules/MultiHostName.ts.md
index b14c5771..3bd17c2d 100644
--- a/packages/evolution/docs/modules/core/MultiHostName.ts.md
+++ b/packages/evolution/docs/modules/MultiHostName.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/MultiHostName.ts
+title: MultiHostName.ts
 nav_order: 76
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/NativeScriptJSON.ts.md b/packages/evolution/docs/modules/NativeScriptJSON.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/NativeScriptJSON.ts.md
rename to packages/evolution/docs/modules/NativeScriptJSON.ts.md
index ec1078be..f2303dc8 100644
--- a/packages/evolution/docs/modules/core/NativeScriptJSON.ts.md
+++ b/packages/evolution/docs/modules/NativeScriptJSON.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/NativeScriptJSON.ts
+title: NativeScriptJSON.ts
 nav_order: 77
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/NativeScripts.ts.md b/packages/evolution/docs/modules/NativeScripts.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/NativeScripts.ts.md
rename to packages/evolution/docs/modules/NativeScripts.ts.md
index 1fd0a968..ee7f6372 100644
--- a/packages/evolution/docs/modules/core/NativeScripts.ts.md
+++ b/packages/evolution/docs/modules/NativeScripts.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/NativeScripts.ts
+title: NativeScripts.ts
 nav_order: 78
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/NativeScriptsOLD.ts.md b/packages/evolution/docs/modules/NativeScriptsOLD.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/NativeScriptsOLD.ts.md
rename to packages/evolution/docs/modules/NativeScriptsOLD.ts.md
index 0b2f6201..5da42a9d 100644
--- a/packages/evolution/docs/modules/core/NativeScriptsOLD.ts.md
+++ b/packages/evolution/docs/modules/NativeScriptsOLD.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/NativeScriptsOLD.ts
+title: NativeScriptsOLD.ts
 nav_order: 79
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Natural.ts.md b/packages/evolution/docs/modules/Natural.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/Natural.ts.md
rename to packages/evolution/docs/modules/Natural.ts.md
index 2c5026f4..2e156aa2 100644
--- a/packages/evolution/docs/modules/core/Natural.ts.md
+++ b/packages/evolution/docs/modules/Natural.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Natural.ts
+title: Natural.ts
 nav_order: 80
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Network.ts.md b/packages/evolution/docs/modules/Network.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/Network.ts.md
rename to packages/evolution/docs/modules/Network.ts.md
index 6050dd1e..1ba560ab 100644
--- a/packages/evolution/docs/modules/core/Network.ts.md
+++ b/packages/evolution/docs/modules/Network.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Network.ts
+title: Network.ts
 nav_order: 81
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/NetworkId.ts.md b/packages/evolution/docs/modules/NetworkId.ts.md
similarity index 97%
rename from packages/evolution/docs/modules/core/NetworkId.ts.md
rename to packages/evolution/docs/modules/NetworkId.ts.md
index 5aafd83b..23a4e07d 100644
--- a/packages/evolution/docs/modules/core/NetworkId.ts.md
+++ b/packages/evolution/docs/modules/NetworkId.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/NetworkId.ts
+title: NetworkId.ts
 nav_order: 82
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/NonZeroInt64.ts.md b/packages/evolution/docs/modules/NonZeroInt64.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/NonZeroInt64.ts.md
rename to packages/evolution/docs/modules/NonZeroInt64.ts.md
index b998bf28..30e32430 100644
--- a/packages/evolution/docs/modules/core/NonZeroInt64.ts.md
+++ b/packages/evolution/docs/modules/NonZeroInt64.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/NonZeroInt64.ts
+title: NonZeroInt64.ts
 nav_order: 84
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/NonnegativeInterval.ts.md b/packages/evolution/docs/modules/NonnegativeInterval.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/NonnegativeInterval.ts.md
rename to packages/evolution/docs/modules/NonnegativeInterval.ts.md
index 6478f200..4a18c6d4 100644
--- a/packages/evolution/docs/modules/core/NonnegativeInterval.ts.md
+++ b/packages/evolution/docs/modules/NonnegativeInterval.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/NonnegativeInterval.ts
+title: NonnegativeInterval.ts
 nav_order: 83
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Numeric.ts.md b/packages/evolution/docs/modules/Numeric.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/Numeric.ts.md
rename to packages/evolution/docs/modules/Numeric.ts.md
index e54c383c..016c1f28 100644
--- a/packages/evolution/docs/modules/core/Numeric.ts.md
+++ b/packages/evolution/docs/modules/Numeric.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Numeric.ts
+title: Numeric.ts
 nav_order: 85
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/OperationalCert.ts.md b/packages/evolution/docs/modules/OperationalCert.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/OperationalCert.ts.md
rename to packages/evolution/docs/modules/OperationalCert.ts.md
index f49897fb..1e0c8a98 100644
--- a/packages/evolution/docs/modules/core/OperationalCert.ts.md
+++ b/packages/evolution/docs/modules/OperationalCert.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/OperationalCert.ts
+title: OperationalCert.ts
 nav_order: 86
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/PaymentAddress.ts.md b/packages/evolution/docs/modules/PaymentAddress.ts.md
similarity index 97%
rename from packages/evolution/docs/modules/core/PaymentAddress.ts.md
rename to packages/evolution/docs/modules/PaymentAddress.ts.md
index 5a970d4f..451be5a3 100644
--- a/packages/evolution/docs/modules/core/PaymentAddress.ts.md
+++ b/packages/evolution/docs/modules/PaymentAddress.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/PaymentAddress.ts
+title: PaymentAddress.ts
 nav_order: 87
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/PlutusV1.ts.md b/packages/evolution/docs/modules/PlutusV1.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/PlutusV1.ts.md
rename to packages/evolution/docs/modules/PlutusV1.ts.md
index e4b48165..4363a572 100644
--- a/packages/evolution/docs/modules/core/PlutusV1.ts.md
+++ b/packages/evolution/docs/modules/PlutusV1.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/PlutusV1.ts
+title: PlutusV1.ts
 nav_order: 93
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/PlutusV2.ts.md b/packages/evolution/docs/modules/PlutusV2.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/PlutusV2.ts.md
rename to packages/evolution/docs/modules/PlutusV2.ts.md
index 8648a776..0f99fd1f 100644
--- a/packages/evolution/docs/modules/core/PlutusV2.ts.md
+++ b/packages/evolution/docs/modules/PlutusV2.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/PlutusV2.ts
+title: PlutusV2.ts
 nav_order: 94
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/PlutusV3.ts.md b/packages/evolution/docs/modules/PlutusV3.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/PlutusV3.ts.md
rename to packages/evolution/docs/modules/PlutusV3.ts.md
index bbcdfa42..2e59a7f9 100644
--- a/packages/evolution/docs/modules/core/PlutusV3.ts.md
+++ b/packages/evolution/docs/modules/PlutusV3.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/PlutusV3.ts
+title: PlutusV3.ts
 nav_order: 95
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Pointer.ts.md b/packages/evolution/docs/modules/Pointer.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/Pointer.ts.md
rename to packages/evolution/docs/modules/Pointer.ts.md
index 83ad93cf..0fa73084 100644
--- a/packages/evolution/docs/modules/core/Pointer.ts.md
+++ b/packages/evolution/docs/modules/Pointer.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Pointer.ts
+title: Pointer.ts
 nav_order: 96
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/PointerAddress.ts.md b/packages/evolution/docs/modules/PointerAddress.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/PointerAddress.ts.md
rename to packages/evolution/docs/modules/PointerAddress.ts.md
index 3dba11d1..8b60f7c5 100644
--- a/packages/evolution/docs/modules/core/PointerAddress.ts.md
+++ b/packages/evolution/docs/modules/PointerAddress.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/PointerAddress.ts
+title: PointerAddress.ts
 nav_order: 97
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/PolicyId.ts.md b/packages/evolution/docs/modules/PolicyId.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/PolicyId.ts.md
rename to packages/evolution/docs/modules/PolicyId.ts.md
index e9a78690..ae3ceb2d 100644
--- a/packages/evolution/docs/modules/core/PolicyId.ts.md
+++ b/packages/evolution/docs/modules/PolicyId.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/PolicyId.ts
+title: PolicyId.ts
 nav_order: 98
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/PoolKeyHash.ts.md b/packages/evolution/docs/modules/PoolKeyHash.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/PoolKeyHash.ts.md
rename to packages/evolution/docs/modules/PoolKeyHash.ts.md
index 3b558679..0c7c5c8f 100644
--- a/packages/evolution/docs/modules/core/PoolKeyHash.ts.md
+++ b/packages/evolution/docs/modules/PoolKeyHash.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/PoolKeyHash.ts
+title: PoolKeyHash.ts
 nav_order: 99
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/PoolMetadata.ts.md b/packages/evolution/docs/modules/PoolMetadata.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/PoolMetadata.ts.md
rename to packages/evolution/docs/modules/PoolMetadata.ts.md
index 8b588351..52fd4da8 100644
--- a/packages/evolution/docs/modules/core/PoolMetadata.ts.md
+++ b/packages/evolution/docs/modules/PoolMetadata.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/PoolMetadata.ts
+title: PoolMetadata.ts
 nav_order: 100
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/PoolParams.ts.md b/packages/evolution/docs/modules/PoolParams.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/PoolParams.ts.md
rename to packages/evolution/docs/modules/PoolParams.ts.md
index f150632c..c288bd7a 100644
--- a/packages/evolution/docs/modules/core/PoolParams.ts.md
+++ b/packages/evolution/docs/modules/PoolParams.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/PoolParams.ts
+title: PoolParams.ts
 nav_order: 101
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Port.ts.md b/packages/evolution/docs/modules/Port.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/Port.ts.md
rename to packages/evolution/docs/modules/Port.ts.md
index c350c55a..30f1383b 100644
--- a/packages/evolution/docs/modules/core/Port.ts.md
+++ b/packages/evolution/docs/modules/Port.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Port.ts
+title: Port.ts
 nav_order: 102
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/PositiveCoin.ts.md b/packages/evolution/docs/modules/PositiveCoin.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/PositiveCoin.ts.md
rename to packages/evolution/docs/modules/PositiveCoin.ts.md
index 123927e5..8d7a7b7c 100644
--- a/packages/evolution/docs/modules/core/PositiveCoin.ts.md
+++ b/packages/evolution/docs/modules/PositiveCoin.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/PositiveCoin.ts
+title: PositiveCoin.ts
 nav_order: 103
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/PrivateKey.ts.md b/packages/evolution/docs/modules/PrivateKey.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/PrivateKey.ts.md
rename to packages/evolution/docs/modules/PrivateKey.ts.md
index 91604d6b..90590a33 100644
--- a/packages/evolution/docs/modules/core/PrivateKey.ts.md
+++ b/packages/evolution/docs/modules/PrivateKey.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/PrivateKey.ts
+title: PrivateKey.ts
 nav_order: 104
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/ProposalProcedure.ts.md b/packages/evolution/docs/modules/ProposalProcedure.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/ProposalProcedure.ts.md
rename to packages/evolution/docs/modules/ProposalProcedure.ts.md
index 53435325..02e8cddb 100644
--- a/packages/evolution/docs/modules/core/ProposalProcedure.ts.md
+++ b/packages/evolution/docs/modules/ProposalProcedure.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/ProposalProcedure.ts
+title: ProposalProcedure.ts
 nav_order: 105
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/ProposalProcedures.ts.md b/packages/evolution/docs/modules/ProposalProcedures.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/ProposalProcedures.ts.md
rename to packages/evolution/docs/modules/ProposalProcedures.ts.md
index 7979715a..6610ff22 100644
--- a/packages/evolution/docs/modules/core/ProposalProcedures.ts.md
+++ b/packages/evolution/docs/modules/ProposalProcedures.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/ProposalProcedures.ts
+title: ProposalProcedures.ts
 nav_order: 106
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/ProtocolParamUpdate.ts.md b/packages/evolution/docs/modules/ProtocolParamUpdate.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/ProtocolParamUpdate.ts.md
rename to packages/evolution/docs/modules/ProtocolParamUpdate.ts.md
index 4f325811..9076bdba 100644
--- a/packages/evolution/docs/modules/core/ProtocolParamUpdate.ts.md
+++ b/packages/evolution/docs/modules/ProtocolParamUpdate.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/ProtocolParamUpdate.ts
+title: ProtocolParamUpdate.ts
 nav_order: 107
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/ProtocolVersion.ts.md b/packages/evolution/docs/modules/ProtocolVersion.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/ProtocolVersion.ts.md
rename to packages/evolution/docs/modules/ProtocolVersion.ts.md
index ea563bae..2bc51243 100644
--- a/packages/evolution/docs/modules/core/ProtocolVersion.ts.md
+++ b/packages/evolution/docs/modules/ProtocolVersion.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/ProtocolVersion.ts
+title: ProtocolVersion.ts
 nav_order: 108
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Redeemer.ts.md b/packages/evolution/docs/modules/Redeemer.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/Redeemer.ts.md
rename to packages/evolution/docs/modules/Redeemer.ts.md
index 62c96f57..3788350f 100644
--- a/packages/evolution/docs/modules/core/Redeemer.ts.md
+++ b/packages/evolution/docs/modules/Redeemer.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Redeemer.ts
+title: Redeemer.ts
 nav_order: 109
 parent: Modules
 ---
@@ -138,7 +138,7 @@ FastCheck arbitrary for generating random RedeemerTag values.
 
 ```ts
 export declare const arbitraryRedeemerTag: FastCheck.Arbitrary<
-  "spend" | "mint" | "cert" | "reward" | "vote" | "propose"
+  "vote" | "spend" | "mint" | "cert" | "reward" | "propose"
 >
 ```
 
diff --git a/packages/evolution/docs/modules/core/Redeemers.ts.md b/packages/evolution/docs/modules/Redeemers.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/Redeemers.ts.md
rename to packages/evolution/docs/modules/Redeemers.ts.md
index bb4f283b..0371e3da 100644
--- a/packages/evolution/docs/modules/core/Redeemers.ts.md
+++ b/packages/evolution/docs/modules/Redeemers.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Redeemers.ts
+title: Redeemers.ts
 nav_order: 110
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Relay.ts.md b/packages/evolution/docs/modules/Relay.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/Relay.ts.md
rename to packages/evolution/docs/modules/Relay.ts.md
index 77ee17bf..0b921142 100644
--- a/packages/evolution/docs/modules/core/Relay.ts.md
+++ b/packages/evolution/docs/modules/Relay.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Relay.ts
+title: Relay.ts
 nav_order: 111
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/RewardAccount.ts.md b/packages/evolution/docs/modules/RewardAccount.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/RewardAccount.ts.md
rename to packages/evolution/docs/modules/RewardAccount.ts.md
index 8297541c..a9ebffd5 100644
--- a/packages/evolution/docs/modules/core/RewardAccount.ts.md
+++ b/packages/evolution/docs/modules/RewardAccount.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/RewardAccount.ts
+title: RewardAccount.ts
 nav_order: 112
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/RewardAddress.ts.md b/packages/evolution/docs/modules/RewardAddress.ts.md
similarity index 97%
rename from packages/evolution/docs/modules/core/RewardAddress.ts.md
rename to packages/evolution/docs/modules/RewardAddress.ts.md
index a717d287..08bea2ec 100644
--- a/packages/evolution/docs/modules/core/RewardAddress.ts.md
+++ b/packages/evolution/docs/modules/RewardAddress.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/RewardAddress.ts
+title: RewardAddress.ts
 nav_order: 113
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/Script.ts.md b/packages/evolution/docs/modules/Script.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/Script.ts.md
rename to packages/evolution/docs/modules/Script.ts.md
index 439b3634..176b2b8a 100644
--- a/packages/evolution/docs/modules/core/Script.ts.md
+++ b/packages/evolution/docs/modules/Script.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/Script.ts
+title: Script.ts
 nav_order: 114
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/ScriptDataHash.ts.md b/packages/evolution/docs/modules/ScriptDataHash.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/ScriptDataHash.ts.md
rename to packages/evolution/docs/modules/ScriptDataHash.ts.md
index 46159f50..ad791e82 100644
--- a/packages/evolution/docs/modules/core/ScriptDataHash.ts.md
+++ b/packages/evolution/docs/modules/ScriptDataHash.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/ScriptDataHash.ts
+title: ScriptDataHash.ts
 nav_order: 115
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/ScriptHash.ts.md b/packages/evolution/docs/modules/ScriptHash.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/ScriptHash.ts.md
rename to packages/evolution/docs/modules/ScriptHash.ts.md
index f9dfc43a..459a5165 100644
--- a/packages/evolution/docs/modules/core/ScriptHash.ts.md
+++ b/packages/evolution/docs/modules/ScriptHash.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/ScriptHash.ts
+title: ScriptHash.ts
 nav_order: 116
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/ScriptRef.ts.md b/packages/evolution/docs/modules/ScriptRef.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/ScriptRef.ts.md
rename to packages/evolution/docs/modules/ScriptRef.ts.md
index 306255f3..8ce1143c 100644
--- a/packages/evolution/docs/modules/core/ScriptRef.ts.md
+++ b/packages/evolution/docs/modules/ScriptRef.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/ScriptRef.ts
+title: ScriptRef.ts
 nav_order: 117
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/SingleHostAddr.ts.md b/packages/evolution/docs/modules/SingleHostAddr.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/SingleHostAddr.ts.md
rename to packages/evolution/docs/modules/SingleHostAddr.ts.md
index 11ab521b..0ac1938f 100644
--- a/packages/evolution/docs/modules/core/SingleHostAddr.ts.md
+++ b/packages/evolution/docs/modules/SingleHostAddr.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/SingleHostAddr.ts
-nav_order: 118
+title: SingleHostAddr.ts
+nav_order: 163
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/SingleHostName.ts.md b/packages/evolution/docs/modules/SingleHostName.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/SingleHostName.ts.md
rename to packages/evolution/docs/modules/SingleHostName.ts.md
index 5c0bb026..0a1f83c8 100644
--- a/packages/evolution/docs/modules/core/SingleHostName.ts.md
+++ b/packages/evolution/docs/modules/SingleHostName.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/SingleHostName.ts
-nav_order: 119
+title: SingleHostName.ts
+nav_order: 164
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/StakeReference.ts.md b/packages/evolution/docs/modules/StakeReference.ts.md
similarity index 94%
rename from packages/evolution/docs/modules/core/StakeReference.ts.md
rename to packages/evolution/docs/modules/StakeReference.ts.md
index 6d1e9c29..633455b2 100644
--- a/packages/evolution/docs/modules/core/StakeReference.ts.md
+++ b/packages/evolution/docs/modules/StakeReference.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/StakeReference.ts
-nav_order: 120
+title: StakeReference.ts
+nav_order: 165
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/TSchema.ts.md b/packages/evolution/docs/modules/TSchema.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/TSchema.ts.md
rename to packages/evolution/docs/modules/TSchema.ts.md
index f577a50a..7d39da47 100644
--- a/packages/evolution/docs/modules/core/TSchema.ts.md
+++ b/packages/evolution/docs/modules/TSchema.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/TSchema.ts
-nav_order: 135
+title: TSchema.ts
+nav_order: 180
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/Text.ts.md b/packages/evolution/docs/modules/Text.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/Text.ts.md
rename to packages/evolution/docs/modules/Text.ts.md
index 8ef7f046..03dbed01 100644
--- a/packages/evolution/docs/modules/core/Text.ts.md
+++ b/packages/evolution/docs/modules/Text.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/Text.ts
-nav_order: 121
+title: Text.ts
+nav_order: 166
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/Text128.ts.md b/packages/evolution/docs/modules/Text128.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/Text128.ts.md
rename to packages/evolution/docs/modules/Text128.ts.md
index 2c170d4e..ebfc838c 100644
--- a/packages/evolution/docs/modules/core/Text128.ts.md
+++ b/packages/evolution/docs/modules/Text128.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/Text128.ts
-nav_order: 122
+title: Text128.ts
+nav_order: 167
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/Time/Slot.ts.md b/packages/evolution/docs/modules/Time/Slot.ts.md
similarity index 93%
rename from packages/evolution/docs/modules/core/Time/Slot.ts.md
rename to packages/evolution/docs/modules/Time/Slot.ts.md
index eec4cf3b..23e3e3f0 100644
--- a/packages/evolution/docs/modules/core/Time/Slot.ts.md
+++ b/packages/evolution/docs/modules/Time/Slot.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/Time/Slot.ts
-nav_order: 123
+title: Time/Slot.ts
+nav_order: 168
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/Time/SlotConfig.ts.md b/packages/evolution/docs/modules/Time/SlotConfig.ts.md
similarity index 96%
rename from packages/evolution/docs/modules/core/Time/SlotConfig.ts.md
rename to packages/evolution/docs/modules/Time/SlotConfig.ts.md
index bd219a72..afcbc402 100644
--- a/packages/evolution/docs/modules/core/Time/SlotConfig.ts.md
+++ b/packages/evolution/docs/modules/Time/SlotConfig.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/Time/SlotConfig.ts
-nav_order: 124
+title: Time/SlotConfig.ts
+nav_order: 169
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/Time/UnixTime.ts.md b/packages/evolution/docs/modules/Time/UnixTime.ts.md
similarity index 97%
rename from packages/evolution/docs/modules/core/Time/UnixTime.ts.md
rename to packages/evolution/docs/modules/Time/UnixTime.ts.md
index 7d44915b..7586b75c 100644
--- a/packages/evolution/docs/modules/core/Time/UnixTime.ts.md
+++ b/packages/evolution/docs/modules/Time/UnixTime.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/Time/UnixTime.ts
-nav_order: 125
+title: Time/UnixTime.ts
+nav_order: 170
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/Transaction.ts.md b/packages/evolution/docs/modules/Transaction.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/Transaction.ts.md
rename to packages/evolution/docs/modules/Transaction.ts.md
index 79964e09..f6e4da59 100644
--- a/packages/evolution/docs/modules/core/Transaction.ts.md
+++ b/packages/evolution/docs/modules/Transaction.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/Transaction.ts
-nav_order: 126
+title: Transaction.ts
+nav_order: 171
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/TransactionBody.ts.md b/packages/evolution/docs/modules/TransactionBody.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/TransactionBody.ts.md
rename to packages/evolution/docs/modules/TransactionBody.ts.md
index 8f6b6b66..5ef5f3b2 100644
--- a/packages/evolution/docs/modules/core/TransactionBody.ts.md
+++ b/packages/evolution/docs/modules/TransactionBody.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/TransactionBody.ts
-nav_order: 127
+title: TransactionBody.ts
+nav_order: 172
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/TransactionHash.ts.md b/packages/evolution/docs/modules/TransactionHash.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/TransactionHash.ts.md
rename to packages/evolution/docs/modules/TransactionHash.ts.md
index f1ef01fe..1eb99833 100644
--- a/packages/evolution/docs/modules/core/TransactionHash.ts.md
+++ b/packages/evolution/docs/modules/TransactionHash.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/TransactionHash.ts
-nav_order: 128
+title: TransactionHash.ts
+nav_order: 173
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/TransactionIndex.ts.md b/packages/evolution/docs/modules/TransactionIndex.ts.md
similarity index 96%
rename from packages/evolution/docs/modules/core/TransactionIndex.ts.md
rename to packages/evolution/docs/modules/TransactionIndex.ts.md
index a91492fa..51f19c8e 100644
--- a/packages/evolution/docs/modules/core/TransactionIndex.ts.md
+++ b/packages/evolution/docs/modules/TransactionIndex.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/TransactionIndex.ts
-nav_order: 129
+title: TransactionIndex.ts
+nav_order: 174
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/TransactionInput.ts.md b/packages/evolution/docs/modules/TransactionInput.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/TransactionInput.ts.md
rename to packages/evolution/docs/modules/TransactionInput.ts.md
index ce76cb69..ef03efa7 100644
--- a/packages/evolution/docs/modules/core/TransactionInput.ts.md
+++ b/packages/evolution/docs/modules/TransactionInput.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/TransactionInput.ts
-nav_order: 130
+title: TransactionInput.ts
+nav_order: 175
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/TransactionMetadatum.ts.md b/packages/evolution/docs/modules/TransactionMetadatum.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/TransactionMetadatum.ts.md
rename to packages/evolution/docs/modules/TransactionMetadatum.ts.md
index a242d260..daa21b67 100644
--- a/packages/evolution/docs/modules/core/TransactionMetadatum.ts.md
+++ b/packages/evolution/docs/modules/TransactionMetadatum.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/TransactionMetadatum.ts
-nav_order: 131
+title: TransactionMetadatum.ts
+nav_order: 176
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/TransactionMetadatumLabels.ts.md b/packages/evolution/docs/modules/TransactionMetadatumLabels.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/TransactionMetadatumLabels.ts.md
rename to packages/evolution/docs/modules/TransactionMetadatumLabels.ts.md
index b716a169..ffa6a675 100644
--- a/packages/evolution/docs/modules/core/TransactionMetadatumLabels.ts.md
+++ b/packages/evolution/docs/modules/TransactionMetadatumLabels.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/TransactionMetadatumLabels.ts
-nav_order: 132
+title: TransactionMetadatumLabels.ts
+nav_order: 177
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/TransactionOutput.ts.md b/packages/evolution/docs/modules/TransactionOutput.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/TransactionOutput.ts.md
rename to packages/evolution/docs/modules/TransactionOutput.ts.md
index 0853024d..88d44a39 100644
--- a/packages/evolution/docs/modules/core/TransactionOutput.ts.md
+++ b/packages/evolution/docs/modules/TransactionOutput.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/TransactionOutput.ts
-nav_order: 133
+title: TransactionOutput.ts
+nav_order: 178
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/TransactionWitnessSet.ts.md b/packages/evolution/docs/modules/TransactionWitnessSet.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/TransactionWitnessSet.ts.md
rename to packages/evolution/docs/modules/TransactionWitnessSet.ts.md
index 5b0053d1..566fcdc8 100644
--- a/packages/evolution/docs/modules/core/TransactionWitnessSet.ts.md
+++ b/packages/evolution/docs/modules/TransactionWitnessSet.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/TransactionWitnessSet.ts
-nav_order: 134
+title: TransactionWitnessSet.ts
+nav_order: 179
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/TxOut.ts.md b/packages/evolution/docs/modules/TxOut.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/TxOut.ts.md
rename to packages/evolution/docs/modules/TxOut.ts.md
index f98de205..2f3d62db 100644
--- a/packages/evolution/docs/modules/core/TxOut.ts.md
+++ b/packages/evolution/docs/modules/TxOut.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/TxOut.ts
-nav_order: 136
+title: TxOut.ts
+nav_order: 181
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/UTxO.ts.md b/packages/evolution/docs/modules/UTxO.ts.md
similarity index 65%
rename from packages/evolution/docs/modules/core/UTxO.ts.md
rename to packages/evolution/docs/modules/UTxO.ts.md
index f768529c..771e0d0c 100644
--- a/packages/evolution/docs/modules/core/UTxO.ts.md
+++ b/packages/evolution/docs/modules/UTxO.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/UTxO.ts
-nav_order: 140
+title: UTxO.ts
+nav_order: 188
 parent: Modules
 ---
 
@@ -21,15 +21,7 @@ parent: Modules
   - [empty](#empty)
   - [fromIterable](#fromiterable)
 - [conversions](#conversions)
-  - [datumOptionFromSDK](#datumoptionfromsdk)
-  - [datumOptionToSDK](#datumoptiontosdk)
-  - [fromSDK](#fromsdk)
-  - [fromSDKArray](#fromsdkarray)
-  - [scriptFromSDK](#scriptfromsdk)
-  - [scriptToSDK](#scripttosdk)
   - [toArray](#toarray)
-  - [toSDK](#tosdk)
-  - [toSDKArray](#tosdkarray)
 - [getters](#getters)
   - [size](#size)
   - [toOutRefString](#tooutrefstring)
@@ -150,88 +142,6 @@ Added in v2.0.0
 
 # conversions
 
-## datumOptionFromSDK
-
-Convert SDK DatumOption to Core DatumOption.
-
-**Signature**
-
-```ts
-export declare const datumOptionFromSDK: (
-  datum: SDKDatum.Datum
-) => Effect.Effect<DatumOption.DatumOption, ParseResult.ParseError>
-```
-
-Added in v2.0.0
-
-## datumOptionToSDK
-
-Convert Core DatumOption to SDK Datum.
-
-**Signature**
-
-```ts
-export declare const datumOptionToSDK: (datumOption: DatumOption.DatumOption) => SDKDatum.Datum
-```
-
-Added in v2.0.0
-
-## fromSDK
-
-Convert SDK UTxO to Core UTxO.
-
-**Signature**
-
-```ts
-export declare const fromSDK: (
-  utxo: SDKUTxO.UTxO,
-  toCoreAssets: (assets: SDKAssets.Assets) => Assets.Assets
-) => Effect.Effect<UTxO, ParseResult.ParseError>
-```
-
-Added in v2.0.0
-
-## fromSDKArray
-
-Convert an array of SDK UTxOs to a Core UTxOSet.
-
-**Signature**
-
-```ts
-export declare const fromSDKArray: (
-  utxos: ReadonlyArray<SDKUTxO.UTxO>,
-  toCoreAssets: (assets: SDKAssets.Assets) => Assets.Assets
-) => Effect.Effect<UTxOSet, ParseResult.ParseError>
-```
-
-Added in v2.0.0
-
-## scriptFromSDK
-
-Convert SDK Script to Core Script.
-
-**Signature**
-
-```ts
-export declare const scriptFromSDK: (
-  sdkScript: SDKScript.Script
-) => Effect.Effect<Script.Script, ParseResult.ParseError>
-```
-
-Added in v2.0.0
-
-## scriptToSDK
-
-Convert Core Script to SDK Script.
-
-**Signature**
-
-```ts
-export declare const scriptToSDK: (script: Script.Script) => SDKScript.Script
-```
-
-Added in v2.0.0
-
 ## toArray
 
 Convert a UTxO set to an array.
@@ -244,33 +154,6 @@ export declare const toArray: (set: UTxOSet) => Array<UTxO>
 
 Added in v2.0.0
 
-## toSDK
-
-Convert Core UTxO to SDK UTxO.
-
-**Signature**
-
-```ts
-export declare const toSDK: (utxo: UTxO, fromCoreAssets: (assets: Assets.Assets) => SDKAssets.Assets) => SDKUTxO.UTxO
-```
-
-Added in v2.0.0
-
-## toSDKArray
-
-Convert a Core UTxOSet to an array of SDK UTxOs.
-
-**Signature**
-
-```ts
-export declare const toSDKArray: (
-  set: UTxOSet,
-  fromCoreAssets: (assets: Assets.Assets) => SDKAssets.Assets
-) => Array<SDKUTxO.UTxO>
-```
-
-Added in v2.0.0
-
 # getters
 
 ## size
diff --git a/packages/evolution/docs/modules/core/UnitInterval.ts.md b/packages/evolution/docs/modules/UnitInterval.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/UnitInterval.ts.md
rename to packages/evolution/docs/modules/UnitInterval.ts.md
index 2e534aa4..68dc412f 100644
--- a/packages/evolution/docs/modules/core/UnitInterval.ts.md
+++ b/packages/evolution/docs/modules/UnitInterval.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/UnitInterval.ts
-nav_order: 137
+title: UnitInterval.ts
+nav_order: 182
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/Url.ts.md b/packages/evolution/docs/modules/Url.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/Url.ts.md
rename to packages/evolution/docs/modules/Url.ts.md
index 4da56e43..c8b7ab22 100644
--- a/packages/evolution/docs/modules/core/Url.ts.md
+++ b/packages/evolution/docs/modules/Url.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/Url.ts
-nav_order: 139
+title: Url.ts
+nav_order: 184
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/VKey.ts.md b/packages/evolution/docs/modules/VKey.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/VKey.ts.md
rename to packages/evolution/docs/modules/VKey.ts.md
index 2efbfef4..2bb622f1 100644
--- a/packages/evolution/docs/modules/core/VKey.ts.md
+++ b/packages/evolution/docs/modules/VKey.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/VKey.ts
-nav_order: 142
+title: VKey.ts
+nav_order: 190
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/Value.ts.md b/packages/evolution/docs/modules/Value.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/Value.ts.md
rename to packages/evolution/docs/modules/Value.ts.md
index 0483eaee..d7886385 100644
--- a/packages/evolution/docs/modules/core/Value.ts.md
+++ b/packages/evolution/docs/modules/Value.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/Value.ts
-nav_order: 141
+title: Value.ts
+nav_order: 189
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/VotingProcedures.ts.md b/packages/evolution/docs/modules/VotingProcedures.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/VotingProcedures.ts.md
rename to packages/evolution/docs/modules/VotingProcedures.ts.md
index 3cca99be..2130d1b9 100644
--- a/packages/evolution/docs/modules/core/VotingProcedures.ts.md
+++ b/packages/evolution/docs/modules/VotingProcedures.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/VotingProcedures.ts
-nav_order: 143
+title: VotingProcedures.ts
+nav_order: 191
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/VrfCert.ts.md b/packages/evolution/docs/modules/VrfCert.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/VrfCert.ts.md
rename to packages/evolution/docs/modules/VrfCert.ts.md
index 37eb7e49..ac6d7351 100644
--- a/packages/evolution/docs/modules/core/VrfCert.ts.md
+++ b/packages/evolution/docs/modules/VrfCert.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/VrfCert.ts
-nav_order: 144
+title: VrfCert.ts
+nav_order: 192
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/VrfKeyHash.ts.md b/packages/evolution/docs/modules/VrfKeyHash.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/VrfKeyHash.ts.md
rename to packages/evolution/docs/modules/VrfKeyHash.ts.md
index 232a8df7..af94e807 100644
--- a/packages/evolution/docs/modules/core/VrfKeyHash.ts.md
+++ b/packages/evolution/docs/modules/VrfKeyHash.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/VrfKeyHash.ts
-nav_order: 145
+title: VrfKeyHash.ts
+nav_order: 193
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/VrfVkey.ts.md b/packages/evolution/docs/modules/VrfVkey.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/VrfVkey.ts.md
rename to packages/evolution/docs/modules/VrfVkey.ts.md
index a9cade5b..4e041555 100644
--- a/packages/evolution/docs/modules/core/VrfVkey.ts.md
+++ b/packages/evolution/docs/modules/VrfVkey.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/VrfVkey.ts
-nav_order: 146
+title: VrfVkey.ts
+nav_order: 194
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/Withdrawals.ts.md b/packages/evolution/docs/modules/Withdrawals.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/Withdrawals.ts.md
rename to packages/evolution/docs/modules/Withdrawals.ts.md
index 071bc342..d81f2c51 100644
--- a/packages/evolution/docs/modules/core/Withdrawals.ts.md
+++ b/packages/evolution/docs/modules/Withdrawals.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/Withdrawals.ts
-nav_order: 147
+title: Withdrawals.ts
+nav_order: 195
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/blueprint/codegen-config.ts.md b/packages/evolution/docs/modules/blueprint/codegen-config.ts.md
index d6f3de0e..62aea51b 100644
--- a/packages/evolution/docs/modules/blueprint/codegen-config.ts.md
+++ b/packages/evolution/docs/modules/blueprint/codegen-config.ts.md
@@ -1,6 +1,6 @@
 ---
 title: blueprint/codegen-config.ts
-nav_order: 1
+nav_order: 18
 parent: Modules
 ---
 
@@ -107,7 +107,7 @@ export interface CodegenConfig {
 
   /**
    * Explicit import lines for Data, TSchema, and effect modules
-   * e.g. data: 'import { Data } from "@evolution-sdk/evolution/core/Data"'
+   * e.g. data: 'import { Data } from "@evolution-sdk/evolution/Data"'
    */
   imports: {
     data: string
diff --git a/packages/evolution/docs/modules/blueprint/codegen.ts.md b/packages/evolution/docs/modules/blueprint/codegen.ts.md
index 7fe7d2d9..7945740d 100644
--- a/packages/evolution/docs/modules/blueprint/codegen.ts.md
+++ b/packages/evolution/docs/modules/blueprint/codegen.ts.md
@@ -1,6 +1,6 @@
 ---
 title: blueprint/codegen.ts
-nav_order: 2
+nav_order: 19
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/blueprint/types.ts.md b/packages/evolution/docs/modules/blueprint/types.ts.md
index 249dc987..0d105ce0 100644
--- a/packages/evolution/docs/modules/blueprint/types.ts.md
+++ b/packages/evolution/docs/modules/blueprint/types.ts.md
@@ -1,6 +1,6 @@
 ---
 title: blueprint/types.ts
-nav_order: 3
+nav_order: 20
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/core/message-signing/CoseKey.ts.md b/packages/evolution/docs/modules/message-signing/CoseKey.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/message-signing/CoseKey.ts.md
rename to packages/evolution/docs/modules/message-signing/CoseKey.ts.md
index 0fc19644..817de1ef 100644
--- a/packages/evolution/docs/modules/core/message-signing/CoseKey.ts.md
+++ b/packages/evolution/docs/modules/message-signing/CoseKey.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/message-signing/CoseKey.ts
+title: message-signing/CoseKey.ts
 nav_order: 66
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/message-signing/CoseSign.ts.md b/packages/evolution/docs/modules/message-signing/CoseSign.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/message-signing/CoseSign.ts.md
rename to packages/evolution/docs/modules/message-signing/CoseSign.ts.md
index 3b1bf9e0..0bd3b6b6 100644
--- a/packages/evolution/docs/modules/core/message-signing/CoseSign.ts.md
+++ b/packages/evolution/docs/modules/message-signing/CoseSign.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/message-signing/CoseSign.ts
+title: message-signing/CoseSign.ts
 nav_order: 67
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/message-signing/CoseSign1.ts.md b/packages/evolution/docs/modules/message-signing/CoseSign1.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/message-signing/CoseSign1.ts.md
rename to packages/evolution/docs/modules/message-signing/CoseSign1.ts.md
index 4a05c17d..8a4857ea 100644
--- a/packages/evolution/docs/modules/core/message-signing/CoseSign1.ts.md
+++ b/packages/evolution/docs/modules/message-signing/CoseSign1.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/message-signing/CoseSign1.ts
+title: message-signing/CoseSign1.ts
 nav_order: 68
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/message-signing/Header.ts.md b/packages/evolution/docs/modules/message-signing/Header.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/message-signing/Header.ts.md
rename to packages/evolution/docs/modules/message-signing/Header.ts.md
index d7657d28..a35b22ef 100644
--- a/packages/evolution/docs/modules/core/message-signing/Header.ts.md
+++ b/packages/evolution/docs/modules/message-signing/Header.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/message-signing/Header.ts
+title: message-signing/Header.ts
 nav_order: 69
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/message-signing/Label.ts.md b/packages/evolution/docs/modules/message-signing/Label.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/message-signing/Label.ts.md
rename to packages/evolution/docs/modules/message-signing/Label.ts.md
index 4f5000ee..577f6708 100644
--- a/packages/evolution/docs/modules/core/message-signing/Label.ts.md
+++ b/packages/evolution/docs/modules/message-signing/Label.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/message-signing/Label.ts
+title: message-signing/Label.ts
 nav_order: 70
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/message-signing/SignData.ts.md b/packages/evolution/docs/modules/message-signing/SignData.ts.md
similarity index 97%
rename from packages/evolution/docs/modules/core/message-signing/SignData.ts.md
rename to packages/evolution/docs/modules/message-signing/SignData.ts.md
index 0d2cda59..0de2d420 100644
--- a/packages/evolution/docs/modules/core/message-signing/SignData.ts.md
+++ b/packages/evolution/docs/modules/message-signing/SignData.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/message-signing/SignData.ts
+title: message-signing/SignData.ts
 nav_order: 71
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/message-signing/Utils.ts.md b/packages/evolution/docs/modules/message-signing/Utils.ts.md
similarity index 97%
rename from packages/evolution/docs/modules/core/message-signing/Utils.ts.md
rename to packages/evolution/docs/modules/message-signing/Utils.ts.md
index cfe570f3..ce89347b 100644
--- a/packages/evolution/docs/modules/core/message-signing/Utils.ts.md
+++ b/packages/evolution/docs/modules/message-signing/Utils.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/message-signing/Utils.ts
+title: message-signing/Utils.ts
 nav_order: 72
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/plutus/Address.ts.md b/packages/evolution/docs/modules/plutus/Address.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/plutus/Address.ts.md
rename to packages/evolution/docs/modules/plutus/Address.ts.md
index 22e503fd..0cb7568a 100644
--- a/packages/evolution/docs/modules/core/plutus/Address.ts.md
+++ b/packages/evolution/docs/modules/plutus/Address.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/plutus/Address.ts
+title: plutus/Address.ts
 nav_order: 88
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/plutus/CIP68Metadata.ts.md b/packages/evolution/docs/modules/plutus/CIP68Metadata.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/plutus/CIP68Metadata.ts.md
rename to packages/evolution/docs/modules/plutus/CIP68Metadata.ts.md
index b3c04f1e..77c5c675 100644
--- a/packages/evolution/docs/modules/core/plutus/CIP68Metadata.ts.md
+++ b/packages/evolution/docs/modules/plutus/CIP68Metadata.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/plutus/CIP68Metadata.ts
+title: plutus/CIP68Metadata.ts
 nav_order: 89
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/plutus/Credential.ts.md b/packages/evolution/docs/modules/plutus/Credential.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/plutus/Credential.ts.md
rename to packages/evolution/docs/modules/plutus/Credential.ts.md
index 55013178..c381a1db 100644
--- a/packages/evolution/docs/modules/core/plutus/Credential.ts.md
+++ b/packages/evolution/docs/modules/plutus/Credential.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/plutus/Credential.ts
+title: plutus/Credential.ts
 nav_order: 90
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/plutus/OutputReference.ts.md b/packages/evolution/docs/modules/plutus/OutputReference.ts.md
similarity index 98%
rename from packages/evolution/docs/modules/core/plutus/OutputReference.ts.md
rename to packages/evolution/docs/modules/plutus/OutputReference.ts.md
index bedbbfe3..38312d25 100644
--- a/packages/evolution/docs/modules/core/plutus/OutputReference.ts.md
+++ b/packages/evolution/docs/modules/plutus/OutputReference.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/plutus/OutputReference.ts
+title: plutus/OutputReference.ts
 nav_order: 91
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/core/plutus/Value.ts.md b/packages/evolution/docs/modules/plutus/Value.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/plutus/Value.ts.md
rename to packages/evolution/docs/modules/plutus/Value.ts.md
index 93e08686..e674e3b3 100644
--- a/packages/evolution/docs/modules/core/plutus/Value.ts.md
+++ b/packages/evolution/docs/modules/plutus/Value.ts.md
@@ -1,5 +1,5 @@
 ---
-title: core/plutus/Value.ts
+title: plutus/Value.ts
 nav_order: 92
 parent: Modules
 ---
diff --git a/packages/evolution/docs/modules/sdk/Address.ts.md b/packages/evolution/docs/modules/sdk/Address.ts.md
deleted file mode 100644
index 2b9c5a03..00000000
--- a/packages/evolution/docs/modules/sdk/Address.ts.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
-title: sdk/Address.ts
-nav_order: 148
-parent: Modules
----
-
-## Address overview
-
-SDK Address module - user-friendly Bech32 string representation
-
-Added in v2.0.0
-
----
-
-<h2 class="text-delta">Table of contents</h2>
-
-- [utils](#utils)
-  - [Address (type alias)](#address-type-alias)
-  - [fromCoreAddress](#fromcoreaddress)
-  - [toCoreAddress](#tocoreaddress)
-
----
-
-# utils
-
-## Address (type alias)
-
-**Signature**
-
-```ts
-export type Address = string
-```
-
-## fromCoreAddress
-
-**Signature**
-
-```ts
-export declare const fromCoreAddress: (a: CoreAddress.Address, overrideOptions?: ParseOptions) => string
-```
-
-## toCoreAddress
-
-**Signature**
-
-```ts
-export declare const toCoreAddress: (i: string, overrideOptions?: ParseOptions) => CoreAddress.Address
-```
diff --git a/packages/evolution/docs/modules/sdk/AddressDetails.ts.md b/packages/evolution/docs/modules/sdk/AddressDetails.ts.md
deleted file mode 100644
index 7a717618..00000000
--- a/packages/evolution/docs/modules/sdk/AddressDetails.ts.md
+++ /dev/null
@@ -1,134 +0,0 @@
----
-title: sdk/AddressDetails.ts
-nav_order: 149
-parent: Modules
----
-
-## AddressDetails overview
-
----
-
-<h2 class="text-delta">Table of contents</h2>
-
-- [encoding](#encoding)
-  - [toBech32](#tobech32)
-  - [toHex](#tohex)
-- [equality](#equality)
-  - [equals](#equals)
-- [parsing](#parsing)
-  - [fromBech32](#frombech32)
-  - [fromHex](#fromhex)
-- [schemas](#schemas)
-  - [AddressDetails (class)](#addressdetails-class)
-- [utils](#utils)
-  - [FromBech32](#frombech32-1)
-  - [FromHex](#fromhex-1)
-
----
-
-# encoding
-
-## toBech32
-
-Convert AddressDetails to Bech32 string.
-
-**Signature**
-
-```ts
-export declare const toBech32: (a: AddressDetails, overrideOptions?: ParseOptions) => string
-```
-
-Added in v2.0.0
-
-## toHex
-
-Convert AddressDetails to hex string.
-
-**Signature**
-
-```ts
-export declare const toHex: (a: AddressDetails, overrideOptions?: ParseOptions) => string
-```
-
-Added in v2.0.0
-
-# equality
-
-## equals
-
-Check if two AddressDetails instances are equal.
-
-**Signature**
-
-```ts
-export declare const equals: (self: AddressDetails, that: AddressDetails) => boolean
-```
-
-Added in v2.0.0
-
-# parsing
-
-## fromBech32
-
-Parse AddressDetails from Bech32 string.
-
-**Signature**
-
-```ts
-export declare const fromBech32: (i: string, overrideOptions?: ParseOptions) => AddressDetails
-```
-
-Added in v2.0.0
-
-## fromHex
-
-Parse AddressDetails from hex string.
-
-**Signature**
-
-```ts
-export declare const fromHex: (i: string, overrideOptions?: ParseOptions) => AddressDetails
-```
-
-Added in v2.0.0
-
-# schemas
-
-## AddressDetails (class)
-
-Schema for AddressDetails representing extended address information.
-Contains the address structure and its serialized representations
-
-**Signature**
-
-```ts
-export declare class AddressDetails
-```
-
-Added in v2.0.0
-
-# utils
-
-## FromBech32
-
-**Signature**
-
-```ts
-export declare const FromBech32: Schema.transformOrFail<
-  typeof Schema.String,
-  Schema.SchemaClass<AddressDetails, AddressDetails, never>,
-  never
->
-```
-
-## FromHex
-
-**Signature**
-
-```ts
-export declare const FromHex: Schema.transformOrFail<
-  typeof Schema.String,
-  Schema.SchemaClass<AddressDetails, AddressDetails, never>,
-  never
->
-```
diff --git a/packages/evolution/docs/modules/sdk/Assets.ts.md b/packages/evolution/docs/modules/sdk/Assets.ts.md
deleted file mode 100644
index 8784b43b..00000000
--- a/packages/evolution/docs/modules/sdk/Assets.ts.md
+++ /dev/null
@@ -1,364 +0,0 @@
----
-title: sdk/Assets.ts
-nav_order: 150
-parent: Modules
----
-
-## Assets overview
-
----
-
-<h2 class="text-delta">Table of contents</h2>
-
-- [conversion](#conversion)
-  - [fromCoreAssets](#fromcoreassets)
-  - [fromCoreAssetsSchema](#fromcoreassetsschema)
-  - [fromMint](#frommint)
-  - [toCoreAssets](#tocoreassets)
-  - [toCoreAssetsSchema](#tocoreassetsschema)
-  - [toMint](#tomint)
-- [helpers](#helpers)
-  - [addLovelace](#addlovelace)
-  - [getLovelace](#getlovelace)
-  - [setLovelace](#setlovelace)
-  - [subtractLovelace](#subtractlovelace)
-- [schemas](#schemas)
-  - [CoreAssetsFromAssets](#coreassetsfromassets)
-  - [MintFromAssets](#mintfromassets)
-- [utils](#utils)
-  - [Assets (type alias)](#assets-type-alias)
-  - [AssetsSchema](#assetsschema)
-  - [add](#add)
-  - [empty](#empty)
-  - [filter](#filter)
-  - [fromLovelace](#fromlovelace)
-  - [getAsset](#getasset)
-  - [getUnits](#getunits)
-  - [hasAsset](#hasasset)
-  - [isEmpty](#isempty)
-  - [make](#make)
-  - [merge](#merge)
-  - [multiply](#multiply)
-  - [negate](#negate)
-  - [sortCanonical](#sortcanonical)
-  - [subtract](#subtract)
-
----
-
-# conversion
-
-## fromCoreAssets
-
-Convert core Assets (lovelace + optional MultiAsset) to SDK Assets format.
-
-**Signature**
-
-```ts
-export declare const fromCoreAssets: (coreAssets: CoreAssets.Assets) => Assets
-```
-
-Added in v2.0.0
-
-## fromCoreAssetsSchema
-
-Convert Core Assets to SDK Assets format.
-
-**Signature**
-
-```ts
-export declare const fromCoreAssetsSchema: (
-  a: CoreAssets.Assets,
-  overrideOptions?: ParseOptions
-) => { readonly lovelace?: string | undefined } & { readonly [x: string]: string }
-```
-
-Added in v2.0.0
-
-## fromMint
-
-Convert Core Mint to SDK Assets format (without lovelace).
-
-**Signature**
-
-```ts
-export declare const fromMint: (
-  a: CoreMint.Mint,
-  overrideOptions?: ParseOptions
-) => { readonly lovelace?: string | undefined } & { readonly [x: string]: string }
-```
-
-Added in v2.0.0
-
-## toCoreAssets
-
-Convert SDK Assets format to core Assets (lovelace + optional MultiAsset).
-
-**Signature**
-
-```ts
-export declare const toCoreAssets: (assets: Assets) => CoreAssets.Assets
-```
-
-Added in v2.0.0
-
-## toCoreAssetsSchema
-
-Convert SDK Assets to Core Assets.
-
-**Signature**
-
-```ts
-export declare const toCoreAssetsSchema: (
-  i: { readonly lovelace?: string | undefined } & { readonly [x: string]: string },
-  overrideOptions?: ParseOptions
-) => CoreAssets.Assets
-```
-
-Added in v2.0.0
-
-## toMint
-
-Convert SDK Assets to Core Mint (lovelace key will be rejected).
-
-**Signature**
-
-```ts
-export declare const toMint: (
-  i: { readonly lovelace?: string | undefined } & { readonly [x: string]: string },
-  overrideOptions?: ParseOptions
-) => CoreMint.Mint
-```
-
-Added in v2.0.0
-
-# helpers
-
-## addLovelace
-
-Add a lovelace amount to Assets.
-
-**Signature**
-
-```ts
-export declare const addLovelace: (assets: Assets, amount: bigint) => Assets
-```
-
-Added in v2.0.0
-
-## getLovelace
-
-Get the lovelace amount from Assets, defaulting to 0n if undefined.
-
-**Signature**
-
-```ts
-export declare const getLovelace: (assets: Assets) => bigint
-```
-
-Added in v2.0.0
-
-## setLovelace
-
-Set the lovelace amount in Assets.
-
-**Signature**
-
-```ts
-export declare const setLovelace: (assets: Assets, amount: bigint) => Assets
-```
-
-Added in v2.0.0
-
-## subtractLovelace
-
-Subtract a lovelace amount from Assets.
-
-**Signature**
-
-```ts
-export declare const subtractLovelace: (assets: Assets, amount: bigint) => Assets
-```
-
-Added in v2.0.0
-
-# schemas
-
-## CoreAssetsFromAssets
-
-Transform between Assets (SDK-friendly) and core Assets.
-
-**Signature**
-
-```ts
-export declare const CoreAssetsFromAssets: Schema.transformOrFail<
-  Schema.extend<
-    Schema.Struct<{ lovelace: Schema.optional<typeof Schema.BigInt> }>,
-    Schema.Record$<typeof Schema.String, typeof Schema.BigInt>
-  >,
-  Schema.SchemaClass<CoreAssets.Assets, CoreAssets.Assets, never>,
-  never
->
-```
-
-Added in v2.0.0
-
-## MintFromAssets
-
-Transform between Assets (SDK-friendly) and Mint (Core).
-
-**Signature**
-
-```ts
-export declare const MintFromAssets: Schema.transformOrFail<
-  Schema.extend<
-    Schema.Struct<{ lovelace: Schema.optional<typeof Schema.BigInt> }>,
-    Schema.Record$<typeof Schema.String, typeof Schema.BigInt>
-  >,
-  Schema.SchemaClass<CoreMint.Mint, CoreMint.Mint, never>,
-  never
->
-```
-
-Added in v2.0.0
-
-# utils
-
-## Assets (type alias)
-
-**Signature**
-
-```ts
-export type Assets = typeof AssetsSchema.Type
-```
-
-## AssetsSchema
-
-**Signature**
-
-```ts
-export declare const AssetsSchema: Schema.extend<
-  Schema.Struct<{ lovelace: Schema.optional<typeof Schema.BigInt> }>,
-  Schema.Record$<typeof Schema.String, typeof Schema.BigInt>
->
-```
-
-## add
-
-**Signature**
-
-```ts
-export declare const add: (a: Assets, b: Assets) => Assets
-```
-
-## empty
-
-**Signature**
-
-```ts
-export declare const empty: () => Assets
-```
-
-## filter
-
-**Signature**
-
-```ts
-export declare const filter: (assets: Assets, predicate: (unit: string, amount: bigint) => boolean) => Assets
-```
-
-## fromLovelace
-
-**Signature**
-
-```ts
-export declare const fromLovelace: (lovelace: bigint) => Assets
-```
-
-## getAsset
-
-**Signature**
-
-```ts
-export declare const getAsset: (assets: Assets, unit: string) => bigint
-```
-
-## getUnits
-
-**Signature**
-
-```ts
-export declare const getUnits: (assets: Assets) => Array<string>
-```
-
-## hasAsset
-
-**Signature**
-
-```ts
-export declare const hasAsset: (assets: Assets, unit: string) => boolean
-```
-
-## isEmpty
-
-**Signature**
-
-```ts
-export declare const isEmpty: (assets: Assets) => boolean
-```
-
-## make
-
-**Signature**
-
-```ts
-export declare const make: (lovelace: bigint, tokens?: Record<string, bigint>) => Assets
-```
-
-## merge
-
-**Signature**
-
-```ts
-export declare const merge: (...assets: Array<Assets>) => Assets
-```
-
-## multiply
-
-Multiply all asset amounts by a factor.
-Useful for calculating fees, rewards, or scaling asset amounts.
-
-**Signature**
-
-```ts
-export declare const multiply: (assets: Assets, factor: bigint) => Assets
-```
-
-## negate
-
-Negate all asset amounts.
-Useful for calculating what needs to be subtracted or for representing debts.
-
-**Signature**
-
-```ts
-export declare const negate: (assets: Assets) => Assets
-```
-
-## sortCanonical
-
-Sort assets according to CBOR canonical ordering rules (RFC 7049 section 3.9).
-Lovelace comes first, then assets sorted by policy ID length, then lexicographically.
-
-**Signature**
-
-```ts
-export declare const sortCanonical: (assets: Assets) => Assets
-```
-
-## subtract
-
-**Signature**
-
-```ts
-export declare const subtract: (a: Assets, b: Assets) => Assets
-```
diff --git a/packages/evolution/docs/modules/sdk/Credential.ts.md b/packages/evolution/docs/modules/sdk/Credential.ts.md
deleted file mode 100644
index edf4e561..00000000
--- a/packages/evolution/docs/modules/sdk/Credential.ts.md
+++ /dev/null
@@ -1,68 +0,0 @@
----
-title: sdk/Credential.ts
-nav_order: 187
-parent: Modules
----
-
-## Credential overview
-
----
-
-<h2 class="text-delta">Table of contents</h2>
-
-- [utils](#utils)
-  - [Credential (type alias)](#credential-type-alias)
-  - [KeyHash (type alias)](#keyhash-type-alias)
-  - [ScriptHash (type alias)](#scripthash-type-alias)
-  - [fromCoreCredential](#fromcorecredential)
-  - [toCoreCredential](#tocorecredential)
-
----
-
-# utils
-
-## Credential (type alias)
-
-**Signature**
-
-```ts
-export type Credential = typeof CoreCredential.Credential.Encoded
-```
-
-## KeyHash (type alias)
-
-**Signature**
-
-```ts
-export type KeyHash = typeof CoreKeyHash.KeyHash.Encoded
-```
-
-## ScriptHash (type alias)
-
-**Signature**
-
-```ts
-export type ScriptHash = typeof CoreScriptHash.ScriptHash.Encoded
-```
-
-## fromCoreCredential
-
-**Signature**
-
-```ts
-export declare const fromCoreCredential: (
-  a: CoreKeyHash.KeyHash | CoreScriptHash.ScriptHash,
-  overrideOptions?: ParseOptions
-) => { readonly _tag: "KeyHash"; readonly hash: string } | { readonly _tag: "ScriptHash"; readonly hash: string }
-```
-
-## toCoreCredential
-
-**Signature**
-
-```ts
-export declare const toCoreCredential: (
-  i: { readonly _tag: "KeyHash"; readonly hash: string } | { readonly _tag: "ScriptHash"; readonly hash: string },
-  overrideOptions?: ParseOptions
-) => CoreKeyHash.KeyHash | CoreScriptHash.ScriptHash
-```
diff --git a/packages/evolution/docs/modules/sdk/Datum.ts.md b/packages/evolution/docs/modules/sdk/Datum.ts.md
deleted file mode 100644
index bf2c227a..00000000
--- a/packages/evolution/docs/modules/sdk/Datum.ts.md
+++ /dev/null
@@ -1,128 +0,0 @@
----
-title: sdk/Datum.ts
-nav_order: 188
-parent: Modules
----
-
-## Datum overview
-
-Datum types and utilities for handling Cardano transaction data.
-
-This module provides types and functions for working with datum values
-that can be attached to UTxOs in Cardano transactions.
-
----
-
-<h2 class="text-delta">Table of contents</h2>
-
-- [utils](#utils)
-  - [Datum (type alias)](#datum-type-alias)
-  - [equals](#equals)
-  - [filterHashes](#filterhashes)
-  - [filterInline](#filterinline)
-  - [groupByType](#groupbytype)
-  - [isDatumHash](#isdatumhash)
-  - [isInlineDatum](#isinlinedatum)
-  - [makeDatumHash](#makedatumhash)
-  - [makeInlineDatum](#makeinlinedatum)
-  - [unique](#unique)
-
----
-
-# utils
-
-## Datum (type alias)
-
-Datum types and utilities for handling Cardano transaction data.
-
-This module provides types and functions for working with datum values
-that can be attached to UTxOs in Cardano transactions.
-
-**Signature**
-
-```ts
-export type Datum =
-  | {
-      type: "datumHash"
-      hash: string
-    }
-  | {
-      type: "inlineDatum"
-      inline: string
-    }
-```
-
-## equals
-
-**Signature**
-
-```ts
-export declare const equals: (a: Datum, b: Datum) => boolean
-```
-
-## filterHashes
-
-**Signature**
-
-```ts
-export declare const filterHashes: (datums: Array<Datum>) => Array<{ type: "datumHash"; hash: string }>
-```
-
-## filterInline
-
-**Signature**
-
-```ts
-export declare const filterInline: (datums: Array<Datum>) => Array<{ type: "inlineDatum"; inline: string }>
-```
-
-## groupByType
-
-**Signature**
-
-```ts
-export declare const groupByType: (datums: Array<Datum>) => {
-  hashes: Array<{ type: "datumHash"; hash: string }>
-  inline: Array<{ type: "inlineDatum"; inline: string }>
-}
-```
-
-## isDatumHash
-
-**Signature**
-
-```ts
-export declare const isDatumHash: (datum?: Datum) => datum is { type: "datumHash"; hash: string }
-```
-
-## isInlineDatum
-
-**Signature**
-
-```ts
-export declare const isInlineDatum: (datum?: Datum) => datum is { type: "inlineDatum"; inline: string }
-```
-
-## makeDatumHash
-
-**Signature**
-
-```ts
-export declare const makeDatumHash: (hash: string) => Datum
-```
-
-## makeInlineDatum
-
-**Signature**
-
-```ts
-export declare const makeInlineDatum: (inline: string) => Datum
-```
-
-## unique
-
-**Signature**
-
-```ts
-export declare const unique: (datums: Array<Datum>) => Array<Datum>
-```
diff --git a/packages/evolution/docs/modules/sdk/Delegation.ts.md b/packages/evolution/docs/modules/sdk/Delegation.ts.md
deleted file mode 100644
index f2f65d31..00000000
--- a/packages/evolution/docs/modules/sdk/Delegation.ts.md
+++ /dev/null
@@ -1,276 +0,0 @@
----
-title: sdk/Delegation.ts
-nav_order: 189
-parent: Modules
----
-
-## Delegation overview
-
-Delegation types and utilities for handling Cardano stake delegation.
-
-This module provides types and functions for working with stake delegation
-information, including pool assignments and reward balances.
-
----
-
-<h2 class="text-delta">Table of contents</h2>
-
-- [utils](#utils)
-  - [Delegation (interface)](#delegation-interface)
-  - [addRewards](#addrewards)
-  - [compareByPoolId](#comparebypoolid)
-  - [compareByRewards](#comparebyrewards)
-  - [contains](#contains)
-  - [empty](#empty)
-  - [equals](#equals)
-  - [filterByPool](#filterbypool)
-  - [filterDelegated](#filterdelegated)
-  - [filterUndelegated](#filterundelegated)
-  - [filterWithRewards](#filterwithrewards)
-  - [find](#find)
-  - [findByPool](#findbypool)
-  - [getAverageRewards](#getaveragerewards)
-  - [getMaxRewards](#getmaxrewards)
-  - [getMinRewards](#getminrewards)
-  - [getTotalRewards](#gettotalrewards)
-  - [getUniquePoolIds](#getuniquepoolids)
-  - [groupByPool](#groupbypool)
-  - [hasRewards](#hasrewards)
-  - [hasSamePool](#hassamepool)
-  - [isDelegated](#isdelegated)
-  - [make](#make)
-  - [sortByPoolId](#sortbypoolid)
-  - [sortByRewards](#sortbyrewards)
-  - [subtractRewards](#subtractrewards)
-  - [unique](#unique)
-
----
-
-# utils
-
-## Delegation (interface)
-
-Delegation types and utilities for handling Cardano stake delegation.
-
-This module provides types and functions for working with stake delegation
-information, including pool assignments and reward balances.
-
-**Signature**
-
-```ts
-export interface Delegation {
-  readonly poolId: string | undefined
-  readonly rewards: bigint
-}
-```
-
-## addRewards
-
-**Signature**
-
-```ts
-export declare const addRewards: (delegation: Delegation, additionalRewards: bigint) => Delegation
-```
-
-## compareByPoolId
-
-**Signature**
-
-```ts
-export declare const compareByPoolId: (a: Delegation, b: Delegation) => number
-```
-
-## compareByRewards
-
-**Signature**
-
-```ts
-export declare const compareByRewards: (a: Delegation, b: Delegation) => number
-```
-
-## contains
-
-**Signature**
-
-```ts
-export declare const contains: (delegations: Array<Delegation>, target: Delegation) => boolean
-```
-
-## empty
-
-**Signature**
-
-```ts
-export declare const empty: () => Delegation
-```
-
-## equals
-
-**Signature**
-
-```ts
-export declare const equals: (a: Delegation, b: Delegation) => boolean
-```
-
-## filterByPool
-
-**Signature**
-
-```ts
-export declare const filterByPool: (delegations: Array<Delegation>, poolId: string) => Array<Delegation>
-```
-
-## filterDelegated
-
-**Signature**
-
-```ts
-export declare const filterDelegated: (delegations: Array<Delegation>) => Array<Delegation>
-```
-
-## filterUndelegated
-
-**Signature**
-
-```ts
-export declare const filterUndelegated: (delegations: Array<Delegation>) => Array<Delegation>
-```
-
-## filterWithRewards
-
-**Signature**
-
-```ts
-export declare const filterWithRewards: (delegations: Array<Delegation>) => Array<Delegation>
-```
-
-## find
-
-**Signature**
-
-```ts
-export declare const find: (
-  delegations: Array<Delegation>,
-  predicate: (delegation: Delegation) => boolean
-) => Delegation | undefined
-```
-
-## findByPool
-
-**Signature**
-
-```ts
-export declare const findByPool: (delegations: Array<Delegation>, poolId: string) => Delegation | undefined
-```
-
-## getAverageRewards
-
-**Signature**
-
-```ts
-export declare const getAverageRewards: (delegations: Array<Delegation>) => bigint
-```
-
-## getMaxRewards
-
-**Signature**
-
-```ts
-export declare const getMaxRewards: (delegations: Array<Delegation>) => bigint
-```
-
-## getMinRewards
-
-**Signature**
-
-```ts
-export declare const getMinRewards: (delegations: Array<Delegation>) => bigint
-```
-
-## getTotalRewards
-
-**Signature**
-
-```ts
-export declare const getTotalRewards: (delegations: Array<Delegation>) => bigint
-```
-
-## getUniquePoolIds
-
-**Signature**
-
-```ts
-export declare const getUniquePoolIds: (delegations: Array<Delegation>) => Array<string>
-```
-
-## groupByPool
-
-**Signature**
-
-```ts
-export declare const groupByPool: (delegations: Array<Delegation>) => Record<string, Array<Delegation>>
-```
-
-## hasRewards
-
-**Signature**
-
-```ts
-export declare const hasRewards: (delegation: Delegation) => boolean
-```
-
-## hasSamePool
-
-**Signature**
-
-```ts
-export declare const hasSamePool: (a: Delegation, b: Delegation) => boolean
-```
-
-## isDelegated
-
-**Signature**
-
-```ts
-export declare const isDelegated: (delegation: Delegation) => boolean
-```
-
-## make
-
-**Signature**
-
-```ts
-export declare const make: (poolId: string | undefined, rewards: bigint) => Delegation
-```
-
-## sortByPoolId
-
-**Signature**
-
-```ts
-export declare const sortByPoolId: (delegations: Array<Delegation>) => Array<Delegation>
-```
-
-## sortByRewards
-
-**Signature**
-
-```ts
-export declare const sortByRewards: (delegations: Array<Delegation>, ascending?: boolean) => Array<Delegation>
-```
-
-## subtractRewards
-
-**Signature**
-
-```ts
-export declare const subtractRewards: (delegation: Delegation, rewardsToSubtract: bigint) => Delegation
-```
-
-## unique
-
-**Signature**
-
-```ts
-export declare const unique: (delegations: Array<Delegation>) => Array<Delegation>
-```
diff --git a/packages/evolution/docs/modules/sdk/EvalRedeemer.ts.md b/packages/evolution/docs/modules/sdk/EvalRedeemer.ts.md
index 9f662765..64ad62ef 100644
--- a/packages/evolution/docs/modules/sdk/EvalRedeemer.ts.md
+++ b/packages/evolution/docs/modules/sdk/EvalRedeemer.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/EvalRedeemer.ts
-nav_order: 190
+nav_order: 154
 parent: Modules
 ---
 
@@ -12,21 +12,28 @@ parent: Modules
 
 <h2 class="text-delta">Table of contents</h2>
 
-- [utils](#utils)
+- [model](#model)
   - [EvalRedeemer (type alias)](#evalredeemer-type-alias)
 
 ---
 
-# utils
+# model
 
 ## EvalRedeemer (type alias)
 
+Evaluation result for a single redeemer from transaction evaluation.
+
+Uses Core CDDL terminology ("cert"/"reward") for consistency.
+Provider implementations map from their API formats (e.g., Ogmios "publish"/"withdraw").
+
 **Signature**
 
 ```ts
 export type EvalRedeemer = {
-  readonly ex_units: { readonly mem: number; readonly steps: number }
+  readonly ex_units: Redeemer.ExUnits
   readonly redeemer_index: number
-  readonly redeemer_tag: "spend" | "mint" | "publish" | "withdraw" | "vote" | "propose"
+  readonly redeemer_tag: Redeemer.RedeemerTag
 }
 ```
+
+Added in v2.0.0
diff --git a/packages/evolution/docs/modules/sdk/Network.ts.md b/packages/evolution/docs/modules/sdk/Network.ts.md
deleted file mode 100644
index 7d3c5069..00000000
--- a/packages/evolution/docs/modules/sdk/Network.ts.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-title: sdk/Network.ts
-nav_order: 191
-parent: Modules
----
-
-## Network overview
-
----
-
-<h2 class="text-delta">Table of contents</h2>
-
----
diff --git a/packages/evolution/docs/modules/sdk/OutRef.ts.md b/packages/evolution/docs/modules/sdk/OutRef.ts.md
deleted file mode 100644
index 60d13fa9..00000000
--- a/packages/evolution/docs/modules/sdk/OutRef.ts.md
+++ /dev/null
@@ -1,246 +0,0 @@
----
-title: sdk/OutRef.ts
-nav_order: 192
-parent: Modules
----
-
-## OutRef overview
-
-OutRef types and utilities for handling Cardano transaction output references.
-
-This module provides types and functions for working with transaction output references,
-which uniquely identify UTxOs by their transaction hash and output index.
-
----
-
-<h2 class="text-delta">Table of contents</h2>
-
-- [utils](#utils)
-  - [OutRef (interface)](#outref-interface)
-  - [compare](#compare)
-  - [contains](#contains)
-  - [difference](#difference)
-  - [equals](#equals)
-  - [filter](#filter)
-  - [find](#find)
-  - [first](#first)
-  - [fromTxHashAndIndex](#fromtxhashandindex)
-  - [getIndicesForTx](#getindicesfortx)
-  - [getTxHashes](#gettxhashes)
-  - [groupByTxHash](#groupbytxhash)
-  - [intersection](#intersection)
-  - [isEmpty](#isempty)
-  - [last](#last)
-  - [make](#make)
-  - [remove](#remove)
-  - [size](#size)
-  - [sort](#sort)
-  - [sortByIndex](#sortbyindex)
-  - [sortByTxHash](#sortbytxhash)
-  - [toString](#tostring)
-  - [union](#union)
-  - [unique](#unique)
-
----
-
-# utils
-
-## OutRef (interface)
-
-OutRef types and utilities for handling Cardano transaction output references.
-
-This module provides types and functions for working with transaction output references,
-which uniquely identify UTxOs by their transaction hash and output index.
-
-**Signature**
-
-```ts
-export interface OutRef {
-  txHash: string
-  outputIndex: number
-}
-```
-
-## compare
-
-**Signature**
-
-```ts
-export declare const compare: (a: OutRef, b: OutRef) => number
-```
-
-## contains
-
-**Signature**
-
-```ts
-export declare const contains: (outRefs: Array<OutRef>, target: OutRef) => boolean
-```
-
-## difference
-
-**Signature**
-
-```ts
-export declare const difference: (setA: Array<OutRef>, setB: Array<OutRef>) => Array<OutRef>
-```
-
-## equals
-
-**Signature**
-
-```ts
-export declare const equals: (a: OutRef, b: OutRef) => boolean
-```
-
-## filter
-
-**Signature**
-
-```ts
-export declare const filter: (outRefs: Array<OutRef>, predicate: (outRef: OutRef) => boolean) => Array<OutRef>
-```
-
-## find
-
-**Signature**
-
-```ts
-export declare const find: (outRefs: Array<OutRef>, predicate: (outRef: OutRef) => boolean) => OutRef | undefined
-```
-
-## first
-
-**Signature**
-
-```ts
-export declare const first: (outRefs: Array<OutRef>) => OutRef | undefined
-```
-
-## fromTxHashAndIndex
-
-**Signature**
-
-```ts
-export declare const fromTxHashAndIndex: (txHash: string, outputIndex: number) => OutRef
-```
-
-## getIndicesForTx
-
-**Signature**
-
-```ts
-export declare const getIndicesForTx: (outRefs: Array<OutRef>, txHash: string) => Array<number>
-```
-
-## getTxHashes
-
-**Signature**
-
-```ts
-export declare const getTxHashes: (outRefs: Array<OutRef>) => Array<string>
-```
-
-## groupByTxHash
-
-**Signature**
-
-```ts
-export declare const groupByTxHash: (outRefs: Array<OutRef>) => Record<string, Array<OutRef>>
-```
-
-## intersection
-
-**Signature**
-
-```ts
-export declare const intersection: (setA: Array<OutRef>, setB: Array<OutRef>) => Array<OutRef>
-```
-
-## isEmpty
-
-**Signature**
-
-```ts
-export declare const isEmpty: (outRefs: Array<OutRef>) => boolean
-```
-
-## last
-
-**Signature**
-
-```ts
-export declare const last: (outRefs: Array<OutRef>) => OutRef | undefined
-```
-
-## make
-
-**Signature**
-
-```ts
-export declare const make: (txHash: string, outputIndex: number) => OutRef
-```
-
-## remove
-
-**Signature**
-
-```ts
-export declare const remove: (outRefs: Array<OutRef>, target: OutRef) => Array<OutRef>
-```
-
-## size
-
-**Signature**
-
-```ts
-export declare const size: (outRefs: Array<OutRef>) => number
-```
-
-## sort
-
-**Signature**
-
-```ts
-export declare const sort: (outRefs: Array<OutRef>) => Array<OutRef>
-```
-
-## sortByIndex
-
-**Signature**
-
-```ts
-export declare const sortByIndex: (outRefs: Array<OutRef>) => Array<OutRef>
-```
-
-## sortByTxHash
-
-**Signature**
-
-```ts
-export declare const sortByTxHash: (outRefs: Array<OutRef>) => Array<OutRef>
-```
-
-## toString
-
-**Signature**
-
-```ts
-export declare const toString: (outRef: OutRef) => string
-```
-
-## union
-
-**Signature**
-
-```ts
-export declare const union: (setA: Array<OutRef>, setB: Array<OutRef>) => Array<OutRef>
-```
-
-## unique
-
-**Signature**
-
-```ts
-export declare const unique: (outRefs: Array<OutRef>) => Array<OutRef>
-```
diff --git a/packages/evolution/docs/modules/sdk/PolicyId.ts.md b/packages/evolution/docs/modules/sdk/PolicyId.ts.md
deleted file mode 100644
index 5b9f82e5..00000000
--- a/packages/evolution/docs/modules/sdk/PolicyId.ts.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-title: sdk/PolicyId.ts
-nav_order: 193
-parent: Modules
----
-
-## PolicyId overview
-
----
-
-<h2 class="text-delta">Table of contents</h2>
-
-- [utils](#utils)
-  - [PolicyId (type alias)](#policyid-type-alias)
-
----
-
-# utils
-
-## PolicyId (type alias)
-
-**Signature**
-
-```ts
-export type PolicyId = string
-```
diff --git a/packages/evolution/docs/modules/sdk/PoolParams.ts.md b/packages/evolution/docs/modules/sdk/PoolParams.ts.md
deleted file mode 100644
index cc255535..00000000
--- a/packages/evolution/docs/modules/sdk/PoolParams.ts.md
+++ /dev/null
@@ -1,135 +0,0 @@
----
-title: sdk/PoolParams.ts
-nav_order: 194
-parent: Modules
----
-
-## PoolParams overview
-
-SDK PoolParams module - user-friendly types for pool registration parameters.
-
-Added in v2.0.0
-
----
-
-<h2 class="text-delta">Table of contents</h2>
-
-- [conversions](#conversions)
-  - [fromCore](#fromcore)
-  - [toCore](#tocore)
-- [model](#model)
-  - [PoolParams (type alias)](#poolparams-type-alias)
-
----
-
-# conversions
-
-## fromCore
-
-Convert from Core PoolParams to SDK PoolParams (encode to lightweight form).
-
-**Signature**
-
-```ts
-export declare const fromCore: (
-  a: CorePoolParams.PoolParams,
-  overrideOptions?: ParseOptions
-) => {
-  readonly _tag: "PoolParams"
-  readonly operator: { readonly _tag: "PoolKeyHash"; readonly hash: string }
-  readonly vrfKeyhash: { readonly _tag: "VrfKeyHash"; readonly hash: string }
-  readonly pledge: string
-  readonly cost: string
-  readonly margin: { readonly numerator: string; readonly denominator: string }
-  readonly rewardAccount: {
-    readonly _tag: "RewardAccount"
-    readonly networkId: number
-    readonly stakeCredential:
-      | { readonly _tag: "KeyHash"; readonly hash: string }
-      | { readonly _tag: "ScriptHash"; readonly hash: string }
-  }
-  readonly poolOwners: readonly { readonly _tag: "KeyHash"; readonly hash: string }[]
-  readonly relays: readonly (
-    | {
-        readonly _tag: "SingleHostAddr"
-        readonly port?: string | undefined
-        readonly ipv4?: { readonly _tag: "IPv4"; readonly bytes: string } | undefined
-        readonly ipv6?: { readonly _tag: "IPv6"; readonly bytes: string } | undefined
-      }
-    | { readonly _tag: "SingleHostName"; readonly dnsName: string; readonly port?: string | undefined }
-    | { readonly _tag: "MultiHostName"; readonly dnsName: string }
-  )[]
-  readonly poolMetadata?:
-    | {
-        readonly _tag: "PoolMetadata"
-        readonly hash: any
-        readonly url: { readonly _tag: "Url"; readonly href: string }
-      }
-    | null
-    | undefined
-}
-```
-
-Added in v2.0.0
-
-## toCore
-
-Convert from SDK PoolParams to Core PoolParams (decode to strict form).
-
-**Signature**
-
-```ts
-export declare const toCore: (
-  i: {
-    readonly _tag: "PoolParams"
-    readonly operator: { readonly _tag: "PoolKeyHash"; readonly hash: string }
-    readonly vrfKeyhash: { readonly _tag: "VrfKeyHash"; readonly hash: string }
-    readonly pledge: string
-    readonly cost: string
-    readonly margin: { readonly numerator: string; readonly denominator: string }
-    readonly rewardAccount: {
-      readonly _tag: "RewardAccount"
-      readonly networkId: number
-      readonly stakeCredential:
-        | { readonly _tag: "KeyHash"; readonly hash: string }
-        | { readonly _tag: "ScriptHash"; readonly hash: string }
-    }
-    readonly poolOwners: readonly { readonly _tag: "KeyHash"; readonly hash: string }[]
-    readonly relays: readonly (
-      | {
-          readonly _tag: "SingleHostAddr"
-          readonly port?: string | undefined
-          readonly ipv4?: { readonly _tag: "IPv4"; readonly bytes: string } | undefined
-          readonly ipv6?: { readonly _tag: "IPv6"; readonly bytes: string } | undefined
-        }
-      | { readonly _tag: "SingleHostName"; readonly dnsName: string; readonly port?: string | undefined }
-      | { readonly _tag: "MultiHostName"; readonly dnsName: string }
-    )[]
-    readonly poolMetadata?:
-      | {
-          readonly _tag: "PoolMetadata"
-          readonly hash: any
-          readonly url: { readonly _tag: "Url"; readonly href: string }
-        }
-      | null
-      | undefined
-  },
-  overrideOptions?: ParseOptions
-) => CorePoolParams.PoolParams
-```
-
-Added in v2.0.0
-
-# model
-
-## PoolParams (type alias)
-
-User-friendly pool registration parameters type (lightweight encoded form).
-
-**Signature**
-
-```ts
-export type PoolParams = typeof CorePoolParams.PoolParams.Encoded
-```
-
-Added in v2.0.0
diff --git a/packages/evolution/docs/modules/sdk/ProtocolParameters.ts.md b/packages/evolution/docs/modules/sdk/ProtocolParameters.ts.md
deleted file mode 100644
index 6225d745..00000000
--- a/packages/evolution/docs/modules/sdk/ProtocolParameters.ts.md
+++ /dev/null
@@ -1,108 +0,0 @@
----
-title: sdk/ProtocolParameters.ts
-nav_order: 195
-parent: Modules
----
-
-## ProtocolParameters overview
-
-Protocol Parameters types and utilities for Cardano network configuration.
-
-This module provides types and functions for working with Cardano protocol parameters,
-which define the operational rules and limits of the network.
-
----
-
-<h2 class="text-delta">Table of contents</h2>
-
-- [utils](#utils)
-  - [ProtocolParameters (type alias)](#protocolparameters-type-alias)
-  - [calculateMinFee](#calculateminfee)
-  - [calculateUtxoCost](#calculateutxocost)
-  - [getCostModel](#getcostmodel)
-  - [supportsPlutusVersion](#supportsplutusversion)
-
----
-
-# utils
-
-## ProtocolParameters (type alias)
-
-Protocol Parameters types and utilities for Cardano network configuration.
-
-This module provides types and functions for working with Cardano protocol parameters,
-which define the operational rules and limits of the network.
-
-**Signature**
-
-```ts
-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>
-  }
-}
-```
-
-## calculateMinFee
-
-Calculate the minimum fee for a transaction based on protocol parameters.
-
-**Signature**
-
-```ts
-export declare const calculateMinFee: (protocolParams: ProtocolParameters, txSize: number) => bigint
-```
-
-## calculateUtxoCost
-
-Calculate the UTxO cost based on the protocol parameters.
-
-**Signature**
-
-```ts
-export declare const calculateUtxoCost: (protocolParams: ProtocolParameters, utxoSize: number) => bigint
-```
-
-## getCostModel
-
-Get the cost model for a specific Plutus version.
-
-**Signature**
-
-```ts
-export declare const getCostModel: (
-  protocolParams: ProtocolParameters,
-  version: "PlutusV1" | "PlutusV2" | "PlutusV3"
-) => Record<string, number>
-```
-
-## supportsPlutusVersion
-
-Check if the protocol parameters support a specific Plutus version.
-
-**Signature**
-
-```ts
-export declare const supportsPlutusVersion: (
-  protocolParams: ProtocolParameters,
-  version: "PlutusV1" | "PlutusV2" | "PlutusV3"
-) => boolean
-```
diff --git a/packages/evolution/docs/modules/sdk/Relay.ts.md b/packages/evolution/docs/modules/sdk/Relay.ts.md
deleted file mode 100644
index 92ac422e..00000000
--- a/packages/evolution/docs/modules/sdk/Relay.ts.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-title: sdk/Relay.ts
-nav_order: 201
-parent: Modules
----
-
-## Relay overview
-
----
-
-<h2 class="text-delta">Table of contents</h2>
-
-- [utils](#utils)
-  - [MultiHostName (type alias)](#multihostname-type-alias)
-  - [Relay (type alias)](#relay-type-alias)
-  - [SingleHostAddr (type alias)](#singlehostaddr-type-alias)
-  - [SingleHostName (type alias)](#singlehostname-type-alias)
-
----
-
-# utils
-
-## MultiHostName (type alias)
-
-**Signature**
-
-```ts
-export type MultiHostName = (typeof CoreRelay.Relay.members)[2]["Encoded"]
-```
-
-## Relay (type alias)
-
-**Signature**
-
-```ts
-export type Relay = typeof CoreRelay.Relay.Encoded
-```
-
-## SingleHostAddr (type alias)
-
-**Signature**
-
-```ts
-export type SingleHostAddr = (typeof CoreRelay.Relay.members)[0]["Encoded"]
-```
-
-## SingleHostName (type alias)
-
-**Signature**
-
-```ts
-export type SingleHostName = (typeof CoreRelay.Relay.members)[1]["Encoded"]
-```
diff --git a/packages/evolution/docs/modules/sdk/RewardAddress.ts.md b/packages/evolution/docs/modules/sdk/RewardAddress.ts.md
deleted file mode 100644
index 0101a6c5..00000000
--- a/packages/evolution/docs/modules/sdk/RewardAddress.ts.md
+++ /dev/null
@@ -1,120 +0,0 @@
----
-title: sdk/RewardAddress.ts
-nav_order: 202
-parent: Modules
----
-
-## RewardAddress overview
-
----
-
-<h2 class="text-delta">Table of contents</h2>
-
-- [utils](#utils)
-  - [RewardAddress (type alias)](#rewardaddress-type-alias)
-  - [fromJsonToRewardAccount](#fromjsontorewardaccount)
-  - [fromRewardAccount](#fromrewardaccount)
-  - [fromRewardAccountToJson](#fromrewardaccounttojson)
-  - [jsonToRewardAddress](#jsontorewardaddress)
-  - [rewardAddressToJson](#rewardaddresstojson)
-  - [toRewardAccount](#torewardaccount)
-
----
-
-# utils
-
-## RewardAddress (type alias)
-
-Reward address in bech32 format.
-Mainnet addresses start with "stake1"
-Testnet addresses start with "stake_test1"
-
-**Signature**
-
-```ts
-export type RewardAddress = string
-```
-
-## fromJsonToRewardAccount
-
-**Signature**
-
-```ts
-export declare const fromJsonToRewardAccount: (
-  i: {
-    readonly _tag: "RewardAccount"
-    readonly networkId: number
-    readonly stakeCredential:
-      | { readonly _tag: "KeyHash"; readonly hash: string }
-      | { readonly _tag: "ScriptHash"; readonly hash: string }
-  },
-  overrideOptions?: ParseOptions
-) => CoreRewardAccount.RewardAccount
-```
-
-## fromRewardAccount
-
-**Signature**
-
-```ts
-export declare const fromRewardAccount: (a: CoreRewardAccount.RewardAccount, overrideOptions?: ParseOptions) => string
-```
-
-## fromRewardAccountToJson
-
-**Signature**
-
-```ts
-export declare const fromRewardAccountToJson: (
-  a: CoreRewardAccount.RewardAccount,
-  overrideOptions?: ParseOptions
-) => {
-  readonly _tag: "RewardAccount"
-  readonly networkId: number
-  readonly stakeCredential:
-    | { readonly _tag: "KeyHash"; readonly hash: string }
-    | { readonly _tag: "ScriptHash"; readonly hash: string }
-}
-```
-
-## jsonToRewardAddress
-
-**Signature**
-
-```ts
-export declare const jsonToRewardAddress: (
-  i: {
-    readonly _tag: "RewardAccount"
-    readonly networkId: number
-    readonly stakeCredential:
-      | { readonly _tag: "KeyHash"; readonly hash: string }
-      | { readonly _tag: "ScriptHash"; readonly hash: string }
-  },
-  overrideOptions?: ParseOptions | undefined
-) => string
-```
-
-## rewardAddressToJson
-
-**Signature**
-
-```ts
-export declare const rewardAddressToJson: (
-  i: string,
-  overrideOptions?: ParseOptions | undefined
-) => {
-  readonly _tag: "RewardAccount"
-  readonly networkId: number
-  readonly stakeCredential:
-    | { readonly _tag: "KeyHash"; readonly hash: string }
-    | { readonly _tag: "ScriptHash"; readonly hash: string }
-}
-```
-
-## toRewardAccount
-
-**Signature**
-
-```ts
-export declare const toRewardAccount: (i: string, overrideOptions?: ParseOptions) => CoreRewardAccount.RewardAccount
-```
diff --git a/packages/evolution/docs/modules/sdk/Script.ts.md b/packages/evolution/docs/modules/sdk/Script.ts.md
deleted file mode 100644
index f4827f99..00000000
--- a/packages/evolution/docs/modules/sdk/Script.ts.md
+++ /dev/null
@@ -1,185 +0,0 @@
----
-title: sdk/Script.ts
-nav_order: 203
-parent: Modules
----
-
-## Script overview
-
----
-
-<h2 class="text-delta">Table of contents</h2>
-
-- [utils](#utils)
-  - [MintingPolicy (type alias)](#mintingpolicy-type-alias)
-  - [Native (type alias)](#native-type-alias)
-  - [PlutusV1 (type alias)](#plutusv1-type-alias)
-  - [PlutusV2 (type alias)](#plutusv2-type-alias)
-  - [PlutusV3 (type alias)](#plutusv3-type-alias)
-  - [PolicyId (type alias)](#policyid-type-alias)
-  - [Script (type alias)](#script-type-alias)
-  - [SpendingValidator (type alias)](#spendingvalidator-type-alias)
-  - [Validator (type alias)](#validator-type-alias)
-  - [applyDoubleCborEncoding](#applydoublecborencoding)
-  - [applySingleCborEncoding](#applysinglecborencoding)
-  - [makeNativeScript](#makenativescript)
-  - [makePlutusV1Script](#makeplutusv1script)
-  - [makePlutusV2Script](#makeplutusv2script)
-  - [makePlutusV3Script](#makeplutusv3script)
-  - [scriptEquals](#scriptequals)
-
----
-
-# utils
-
-## MintingPolicy (type alias)
-
-**Signature**
-
-```ts
-export type MintingPolicy = Script
-```
-
-## Native (type alias)
-
-**Signature**
-
-```ts
-export type Native = {
-  type: "Native"
-  script: string // CBOR hex string
-}
-```
-
-## PlutusV1 (type alias)
-
-**Signature**
-
-```ts
-export type PlutusV1 = {
-  type: "PlutusV1"
-  script: string // CBOR hex string
-}
-```
-
-## PlutusV2 (type alias)
-
-**Signature**
-
-```ts
-export type PlutusV2 = {
-  type: "PlutusV2"
-  script: string // CBOR hex string
-}
-```
-
-## PlutusV3 (type alias)
-
-**Signature**
-
-```ts
-export type PlutusV3 = {
-  type: "PlutusV3"
-  script: string // CBOR hex string
-}
-```
-
-## PolicyId (type alias)
-
-**Signature**
-
-```ts
-export type PolicyId = string
-```
-
-## Script (type alias)
-
-**Signature**
-
-```ts
-export type Script = Native | PlutusV1 | PlutusV2 | PlutusV3
-```
-
-## SpendingValidator (type alias)
-
-**Signature**
-
-```ts
-export type SpendingValidator = Script
-```
-
-## Validator (type alias)
-
-**Signature**
-
-```ts
-export type Validator = Script
-```
-
-## applyDoubleCborEncoding
-
-Compute the policy ID for a minting policy script.
-The policy ID is identical to the script hash.
-
-**Signature**
-
-```ts
-export declare const applyDoubleCborEncoding: (script: string) => string
-```
-
-## applySingleCborEncoding
-
-**Signature**
-
-```ts
-export declare const applySingleCborEncoding: (script: string) => string
-```
-
-## makeNativeScript
-
-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
-
-**Signature**
-
-```ts
-export declare const makeNativeScript: (cbor: string) => Native
-```
-
-## makePlutusV1Script
-
-**Signature**
-
-```ts
-export declare const makePlutusV1Script: (cbor: string) => PlutusV1
-```
-
-## makePlutusV2Script
-
-**Signature**
-
-```ts
-export declare const makePlutusV2Script: (cbor: string) => PlutusV2
-```
-
-## makePlutusV3Script
-
-**Signature**
-
-```ts
-export declare const makePlutusV3Script: (cbor: string) => PlutusV3
-```
-
-## scriptEquals
-
-**Signature**
-
-```ts
-export declare const scriptEquals: (a: Script, b: Script) => boolean
-```
diff --git a/packages/evolution/docs/modules/sdk/Type.ts.md b/packages/evolution/docs/modules/sdk/Type.ts.md
index 041c8d28..341ce317 100644
--- a/packages/evolution/docs/modules/sdk/Type.ts.md
+++ b/packages/evolution/docs/modules/sdk/Type.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/Type.ts
-nav_order: 204
+nav_order: 160
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/UTxO.ts.md b/packages/evolution/docs/modules/sdk/UTxO.ts.md
deleted file mode 100644
index c54fc7db..00000000
--- a/packages/evolution/docs/modules/sdk/UTxO.ts.md
+++ /dev/null
@@ -1,510 +0,0 @@
----
-title: sdk/UTxO.ts
-nav_order: 206
-parent: Modules
----
-
-## UTxO overview
-
----
-
-<h2 class="text-delta">Table of contents</h2>
-
-- [constructors](#constructors)
-  - [toUTxO](#toutxo)
-- [conversion](#conversion)
-  - [fromCore](#fromcore)
-  - [fromCoreArray](#fromcorearray)
-  - [toCore](#tocore)
-  - [toCoreArray](#tocorearray)
-- [utils](#utils)
-  - [TxOutput (interface)](#txoutput-interface)
-  - [UTxO (interface)](#utxo-interface)
-  - [UTxOSet (type alias)](#utxoset-type-alias)
-  - [addAssets](#addassets)
-  - [difference](#difference)
-  - [equals](#equals)
-  - [filter](#filter)
-  - [filterByAddress](#filterbyaddress)
-  - [filterByAsset](#filterbyasset)
-  - [filterByMinLovelace](#filterbyminlovelace)
-  - [filterWithDatum](#filterwithdatum)
-  - [filterWithScript](#filterwithscript)
-  - [find](#find)
-  - [findByAddress](#findbyaddress)
-  - [findByOutRef](#findbyoutref)
-  - [findWithDatumHash](#findwithdatumhash)
-  - [findWithMinLovelace](#findwithminlovelace)
-  - [fromArray](#fromarray)
-  - [getDatumHash](#getdatumhash)
-  - [getInlineDatum](#getinlinedatum)
-  - [getLovelace](#getlovelace)
-  - [getOutRef](#getoutref)
-  - [getTotalAssets](#gettotalassets)
-  - [getTotalLovelace](#gettotallovelace)
-  - [getValue](#getvalue)
-  - [hasAssets](#hasassets)
-  - [hasDatum](#hasdatum)
-  - [hasLovelace](#haslovelace)
-  - [hasNativeTokens](#hasnativetokens)
-  - [hasScript](#hasscript)
-  - [intersection](#intersection)
-  - [isEmpty](#isempty)
-  - [map](#map)
-  - [reduce](#reduce)
-  - [removeByOutRef](#removebyoutref)
-  - [size](#size)
-  - [sortByLovelace](#sortbylovelace)
-  - [subtractAssets](#subtractassets)
-  - [toArray](#toarray)
-  - [union](#union)
-  - [withAssets](#withassets)
-  - [withDatum](#withdatum)
-  - [withScript](#withscript)
-  - [withoutDatum](#withoutdatum)
-  - [withoutScript](#withoutscript)
-
----
-
-# constructors
-
-## toUTxO
-
-Convert a TxOutput to a UTxO by adding txHash and outputIndex.
-Used after transaction submission when outputs become UTxOs on-chain.
-
-**Signature**
-
-```ts
-export declare const toUTxO: (output: TxOutput, txHash: string, outputIndex: number) => UTxO
-```
-
-Added in v2.0.0
-
-# conversion
-
-## fromCore
-
-Convert Core UTxO to SDK UTxO.
-This is a pure function as all data is available to convert.
-
-**Signature**
-
-```ts
-export declare const fromCore: (utxo: CoreUTxO.UTxO) => UTxO
-```
-
-Added in v2.0.0
-
-## fromCoreArray
-
-Convert array of Core UTxOs to SDK UTxOs.
-
-**Signature**
-
-```ts
-export declare const fromCoreArray: (utxos: ReadonlyArray<CoreUTxO.UTxO>) => ReadonlyArray<UTxO>
-```
-
-Added in v2.0.0
-
-## toCore
-
-Convert SDK UTxO to Core UTxO.
-This is an Effect as it needs to parse the address and transaction hash.
-
-**Signature**
-
-```ts
-export declare const toCore: (utxo: UTxO) => Effect.Effect<CoreUTxO.UTxO, Error>
-```
-
-Added in v2.0.0
-
-## toCoreArray
-
-Convert array of SDK UTxOs to Core UTxOs.
-
-**Signature**
-
-```ts
-export declare const toCoreArray: (utxos: ReadonlyArray<UTxO>) => Effect.Effect<ReadonlyArray<CoreUTxO.UTxO>, Error>
-```
-
-Added in v2.0.0
-
-# utils
-
-## TxOutput (interface)
-
-Transaction output before it's submitted on-chain.
-Similar to UTxO but without txHash/outputIndex since those don't exist yet.
-
-**Signature**
-
-```ts
-export interface TxOutput {
-  address: string
-  assets: Assets.Assets
-  datumOption?: Datum.Datum
-  scriptRef?: Script.Script
-}
-```
-
-## UTxO (interface)
-
-UTxO (Unspent Transaction Output) - a TxOutput that has been confirmed on-chain
-and has a txHash and outputIndex identifying it.
-
-**Signature**
-
-```ts
-export interface UTxO extends TxOutput {
-  txHash: string
-  outputIndex: number
-}
-```
-
-## UTxOSet (type alias)
-
-**Signature**
-
-```ts
-export type UTxOSet = Array<UTxO>
-```
-
-## addAssets
-
-**Signature**
-
-```ts
-export declare const addAssets: (utxo: UTxO, assets: Assets.Assets) => UTxO
-```
-
-## difference
-
-**Signature**
-
-```ts
-export declare const difference: (setA: UTxOSet, setB: UTxOSet) => UTxOSet
-```
-
-## equals
-
-**Signature**
-
-```ts
-export declare const equals: (a: UTxO, b: UTxO) => boolean
-```
-
-## filter
-
-**Signature**
-
-```ts
-export declare const filter: (utxos: UTxOSet, predicate: (utxo: UTxO) => boolean) => UTxOSet
-```
-
-## filterByAddress
-
-**Signature**
-
-```ts
-export declare const filterByAddress: (utxoSet: UTxOSet, address: string) => UTxOSet
-```
-
-## filterByAsset
-
-**Signature**
-
-```ts
-export declare const filterByAsset: (utxoSet: UTxOSet, unit: string) => UTxOSet
-```
-
-## filterByMinLovelace
-
-**Signature**
-
-```ts
-export declare const filterByMinLovelace: (utxoSet: UTxOSet, minLovelace: bigint) => UTxOSet
-```
-
-## filterWithDatum
-
-**Signature**
-
-```ts
-export declare const filterWithDatum: (utxoSet: UTxOSet) => UTxOSet
-```
-
-## filterWithScript
-
-**Signature**
-
-```ts
-export declare const filterWithScript: (utxoSet: UTxOSet) => UTxOSet
-```
-
-## find
-
-**Signature**
-
-```ts
-export declare const find: (utxos: UTxOSet, predicate: (utxo: UTxO) => boolean) => UTxO | undefined
-```
-
-## findByAddress
-
-**Signature**
-
-```ts
-export declare const findByAddress: (utxos: UTxOSet, address: string) => UTxOSet
-```
-
-## findByOutRef
-
-**Signature**
-
-```ts
-export declare const findByOutRef: (utxoSet: UTxOSet, outRef: OutRef.OutRef) => UTxO | undefined
-```
-
-## findWithDatumHash
-
-**Signature**
-
-```ts
-export declare const findWithDatumHash: (utxos: UTxOSet, hash: string) => UTxOSet
-```
-
-## findWithMinLovelace
-
-**Signature**
-
-```ts
-export declare const findWithMinLovelace: (utxos: UTxOSet, minLovelace: bigint) => UTxOSet
-```
-
-## fromArray
-
-**Signature**
-
-```ts
-export declare const fromArray: (utxos: Array<UTxO>) => UTxOSet
-```
-
-## getDatumHash
-
-**Signature**
-
-```ts
-export declare const getDatumHash: (utxo: UTxO) => string | undefined
-```
-
-## getInlineDatum
-
-**Signature**
-
-```ts
-export declare const getInlineDatum: (utxo: UTxO) => string | undefined
-```
-
-## getLovelace
-
-**Signature**
-
-```ts
-export declare const getLovelace: (utxo: UTxO) => bigint
-```
-
-## getOutRef
-
-**Signature**
-
-```ts
-export declare const getOutRef: (utxo: UTxO) => OutRef.OutRef
-```
-
-## getTotalAssets
-
-**Signature**
-
-```ts
-export declare const getTotalAssets: (utxoSet: UTxOSet) => Assets.Assets
-```
-
-## getTotalLovelace
-
-**Signature**
-
-```ts
-export declare const getTotalLovelace: (utxoSet: UTxOSet) => bigint
-```
-
-## getValue
-
-**Signature**
-
-```ts
-export declare const getValue: (utxo: UTxO) => Assets.Assets
-```
-
-## hasAssets
-
-**Signature**
-
-```ts
-export declare const hasAssets: (utxo: UTxO) => boolean
-```
-
-## hasDatum
-
-**Signature**
-
-```ts
-export declare const hasDatum: (utxo: UTxO) => boolean
-```
-
-## hasLovelace
-
-**Signature**
-
-```ts
-export declare const hasLovelace: (utxo: UTxO) => boolean
-```
-
-## hasNativeTokens
-
-**Signature**
-
-```ts
-export declare const hasNativeTokens: (utxo: UTxO) => boolean
-```
-
-## hasScript
-
-**Signature**
-
-```ts
-export declare const hasScript: (utxo: UTxO) => boolean
-```
-
-## intersection
-
-**Signature**
-
-```ts
-export declare const intersection: (setA: UTxOSet, setB: UTxOSet) => UTxOSet
-```
-
-## isEmpty
-
-**Signature**
-
-```ts
-export declare const isEmpty: (utxoSet: UTxOSet) => boolean
-```
-
-## map
-
-**Signature**
-
-```ts
-export declare const map: <T>(utxos: UTxOSet, mapper: (utxo: UTxO) => T) => Array<T>
-```
-
-## reduce
-
-**Signature**
-
-```ts
-export declare const reduce: <T>(utxos: UTxOSet, reducer: (acc: T, utxo: UTxO) => T, initial: T) => T
-```
-
-## removeByOutRef
-
-**Signature**
-
-```ts
-export declare const removeByOutRef: (utxoSet: UTxOSet, outRef: OutRef.OutRef) => UTxOSet
-```
-
-## size
-
-**Signature**
-
-```ts
-export declare const size: (utxoSet: UTxOSet) => number
-```
-
-## sortByLovelace
-
-**Signature**
-
-```ts
-export declare const sortByLovelace: (utxoSet: UTxOSet, ascending?: boolean) => UTxOSet
-```
-
-## subtractAssets
-
-**Signature**
-
-```ts
-export declare const subtractAssets: (utxo: UTxO, assets: Assets.Assets) => UTxO
-```
-
-## toArray
-
-**Signature**
-
-```ts
-export declare const toArray: (utxoSet: UTxOSet) => Array<UTxO>
-```
-
-## union
-
-**Signature**
-
-```ts
-export declare const union: (setA: UTxOSet, setB: UTxOSet) => UTxOSet
-```
-
-## withAssets
-
-**Signature**
-
-```ts
-export declare const withAssets: (utxo: UTxO, assets: Assets.Assets) => UTxO
-```
-
-## withDatum
-
-**Signature**
-
-```ts
-export declare const withDatum: (utxo: UTxO, datumOption: Datum.Datum) => UTxO
-```
-
-## withScript
-
-**Signature**
-
-```ts
-export declare const withScript: (utxo: UTxO, scriptRef: Script.Script) => UTxO
-```
-
-## withoutDatum
-
-**Signature**
-
-```ts
-export declare const withoutDatum: (utxo: UTxO) => UTxO
-```
-
-## withoutScript
-
-**Signature**
-
-```ts
-export declare const withoutScript: (utxo: UTxO) => UTxO
-```
diff --git a/packages/evolution/docs/modules/sdk/Unit.ts.md b/packages/evolution/docs/modules/sdk/Unit.ts.md
deleted file mode 100644
index f534e725..00000000
--- a/packages/evolution/docs/modules/sdk/Unit.ts.md
+++ /dev/null
@@ -1,69 +0,0 @@
----
-title: sdk/Unit.ts
-nav_order: 205
-parent: Modules
----
-
-## Unit overview
-
----
-
-<h2 class="text-delta">Table of contents</h2>
-
-- [utils](#utils)
-  - [Unit (type alias)](#unit-type-alias)
-  - [UnitDetails (interface)](#unitdetails-interface)
-  - [fromUnit](#fromunit)
-  - [toUnit](#tounit)
-
----
-
-# utils
-
-## Unit (type alias)
-
-**Signature**
-
-```ts
-export type Unit = string
-```
-
-## UnitDetails (interface)
-
-**Signature**
-
-```ts
-export interface UnitDetails {
-  policyId: PolicyId.PolicyId
-  assetName: string | undefined
-  name: string | undefined
-  label: number | undefined
-}
-```
-
-## fromUnit
-
-Parse a unit string into its components.
-Returns policy ID, asset name (full hex after policy),
-name (without label) and label if applicable.
-name will be returned in Hex.
-
-**Signature**
-
-```ts
-export declare const fromUnit: (unit: Unit) => UnitDetails
-```
-
-## toUnit
-
-Create a unit string from policy ID, name, and optional label.
-
-**Signature**
-
-```ts
-export declare const toUnit: (
-  policyId: PolicyId.PolicyId,
-  name?: string | undefined,
-  label?: number | undefined
-) => Unit
-```
diff --git a/packages/evolution/docs/modules/sdk/builders/CoinSelection.ts.md b/packages/evolution/docs/modules/sdk/builders/CoinSelection.ts.md
index 22baf196..27c23db8 100644
--- a/packages/evolution/docs/modules/sdk/builders/CoinSelection.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/CoinSelection.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/CoinSelection.ts
-nav_order: 151
+nav_order: 118
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/EvaluationStateManager.ts.md b/packages/evolution/docs/modules/sdk/builders/EvaluationStateManager.ts.md
index e99f3695..928dd8c0 100644
--- a/packages/evolution/docs/modules/sdk/builders/EvaluationStateManager.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/EvaluationStateManager.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/EvaluationStateManager.ts
-nav_order: 152
+nav_order: 119
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/RedeemerBuilder.ts.md b/packages/evolution/docs/modules/sdk/builders/RedeemerBuilder.ts.md
index 42269e31..7634c19c 100644
--- a/packages/evolution/docs/modules/sdk/builders/RedeemerBuilder.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/RedeemerBuilder.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/RedeemerBuilder.ts
-nav_order: 176
+nav_order: 143
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/SignBuilder.ts.md b/packages/evolution/docs/modules/sdk/builders/SignBuilder.ts.md
index 7722dc81..20a75ab3 100644
--- a/packages/evolution/docs/modules/sdk/builders/SignBuilder.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/SignBuilder.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/SignBuilder.ts
-nav_order: 177
+nav_order: 144
 parent: Modules
 ---
 
@@ -62,7 +62,7 @@ export interface SignBuilderEffect {
 
   // Signing methods
   readonly sign: () => Effect.Effect<SubmitBuilder, TransactionBuilderError>
-  readonly signAndSubmit: () => Effect.Effect<string, TransactionBuilderError>
+  readonly signAndSubmit: () => Effect.Effect<TransactionHash.TransactionHash, TransactionBuilderError>
   readonly signWithWitness: (
     witnessSet: TransactionWitnessSet.TransactionWitnessSet
   ) => Effect.Effect<SubmitBuilder, TransactionBuilderError>
diff --git a/packages/evolution/docs/modules/sdk/builders/SignBuilderImpl.ts.md b/packages/evolution/docs/modules/sdk/builders/SignBuilderImpl.ts.md
index c517bb99..e5038e3a 100644
--- a/packages/evolution/docs/modules/sdk/builders/SignBuilderImpl.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/SignBuilderImpl.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/SignBuilderImpl.ts
-nav_order: 178
+nav_order: 145
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/SubmitBuilder.ts.md b/packages/evolution/docs/modules/sdk/builders/SubmitBuilder.ts.md
index 1eddd5ab..d65e8727 100644
--- a/packages/evolution/docs/modules/sdk/builders/SubmitBuilder.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/SubmitBuilder.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/SubmitBuilder.ts
-nav_order: 179
+nav_order: 146
 parent: Modules
 ---
 
@@ -72,7 +72,7 @@ export interface SubmitBuilderEffect {
    * @returns Effect resolving to the transaction hash
    * @since 2.0.0
    */
-  readonly submit: () => Effect.Effect<string, TransactionBuilderError>
+  readonly submit: () => Effect.Effect<TransactionHash.TransactionHash, TransactionBuilderError>
 }
 ```
 
diff --git a/packages/evolution/docs/modules/sdk/builders/SubmitBuilderImpl.ts.md b/packages/evolution/docs/modules/sdk/builders/SubmitBuilderImpl.ts.md
index f772b16e..7a72fa6e 100644
--- a/packages/evolution/docs/modules/sdk/builders/SubmitBuilderImpl.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/SubmitBuilderImpl.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/SubmitBuilderImpl.ts
-nav_order: 180
+nav_order: 147
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/TransactionBuilder.ts.md b/packages/evolution/docs/modules/sdk/builders/TransactionBuilder.ts.md
index 40f96d64..421cd613 100644
--- a/packages/evolution/docs/modules/sdk/builders/TransactionBuilder.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/TransactionBuilder.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/TransactionBuilder.ts
-nav_order: 181
+nav_order: 148
 parent: Modules
 ---
 
@@ -268,8 +268,8 @@ export interface TransactionBuilderBase {
    *
    * @example
    * ```typescript
-   * import * as Script from "../../core/Script.js"
-   * import * as NativeScripts from "../../core/NativeScripts.js"
+   * import * as Script from "../../Script.js"
+   * import * as NativeScripts from "../../NativeScripts.js"
    *
    * const nativeScript = NativeScripts.makeScriptPubKey(keyHashBytes)
    * const script = Script.fromNativeScript(nativeScript)
@@ -346,7 +346,7 @@ export interface TransactionBuilderBase {
    *
    * @example
    * ```typescript
-   * import * as UTxO from "../../core/UTxO.js"
+   * import * as UTxO from "../../UTxO.js"
    *
    * // Use reference script stored on-chain instead of attaching to transaction
    * const refScriptUtxo = await provider.getUtxoByTxHash("abc123...")
@@ -619,7 +619,7 @@ export interface TransactionBuilderBase {
    *
    * @example
    * ```typescript
-   * import * as Time from "@evolution-sdk/core/Time"
+   * import * as Time from "@evolution-sdk/Time"
    *
    * // Transaction valid for 10 minutes from now
    * const tx = await builder
@@ -658,9 +658,9 @@ export interface TransactionBuilderBase {
    *
    * @example
    * ```typescript
-   * import * as VotingProcedures from "@evolution-sdk/core/VotingProcedures"
-   * import * as Vote from "@evolution-sdk/core/Vote"
-   * import * as Data from "@evolution-sdk/core/Data"
+   * import * as VotingProcedures from "@evolution-sdk/VotingProcedures"
+   * import * as Vote from "@evolution-sdk/Vote"
+   * import * as Data from "@evolution-sdk/Data"
    *
    * // Simple single vote with helper
    * await client.newTx()
@@ -716,8 +716,8 @@ export interface TransactionBuilderBase {
    *
    * @example
    * ```typescript
-   * import * as GovernanceAction from "@evolution-sdk/core/GovernanceAction"
-   * import * as RewardAccount from "@evolution-sdk/core/RewardAccount"
+   * import * as GovernanceAction from "@evolution-sdk/GovernanceAction"
+   * import * as RewardAccount from "@evolution-sdk/RewardAccount"
    *
    * // Submit single proposal (deposit auto-fetched)
    * await client.newTx()
@@ -769,8 +769,8 @@ export interface TransactionBuilderBase {
    *
    * @example
    * ```typescript
-   * import * as KeyHash from "@evolution-sdk/core/KeyHash"
-   * import * as Address from "@evolution-sdk/core/Address"
+   * import * as KeyHash from "@evolution-sdk/KeyHash"
+   * import * as Address from "@evolution-sdk/Address"
    *
    * // Add signer from address credential
    * const address = Address.fromBech32("addr_test1...")
@@ -805,7 +805,7 @@ export interface TransactionBuilderBase {
    *
    * @example
    * ```typescript
-   * import { fromEntries } from "@evolution-sdk/evolution/core/TransactionMetadatum"
+   * import { fromEntries } from "@evolution-sdk/evolution/TransactionMetadatum"
    *
    * // Attach a simple message (CIP-20)
    * const tx = await builder
diff --git a/packages/evolution/docs/modules/sdk/builders/TransactionResult.ts.md b/packages/evolution/docs/modules/sdk/builders/TransactionResult.ts.md
index ae2e22e2..725985bc 100644
--- a/packages/evolution/docs/modules/sdk/builders/TransactionResult.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/TransactionResult.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/TransactionResult.ts
-nav_order: 182
+nav_order: 149
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/TxBuilderImpl.ts.md b/packages/evolution/docs/modules/sdk/builders/TxBuilderImpl.ts.md
index 1a12096b..e768027d 100644
--- a/packages/evolution/docs/modules/sdk/builders/TxBuilderImpl.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/TxBuilderImpl.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/TxBuilderImpl.ts
-nav_order: 183
+nav_order: 150
 parent: Modules
 ---
 
@@ -30,7 +30,6 @@ parent: Modules
   - [filterScriptUtxos](#filterscriptutxos)
   - [isScriptAddress](#isscriptaddress)
   - [isScriptAddressCore](#isscriptaddresscore)
-  - [makeDatumOption](#makedatumoption)
   - [makeTxOutput](#maketxoutput)
   - [mergeAssetsIntoOutput](#mergeassetsintooutput)
   - [mergeAssetsIntoUTxO](#mergeassetsintoutxo)
@@ -320,21 +319,6 @@ export declare const isScriptAddressCore: (address: CoreAddress.Address) => bool
 
 Added in v2.0.0
 
-## makeDatumOption
-
-Convert SDK Datum to core DatumOption.
-Parses CBOR hex strings for inline datums and hashes for datum references.
-
-**Signature**
-
-```ts
-export declare const makeDatumOption: (
-  datum: Datum.Datum
-) => Effect.Effect<DatumOption.DatumOption, TransactionBuilderError>
-```
-
-Added in v2.0.0
-
 ## makeTxOutput
 
 Create a TransactionOutput from user-friendly parameters.
diff --git a/packages/evolution/docs/modules/sdk/builders/Unfrack.ts.md b/packages/evolution/docs/modules/sdk/builders/Unfrack.ts.md
index bca55a63..ce9a37e5 100644
--- a/packages/evolution/docs/modules/sdk/builders/Unfrack.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/Unfrack.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/Unfrack.ts
-nav_order: 184
+nav_order: 151
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/operations/AddSigner.ts.md b/packages/evolution/docs/modules/sdk/builders/operations/AddSigner.ts.md
index d92b7b3e..f5605a0e 100644
--- a/packages/evolution/docs/modules/sdk/builders/operations/AddSigner.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/operations/AddSigner.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/AddSigner.ts
-nav_order: 153
+nav_order: 120
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/operations/Attach.ts.md b/packages/evolution/docs/modules/sdk/builders/operations/Attach.ts.md
index ab7fbd1c..82caf3eb 100644
--- a/packages/evolution/docs/modules/sdk/builders/operations/Attach.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/operations/Attach.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/Attach.ts
-nav_order: 154
+nav_order: 121
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/operations/AttachMetadata.ts.md b/packages/evolution/docs/modules/sdk/builders/operations/AttachMetadata.ts.md
index fc75f655..97e52188 100644
--- a/packages/evolution/docs/modules/sdk/builders/operations/AttachMetadata.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/operations/AttachMetadata.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/AttachMetadata.ts
-nav_order: 155
+nav_order: 122
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/operations/Collect.ts.md b/packages/evolution/docs/modules/sdk/builders/operations/Collect.ts.md
index 3c2ddcd8..a30e515a 100644
--- a/packages/evolution/docs/modules/sdk/builders/operations/Collect.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/operations/Collect.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/Collect.ts
-nav_order: 156
+nav_order: 123
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/operations/Governance.ts.md b/packages/evolution/docs/modules/sdk/builders/operations/Governance.ts.md
index ce75b3d1..7784b1b8 100644
--- a/packages/evolution/docs/modules/sdk/builders/operations/Governance.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/operations/Governance.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/Governance.ts
-nav_order: 157
+nav_order: 124
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/operations/Mint.ts.md b/packages/evolution/docs/modules/sdk/builders/operations/Mint.ts.md
index 3b05dede..29bbcf75 100644
--- a/packages/evolution/docs/modules/sdk/builders/operations/Mint.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/operations/Mint.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/Mint.ts
-nav_order: 158
+nav_order: 125
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/operations/Operations.ts.md b/packages/evolution/docs/modules/sdk/builders/operations/Operations.ts.md
index 845ad2fd..7df5bb76 100644
--- a/packages/evolution/docs/modules/sdk/builders/operations/Operations.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/operations/Operations.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/Operations.ts
-nav_order: 159
+nav_order: 126
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/operations/Pay.ts.md b/packages/evolution/docs/modules/sdk/builders/operations/Pay.ts.md
index 589aacd1..85935f1d 100644
--- a/packages/evolution/docs/modules/sdk/builders/operations/Pay.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/operations/Pay.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/Pay.ts
-nav_order: 160
+nav_order: 127
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/operations/Pool.ts.md b/packages/evolution/docs/modules/sdk/builders/operations/Pool.ts.md
index d5307745..2f0f5361 100644
--- a/packages/evolution/docs/modules/sdk/builders/operations/Pool.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/operations/Pool.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/Pool.ts
-nav_order: 161
+nav_order: 128
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/operations/Propose.ts.md b/packages/evolution/docs/modules/sdk/builders/operations/Propose.ts.md
index 63162cdf..feafbbd0 100644
--- a/packages/evolution/docs/modules/sdk/builders/operations/Propose.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/operations/Propose.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/Propose.ts
-nav_order: 162
+nav_order: 129
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/operations/ReadFrom.ts.md b/packages/evolution/docs/modules/sdk/builders/operations/ReadFrom.ts.md
index 4948d193..790ca1dc 100644
--- a/packages/evolution/docs/modules/sdk/builders/operations/ReadFrom.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/operations/ReadFrom.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/ReadFrom.ts
-nav_order: 163
+nav_order: 130
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/operations/Stake.ts.md b/packages/evolution/docs/modules/sdk/builders/operations/Stake.ts.md
index 28b58978..0f321370 100644
--- a/packages/evolution/docs/modules/sdk/builders/operations/Stake.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/operations/Stake.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/Stake.ts
-nav_order: 164
+nav_order: 131
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/operations/Validity.ts.md b/packages/evolution/docs/modules/sdk/builders/operations/Validity.ts.md
index 3fa7deaf..eab23593 100644
--- a/packages/evolution/docs/modules/sdk/builders/operations/Validity.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/operations/Validity.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/Validity.ts
-nav_order: 165
+nav_order: 132
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/operations/Vote.ts.md b/packages/evolution/docs/modules/sdk/builders/operations/Vote.ts.md
index 0fe6b27d..0072444e 100644
--- a/packages/evolution/docs/modules/sdk/builders/operations/Vote.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/operations/Vote.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/operations/Vote.ts
-nav_order: 166
+nav_order: 133
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/phases/Balance.ts.md b/packages/evolution/docs/modules/sdk/builders/phases/Balance.ts.md
index 2c66c8c8..1ba66089 100644
--- a/packages/evolution/docs/modules/sdk/builders/phases/Balance.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/phases/Balance.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/phases/Balance.ts
-nav_order: 167
+nav_order: 134
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/phases/ChangeCreation.ts.md b/packages/evolution/docs/modules/sdk/builders/phases/ChangeCreation.ts.md
index 66366ee0..aa9ba558 100644
--- a/packages/evolution/docs/modules/sdk/builders/phases/ChangeCreation.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/phases/ChangeCreation.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/phases/ChangeCreation.ts
-nav_order: 168
+nav_order: 135
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/phases/Collateral.ts.md b/packages/evolution/docs/modules/sdk/builders/phases/Collateral.ts.md
index efcb0b5b..5c8dea67 100644
--- a/packages/evolution/docs/modules/sdk/builders/phases/Collateral.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/phases/Collateral.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/phases/Collateral.ts
-nav_order: 169
+nav_order: 136
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/phases/Evaluation.ts.md b/packages/evolution/docs/modules/sdk/builders/phases/Evaluation.ts.md
index a7f10dd6..f6dee331 100644
--- a/packages/evolution/docs/modules/sdk/builders/phases/Evaluation.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/phases/Evaluation.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/phases/Evaluation.ts
-nav_order: 170
+nav_order: 137
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/phases/Fallback.ts.md b/packages/evolution/docs/modules/sdk/builders/phases/Fallback.ts.md
index 6ad6b214..3a369852 100644
--- a/packages/evolution/docs/modules/sdk/builders/phases/Fallback.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/phases/Fallback.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/phases/Fallback.ts
-nav_order: 171
+nav_order: 138
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/phases/FeeCalculation.ts.md b/packages/evolution/docs/modules/sdk/builders/phases/FeeCalculation.ts.md
index 3b42572a..a5433a33 100644
--- a/packages/evolution/docs/modules/sdk/builders/phases/FeeCalculation.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/phases/FeeCalculation.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/phases/FeeCalculation.ts
-nav_order: 172
+nav_order: 139
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/phases/Phases.ts.md b/packages/evolution/docs/modules/sdk/builders/phases/Phases.ts.md
index 2ef295bd..a2b2e3dc 100644
--- a/packages/evolution/docs/modules/sdk/builders/phases/Phases.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/phases/Phases.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/phases/Phases.ts
-nav_order: 173
+nav_order: 140
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/phases/Selection.ts.md b/packages/evolution/docs/modules/sdk/builders/phases/Selection.ts.md
index d1eb0d8b..12df981d 100644
--- a/packages/evolution/docs/modules/sdk/builders/phases/Selection.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/phases/Selection.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/phases/Selection.ts
-nav_order: 174
+nav_order: 141
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/builders/phases/utils.ts.md b/packages/evolution/docs/modules/sdk/builders/phases/utils.ts.md
index 2cc94fb4..4e6904a4 100644
--- a/packages/evolution/docs/modules/sdk/builders/phases/utils.ts.md
+++ b/packages/evolution/docs/modules/sdk/builders/phases/utils.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/builders/phases/utils.ts
-nav_order: 175
+nav_order: 142
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/client/Client.ts.md b/packages/evolution/docs/modules/sdk/client/Client.ts.md
index f3fe0948..06d927b1 100644
--- a/packages/evolution/docs/modules/sdk/client/Client.ts.md
+++ b/packages/evolution/docs/modules/sdk/client/Client.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/client/Client.ts
-nav_order: 185
+nav_order: 152
 parent: Modules
 ---
 
@@ -338,7 +338,7 @@ ReadOnlyClient Effect - provider, read-only wallet, and utility methods.
 ```ts
 export interface ReadOnlyClientEffect extends Provider.ProviderEffect, ReadOnlyWalletEffect {
   readonly getWalletUtxos: () => Effect.Effect<ReadonlyArray<CoreUTxO.UTxO>, Provider.ProviderError>
-  readonly getWalletDelegation: () => Effect.Effect<Delegation.Delegation, Provider.ProviderError>
+  readonly getWalletDelegation: () => Effect.Effect<Provider.Delegation, Provider.ProviderError>
 }
 ```
 
@@ -451,7 +451,7 @@ SigningClient Effect - provider, signing wallet, and utility methods.
 ```ts
 export interface SigningClientEffect extends Provider.ProviderEffect, SigningWalletEffect {
   readonly getWalletUtxos: () => Effect.Effect<ReadonlyArray<CoreUTxO.UTxO>, WalletError | Provider.ProviderError>
-  readonly getWalletDelegation: () => Effect.Effect<Delegation.Delegation, WalletError | Provider.ProviderError>
+  readonly getWalletDelegation: () => Effect.Effect<Provider.Delegation, WalletError | Provider.ProviderError>
 }
 ```
 
diff --git a/packages/evolution/docs/modules/sdk/client/ClientImpl.ts.md b/packages/evolution/docs/modules/sdk/client/ClientImpl.ts.md
index 1d69c6be..50d352e9 100644
--- a/packages/evolution/docs/modules/sdk/client/ClientImpl.ts.md
+++ b/packages/evolution/docs/modules/sdk/client/ClientImpl.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/client/ClientImpl.ts
-nav_order: 186
+nav_order: 153
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/sdk/provider/Blockfrost.ts.md b/packages/evolution/docs/modules/sdk/provider/Blockfrost.ts.md
index 2fe11f62..17483962 100644
--- a/packages/evolution/docs/modules/sdk/provider/Blockfrost.ts.md
+++ b/packages/evolution/docs/modules/sdk/provider/Blockfrost.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/provider/Blockfrost.ts
-nav_order: 196
+nav_order: 155
 parent: Modules
 ---
 
@@ -130,7 +130,7 @@ getDelegation: (rewardAddress: Parameters<Provider["getDelegation"]>[0]) => Prom
 **Signature**
 
 ```ts
-getDatum: (datumHash: Parameters<Provider["getDatum"]>[0]) => Promise<string>
+getDatum: (datumHash: Parameters<Provider["getDatum"]>[0]) => Promise<Data>
 ```
 
 ### awaitTx (property)
@@ -147,7 +147,7 @@ awaitTx: (txHash: Parameters<Provider["awaitTx"]>[0], checkInterval?: Parameters
 **Signature**
 
 ```ts
-submitTx: (cbor: Parameters<Provider["submitTx"]>[0]) => Promise<string>
+submitTx: (cbor: Parameters<Provider["submitTx"]>[0]) => Promise<TransactionHash>
 ```
 
 ### evaluateTx (property)
diff --git a/packages/evolution/docs/modules/sdk/provider/Koios.ts.md b/packages/evolution/docs/modules/sdk/provider/Koios.ts.md
index 7c0e1922..70046841 100644
--- a/packages/evolution/docs/modules/sdk/provider/Koios.ts.md
+++ b/packages/evolution/docs/modules/sdk/provider/Koios.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/provider/Koios.ts
-nav_order: 197
+nav_order: 156
 parent: Modules
 ---
 
@@ -108,7 +108,7 @@ getDelegation: (rewardAddress: Parameters<Provider["getDelegation"]>[0]) => Prom
 **Signature**
 
 ```ts
-getDatum: (datumHash: Parameters<Provider["getDatum"]>[0]) => Promise<string>
+getDatum: (datumHash: Parameters<Provider["getDatum"]>[0]) => Promise<Data>
 ```
 
 ### awaitTx (property)
@@ -125,7 +125,7 @@ awaitTx: (txHash: Parameters<Provider["awaitTx"]>[0], checkInterval?: Parameters
 **Signature**
 
 ```ts
-submitTx: (tx: Parameters<Provider["submitTx"]>[0]) => Promise<string>
+submitTx: (tx: Parameters<Provider["submitTx"]>[0]) => Promise<TransactionHash>
 ```
 
 ### evaluateTx (property)
diff --git a/packages/evolution/docs/modules/sdk/provider/Kupmios.ts.md b/packages/evolution/docs/modules/sdk/provider/Kupmios.ts.md
index 512a01fc..9e132cc3 100644
--- a/packages/evolution/docs/modules/sdk/provider/Kupmios.ts.md
+++ b/packages/evolution/docs/modules/sdk/provider/Kupmios.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/provider/Kupmios.ts
-nav_order: 198
+nav_order: 157
 parent: Modules
 ---
 
@@ -115,7 +115,7 @@ getDelegation: (rewardAddress: Parameters<Provider["getDelegation"]>[0]) => Prom
 **Signature**
 
 ```ts
-getDatum: (datumHash: Parameters<Provider["getDatum"]>[0]) => Promise<string>
+getDatum: (datumHash: Parameters<Provider["getDatum"]>[0]) => Promise<Data>
 ```
 
 ### awaitTx (property)
@@ -141,5 +141,5 @@ evaluateTx: (tx: Parameters<Provider["evaluateTx"]>[0], additionalUTxOs?: Parame
 **Signature**
 
 ```ts
-submitTx: (tx: Parameters<Provider["submitTx"]>[0]) => Promise<string>
+submitTx: (tx: Parameters<Provider["submitTx"]>[0]) => Promise<TransactionHash>
 ```
diff --git a/packages/evolution/docs/modules/sdk/provider/Maestro.ts.md b/packages/evolution/docs/modules/sdk/provider/Maestro.ts.md
index 07983ebb..6ea7b9c3 100644
--- a/packages/evolution/docs/modules/sdk/provider/Maestro.ts.md
+++ b/packages/evolution/docs/modules/sdk/provider/Maestro.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/provider/Maestro.ts
-nav_order: 199
+nav_order: 158
 parent: Modules
 ---
 
@@ -114,7 +114,7 @@ getDelegation: (rewardAddress: Parameters<Provider["getDelegation"]>[0]) => Prom
 **Signature**
 
 ```ts
-getDatum: (datumHash: Parameters<Provider["getDatum"]>[0]) => Promise<string>
+getDatum: (datumHash: Parameters<Provider["getDatum"]>[0]) => Promise<Data>
 ```
 
 ### awaitTx (property)
@@ -131,7 +131,7 @@ awaitTx: (txHash: Parameters<Provider["awaitTx"]>[0], checkInterval?: Parameters
 **Signature**
 
 ```ts
-submitTx: (cbor: Parameters<Provider["submitTx"]>[0]) => Promise<string>
+submitTx: (cbor: Parameters<Provider["submitTx"]>[0]) => Promise<TransactionHash>
 ```
 
 ### evaluateTx (property)
diff --git a/packages/evolution/docs/modules/sdk/provider/Provider.ts.md b/packages/evolution/docs/modules/sdk/provider/Provider.ts.md
index dde838a2..fbf51d0c 100644
--- a/packages/evolution/docs/modules/sdk/provider/Provider.ts.md
+++ b/packages/evolution/docs/modules/sdk/provider/Provider.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/provider/Provider.ts
-nav_order: 200
+nav_order: 159
 parent: Modules
 ---
 
@@ -13,6 +13,8 @@ parent: Modules
 - [errors](#errors)
   - [ProviderError (class)](#providererror-class)
 - [model](#model)
+  - [Delegation (interface)](#delegation-interface)
+  - [ProtocolParameters (type alias)](#protocolparameters-type-alias)
   - [Provider (interface)](#provider-interface)
   - [ProviderEffect](#providereffect)
   - [ProviderEffect (interface)](#providereffect-interface)
@@ -36,6 +38,56 @@ Added in v2.0.0
 
 # model
 
+## Delegation (interface)
+
+Delegation information including pool ID and rewards.
+
+**Signature**
+
+```ts
+export interface Delegation {
+  readonly poolId: PoolKeyHash.PoolKeyHash | null
+  readonly rewards: bigint
+}
+```
+
+Added in v2.0.0
+
+## ProtocolParameters (type alias)
+
+Protocol Parameters for the Cardano network.
+Defines operational rules and limits used by providers.
+
+**Signature**
+
+```ts
+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>
+  }
+}
+```
+
+Added in v2.0.0
+
 ## Provider (interface)
 
 Promise-based provider interface for blockchain data access and submission.
@@ -76,7 +128,7 @@ export interface ProviderEffect {
   /**
    * Retrieve current protocol parameters from the blockchain.
    */
-  readonly getProtocolParameters: () => Effect.Effect<ProtocolParameters.ProtocolParameters, ProviderError>
+  readonly getProtocolParameters: () => Effect.Effect<ProtocolParameters, ProviderError>
   /**
    * Query UTxOs at a given address or by credential.
    */
@@ -92,37 +144,44 @@ export interface ProviderEffect {
   ) => Effect.Effect<Array<CoreUTxO.UTxO>, ProviderError>
   /**
    * Query a single UTxO by its unit identifier.
+   * Unit format: policyId (56 hex chars) + assetName (0-64 hex chars)
    */
   readonly getUtxoByUnit: (unit: string) => Effect.Effect<CoreUTxO.UTxO, ProviderError>
   /**
-   * Query UTxOs by their output references.
+   * Query UTxOs by their transaction inputs (output references).
    */
   readonly getUtxosByOutRef: (
-    outRefs: ReadonlyArray<OutRef.OutRef>
+    inputs: ReadonlyArray<TransactionInput.TransactionInput>
   ) => Effect.Effect<Array<CoreUTxO.UTxO>, ProviderError>
   /**
    * Query delegation info for a reward address.
    */
-  readonly getDelegation: (
-    rewardAddress: RewardAddress.RewardAddress
-  ) => Effect.Effect<Delegation.Delegation, ProviderError>
+  readonly getDelegation: (rewardAddress: RewardAddress.RewardAddress) => Effect.Effect<Delegation, ProviderError>
   /**
    * Query a datum by its hash.
+   * Returns the parsed PlutusData structure.
    */
-  readonly getDatum: (datumHash: string) => Effect.Effect<string, ProviderError>
+  readonly getDatum: (datumHash: DatumOption.DatumHash) => Effect.Effect<PlutusData.Data, ProviderError>
   /**
    * Wait for a transaction to be confirmed on the blockchain.
    */
-  readonly awaitTx: (txHash: string, checkInterval?: number) => Effect.Effect<boolean, ProviderError>
+  readonly awaitTx: (
+    txHash: TransactionHash.TransactionHash,
+    checkInterval?: number
+  ) => Effect.Effect<boolean, ProviderError>
   /**
    * Submit a signed transaction to the blockchain.
+   * @param tx - Signed transaction to submit
+   * @returns Transaction hash of the submitted transaction
    */
-  readonly submitTx: (cbor: string) => Effect.Effect<string, ProviderError>
+  readonly submitTx: (tx: Transaction.Transaction) => Effect.Effect<TransactionHash.TransactionHash, ProviderError>
   /**
    * Evaluate a transaction to determine script execution costs.
+   * @param tx - Transaction to evaluate
+   * @param additionalUTxOs - Additional UTxOs to include in evaluation context
    */
   readonly evaluateTx: (
-    tx: string,
+    tx: Transaction.Transaction,
     additionalUTxOs?: Array<CoreUTxO.UTxO>
   ) => Effect.Effect<Array<EvalRedeemer>, ProviderError>
 }
diff --git a/packages/evolution/docs/modules/sdk/wallet/Derivation.ts.md b/packages/evolution/docs/modules/sdk/wallet/Derivation.ts.md
index 0248e16c..33408eeb 100644
--- a/packages/evolution/docs/modules/sdk/wallet/Derivation.ts.md
+++ b/packages/evolution/docs/modules/sdk/wallet/Derivation.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/wallet/Derivation.ts
-nav_order: 207
+nav_order: 161
 parent: Modules
 ---
 
@@ -46,7 +46,7 @@ Result of deriving keys and addresses from a seed or Bip32 root
 ```ts
 export type SeedDerivationResult = {
   address: CoreAddress.Address
-  rewardAddress: SdkRewardAddress.RewardAddress | undefined
+  rewardAddress: CoreRewardAddress.RewardAddress | undefined
   paymentKey: string
   stakeKey: string | undefined
   keyStore: Map<string, PrivateKey.PrivateKey>
@@ -70,7 +70,7 @@ export declare function addressFromSeed(
     accountIndex?: number
     network?: "Mainnet" | "Testnet" | "Custom"
   } = {}
-): { address: CoreAddress.Address; rewardAddress: SdkRewardAddress.RewardAddress | undefined }
+): { address: CoreAddress.Address; rewardAddress: CoreRewardAddress.RewardAddress | undefined }
 ```
 
 ## keysFromSeed
diff --git a/packages/evolution/docs/modules/sdk/wallet/WalletNew.ts.md b/packages/evolution/docs/modules/sdk/wallet/WalletNew.ts.md
index 3780c8d4..e28b39f1 100644
--- a/packages/evolution/docs/modules/sdk/wallet/WalletNew.ts.md
+++ b/packages/evolution/docs/modules/sdk/wallet/WalletNew.ts.md
@@ -1,6 +1,6 @@
 ---
 title: sdk/wallet/WalletNew.ts
-nav_order: 208
+nav_order: 162
 parent: Modules
 ---
 
@@ -149,7 +149,9 @@ export interface ApiWalletEffect extends ReadOnlyWalletEffect {
    * Submit transaction directly through the wallet API.
    * API wallets can submit without requiring a separate provider.
    */
-  readonly submitTx: (tx: Transaction.Transaction | string) => Effect.Effect<string, WalletError>
+  readonly submitTx: (
+    tx: Transaction.Transaction | string
+  ) => Effect.Effect<TransactionHash.TransactionHash, WalletError>
 }
 ```
 
diff --git a/packages/evolution/docs/modules/core/uplc/UPLC.ts.md b/packages/evolution/docs/modules/uplc/UPLC.ts.md
similarity index 99%
rename from packages/evolution/docs/modules/core/uplc/UPLC.ts.md
rename to packages/evolution/docs/modules/uplc/UPLC.ts.md
index 13996272..e8e54aac 100644
--- a/packages/evolution/docs/modules/core/uplc/UPLC.ts.md
+++ b/packages/evolution/docs/modules/uplc/UPLC.ts.md
@@ -1,6 +1,6 @@
 ---
-title: core/uplc/UPLC.ts
-nav_order: 138
+title: uplc/UPLC.ts
+nav_order: 183
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/utils/FeeValidation.ts.md b/packages/evolution/docs/modules/utils/FeeValidation.ts.md
index e09fcaa8..8ddb1f06 100644
--- a/packages/evolution/docs/modules/utils/FeeValidation.ts.md
+++ b/packages/evolution/docs/modules/utils/FeeValidation.ts.md
@@ -1,6 +1,6 @@
 ---
 title: utils/FeeValidation.ts
-nav_order: 210
+nav_order: 186
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/utils/Hash.ts.md b/packages/evolution/docs/modules/utils/Hash.ts.md
index e1da3a75..34ad8387 100644
--- a/packages/evolution/docs/modules/utils/Hash.ts.md
+++ b/packages/evolution/docs/modules/utils/Hash.ts.md
@@ -1,6 +1,6 @@
 ---
 title: utils/Hash.ts
-nav_order: 211
+nav_order: 187
 parent: Modules
 ---
 
diff --git a/packages/evolution/docs/modules/utils/effect-runtime.ts.md b/packages/evolution/docs/modules/utils/effect-runtime.ts.md
index ec844bf2..74ce2c2e 100644
--- a/packages/evolution/docs/modules/utils/effect-runtime.ts.md
+++ b/packages/evolution/docs/modules/utils/effect-runtime.ts.md
@@ -1,6 +1,6 @@
 ---
 title: utils/effect-runtime.ts
-nav_order: 209
+nav_order: 185
 parent: Modules
 ---
 
diff --git a/packages/evolution/package.json b/packages/evolution/package.json
index bfed7dc4..6d31c896 100644
--- a/packages/evolution/package.json
+++ b/packages/evolution/package.json
@@ -16,8 +16,12 @@
   "exports": {
     "./package.json": "./package.json",
     ".": "./src/index.ts",
-    "./core/plutus": "./src/core/plutus/index.ts",
-    "./core/*": "./src/core/*.ts",
+    "./Assets": "./src/Assets/index.ts",
+    "./Time": "./src/Time/index.ts",
+    "./blueprint": "./src/blueprint/index.ts",
+    "./message-signing": "./src/message-signing/index.ts",
+    "./plutus": "./src/plutus/index.ts",
+    "./uplc": "./src/uplc/index.ts",
     "./*": "./src/*.ts",
     "./internal/*": null,
     "./*/index": null
@@ -82,8 +86,12 @@
     "exports": {
       "./package.json": "./package.json",
       ".": "./dist/index.js",
-      "./core/plutus": "./dist/core/plutus/index.js",
-      "./core/*": "./dist/core/*.js",
+      "./Assets": "./dist/Assets/index.js",
+      "./Time": "./dist/Time/index.js",
+      "./blueprint": "./dist/blueprint/index.js",
+      "./message-signing": "./dist/message-signing/index.js",
+      "./plutus": "./dist/plutus/index.js",
+      "./uplc": "./dist/uplc/index.js",
       "./*": "./dist/*.js",
       "./internal/*": null,
       "./*/index": null
diff --git a/packages/evolution/src/core/Address.ts b/packages/evolution/src/Address.ts
similarity index 99%
rename from packages/evolution/src/core/Address.ts
rename to packages/evolution/src/Address.ts
index a24e20d2..0628ae6a 100644
--- a/packages/evolution/src/core/Address.ts
+++ b/packages/evolution/src/Address.ts
@@ -266,7 +266,7 @@ export interface AddressDetails {
  * @category Utils
  * @example
  * ```typescript
- * import * as Address from "@evolution-sdk/evolution/core/Address"
+ * import * as Address from "@evolution-sdk/evolution/Address"
  *
  * const details = Address.getAddressDetails("addr_test1qp...")
  * if (details) {
diff --git a/packages/evolution/src/core/AddressEras.ts b/packages/evolution/src/AddressEras.ts
similarity index 100%
rename from packages/evolution/src/core/AddressEras.ts
rename to packages/evolution/src/AddressEras.ts
diff --git a/packages/evolution/src/core/AddressTag.ts b/packages/evolution/src/AddressTag.ts
similarity index 100%
rename from packages/evolution/src/core/AddressTag.ts
rename to packages/evolution/src/AddressTag.ts
diff --git a/packages/evolution/src/core/Anchor.ts b/packages/evolution/src/Anchor.ts
similarity index 100%
rename from packages/evolution/src/core/Anchor.ts
rename to packages/evolution/src/Anchor.ts
diff --git a/packages/evolution/src/core/AssetName.ts b/packages/evolution/src/AssetName.ts
similarity index 100%
rename from packages/evolution/src/core/AssetName.ts
rename to packages/evolution/src/AssetName.ts
diff --git a/packages/evolution/src/core/Assets/Label.ts b/packages/evolution/src/Assets/Label.ts
similarity index 93%
rename from packages/evolution/src/core/Assets/Label.ts
rename to packages/evolution/src/Assets/Label.ts
index 3cdf9909..1d543026 100644
--- a/packages/evolution/src/core/Assets/Label.ts
+++ b/packages/evolution/src/Assets/Label.ts
@@ -47,7 +47,7 @@ function checksum(num: string): string {
  * @category conversions
  * @example
  * ```typescript
- * import * as Label from "@evolution-sdk/evolution/core/Assets/Label"
+ * import * as Label from "@evolution-sdk/evolution/Assets/Label"
  *
  * const label = Label.toLabel(222)
  * // => "000de140"
@@ -71,7 +71,7 @@ export const toLabel = (num: number): string => {
  * @category conversions
  * @example
  * ```typescript
- * import * as Label from "@evolution-sdk/evolution/core/Assets/Label"
+ * import * as Label from "@evolution-sdk/evolution/Assets/Label"
  *
  * const num = Label.fromLabel("000de140")
  * // => 222
@@ -98,7 +98,7 @@ export const fromLabel = (label: string): number | undefined => {
  * @category schemas
  * @example
  * ```typescript
- * import * as Label from "@evolution-sdk/evolution/core/Assets/Label"
+ * import * as Label from "@evolution-sdk/evolution/Assets/Label"
  * import { Schema } from "effect"
  *
  * const decoded = Schema.decodeSync(Label.LabelFromHex)("000de140")
diff --git a/packages/evolution/src/core/Assets/Unit.ts b/packages/evolution/src/Assets/Unit.ts
similarity index 100%
rename from packages/evolution/src/core/Assets/Unit.ts
rename to packages/evolution/src/Assets/Unit.ts
diff --git a/packages/evolution/src/core/Assets/index.ts b/packages/evolution/src/Assets/index.ts
similarity index 100%
rename from packages/evolution/src/core/Assets/index.ts
rename to packages/evolution/src/Assets/index.ts
diff --git a/packages/evolution/src/core/AuxiliaryData.ts b/packages/evolution/src/AuxiliaryData.ts
similarity index 100%
rename from packages/evolution/src/core/AuxiliaryData.ts
rename to packages/evolution/src/AuxiliaryData.ts
diff --git a/packages/evolution/src/core/AuxiliaryDataHash.ts b/packages/evolution/src/AuxiliaryDataHash.ts
similarity index 100%
rename from packages/evolution/src/core/AuxiliaryDataHash.ts
rename to packages/evolution/src/AuxiliaryDataHash.ts
diff --git a/packages/evolution/src/core/BaseAddress.ts b/packages/evolution/src/BaseAddress.ts
similarity index 100%
rename from packages/evolution/src/core/BaseAddress.ts
rename to packages/evolution/src/BaseAddress.ts
diff --git a/packages/evolution/src/core/Bech32.ts b/packages/evolution/src/Bech32.ts
similarity index 100%
rename from packages/evolution/src/core/Bech32.ts
rename to packages/evolution/src/Bech32.ts
diff --git a/packages/evolution/src/core/BigInt.ts b/packages/evolution/src/BigInt.ts
similarity index 100%
rename from packages/evolution/src/core/BigInt.ts
rename to packages/evolution/src/BigInt.ts
diff --git a/packages/evolution/src/core/Bip32PrivateKey.ts b/packages/evolution/src/Bip32PrivateKey.ts
similarity index 100%
rename from packages/evolution/src/core/Bip32PrivateKey.ts
rename to packages/evolution/src/Bip32PrivateKey.ts
diff --git a/packages/evolution/src/core/Bip32PublicKey.ts b/packages/evolution/src/Bip32PublicKey.ts
similarity index 100%
rename from packages/evolution/src/core/Bip32PublicKey.ts
rename to packages/evolution/src/Bip32PublicKey.ts
diff --git a/packages/evolution/src/core/Block.ts b/packages/evolution/src/Block.ts
similarity index 100%
rename from packages/evolution/src/core/Block.ts
rename to packages/evolution/src/Block.ts
diff --git a/packages/evolution/src/core/BlockBodyHash.ts b/packages/evolution/src/BlockBodyHash.ts
similarity index 100%
rename from packages/evolution/src/core/BlockBodyHash.ts
rename to packages/evolution/src/BlockBodyHash.ts
diff --git a/packages/evolution/src/core/BlockHeaderHash.ts b/packages/evolution/src/BlockHeaderHash.ts
similarity index 100%
rename from packages/evolution/src/core/BlockHeaderHash.ts
rename to packages/evolution/src/BlockHeaderHash.ts
diff --git a/packages/evolution/src/core/BootstrapWitness.ts b/packages/evolution/src/BootstrapWitness.ts
similarity index 100%
rename from packages/evolution/src/core/BootstrapWitness.ts
rename to packages/evolution/src/BootstrapWitness.ts
diff --git a/packages/evolution/src/core/BoundedBytes.ts b/packages/evolution/src/BoundedBytes.ts
similarity index 100%
rename from packages/evolution/src/core/BoundedBytes.ts
rename to packages/evolution/src/BoundedBytes.ts
diff --git a/packages/evolution/src/core/ByronAddress.ts b/packages/evolution/src/ByronAddress.ts
similarity index 100%
rename from packages/evolution/src/core/ByronAddress.ts
rename to packages/evolution/src/ByronAddress.ts
diff --git a/packages/evolution/src/core/Bytes.ts b/packages/evolution/src/Bytes.ts
similarity index 100%
rename from packages/evolution/src/core/Bytes.ts
rename to packages/evolution/src/Bytes.ts
diff --git a/packages/evolution/src/core/Bytes128.ts b/packages/evolution/src/Bytes128.ts
similarity index 100%
rename from packages/evolution/src/core/Bytes128.ts
rename to packages/evolution/src/Bytes128.ts
diff --git a/packages/evolution/src/core/Bytes16.ts b/packages/evolution/src/Bytes16.ts
similarity index 100%
rename from packages/evolution/src/core/Bytes16.ts
rename to packages/evolution/src/Bytes16.ts
diff --git a/packages/evolution/src/core/Bytes29.ts b/packages/evolution/src/Bytes29.ts
similarity index 100%
rename from packages/evolution/src/core/Bytes29.ts
rename to packages/evolution/src/Bytes29.ts
diff --git a/packages/evolution/src/core/Bytes32.ts b/packages/evolution/src/Bytes32.ts
similarity index 100%
rename from packages/evolution/src/core/Bytes32.ts
rename to packages/evolution/src/Bytes32.ts
diff --git a/packages/evolution/src/core/Bytes4.ts b/packages/evolution/src/Bytes4.ts
similarity index 100%
rename from packages/evolution/src/core/Bytes4.ts
rename to packages/evolution/src/Bytes4.ts
diff --git a/packages/evolution/src/core/Bytes448.ts b/packages/evolution/src/Bytes448.ts
similarity index 100%
rename from packages/evolution/src/core/Bytes448.ts
rename to packages/evolution/src/Bytes448.ts
diff --git a/packages/evolution/src/core/Bytes57.ts b/packages/evolution/src/Bytes57.ts
similarity index 100%
rename from packages/evolution/src/core/Bytes57.ts
rename to packages/evolution/src/Bytes57.ts
diff --git a/packages/evolution/src/core/Bytes64.ts b/packages/evolution/src/Bytes64.ts
similarity index 100%
rename from packages/evolution/src/core/Bytes64.ts
rename to packages/evolution/src/Bytes64.ts
diff --git a/packages/evolution/src/core/Bytes80.ts b/packages/evolution/src/Bytes80.ts
similarity index 100%
rename from packages/evolution/src/core/Bytes80.ts
rename to packages/evolution/src/Bytes80.ts
diff --git a/packages/evolution/src/core/Bytes96.ts b/packages/evolution/src/Bytes96.ts
similarity index 100%
rename from packages/evolution/src/core/Bytes96.ts
rename to packages/evolution/src/Bytes96.ts
diff --git a/packages/evolution/src/core/CBOR.ts b/packages/evolution/src/CBOR.ts
similarity index 100%
rename from packages/evolution/src/core/CBOR.ts
rename to packages/evolution/src/CBOR.ts
diff --git a/packages/evolution/src/core/index.ts b/packages/evolution/src/Cardano.ts
similarity index 87%
rename from packages/evolution/src/core/index.ts
rename to packages/evolution/src/Cardano.ts
index 09aee8e7..413221e4 100644
--- a/packages/evolution/src/core/index.ts
+++ b/packages/evolution/src/Cardano.ts
@@ -1,22 +1,22 @@
+/**
+ * @since 2.0.0
+ * @category namespace
+ */
+
+// Core Address Types
 export * as Address from "./Address.js"
 export * as AddressEras from "./AddressEras.js"
 export * as AddressTag from "./AddressTag.js"
-export * as Anchor from "./Anchor.js"
-export * as AssetName from "./AssetName.js"
-export * as Assets from "./Assets/index.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 EnterpriseAddress from "./EnterpriseAddress.js"
+export * as PaymentAddress from "./PaymentAddress.js"
+export * as PointerAddress from "./PointerAddress.js"
+export * as RewardAccount from "./RewardAccount.js"
+export * as RewardAddress from "./RewardAddress.js"
+
+// Bytes & Encoding
+export * as Bech32 from "./Bech32.js"
 export * as Bytes from "./Bytes.js"
 export * as Bytes4 from "./Bytes4.js"
 export * as Bytes16 from "./Bytes16.js"
@@ -29,93 +29,146 @@ 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 Text from "./Text.js"
+export * as Text128 from "./Text128.js"
+
+// Transactions
+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 TransactionWitnessSet from "./TransactionWitnessSet.js"
+
+// Values & Assets
+export * as AssetName from "./AssetName.js"
+export * as Assets from "./Assets/index.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 Mint from "./Mint.js"
+export * as MultiAsset from "./MultiAsset.js"
+export * as PolicyId from "./PolicyId.js"
+export * as PositiveCoin from "./PositiveCoin.js"
+export * as Value from "./Value.js"
+
+// Credentials & Keys
+export * as Bip32PrivateKey from "./Bip32PrivateKey.js"
+export * as Bip32PublicKey from "./Bip32PublicKey.js"
 export * as Credential from "./Credential.js"
-export * as Data from "./Data.js"
-// export * as DataJson from "./DataJson.js"  // Temporarily disabled due to cardano-multiplatform-lib dependency
-export * as DatumOption from "./DatumOption.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 MessageSigning from "./message-signing/index.js"
-export * as Mint from "./Mint.js"
-export * as MultiAsset from "./MultiAsset.js"
-export * as MultiHostName from "./MultiHostName.js"
+export * as PrivateKey from "./PrivateKey.js"
+export * as VKey from "./VKey.js"
+
+// Scripts
 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 PlutusV1 from "./PlutusV1.js"
+export * as PlutusV2 from "./PlutusV2.js"
+export * as PlutusV3 from "./PlutusV3.js"
+export * as Redeemer from "./Redeemer.js"
+export * as Redeemers from "./Redeemers.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"
+
+// Plutus Data
+export * as Data from "./Data.js"
+export * as DatumOption from "./DatumOption.js"
 export * as Plutus from "./plutus/index.js"
-export * as Pointer from "./Pointer.js"
-export * as PointerAddress from "./PointerAddress.js"
-export * as PolicyId from "./PolicyId.js"
+export * as TSchema from "./TSchema.js"
+
+// Certificates & Governance
+export * as Certificate from "./Certificate.js"
+export * as CommitteeColdCredential from "./CommitteeColdCredential.js"
+export * as CommitteeHotCredential from "./CommitteeHotCredential.js"
+export * as Constitution from "./Constitution.js"
+export * as DRep from "./DRep.js"
+export * as DRepCredential from "./DRepCredential.js"
+export * as GovernanceAction from "./GovernanceAction.js"
+export * as ProposalProcedure from "./ProposalProcedure.js"
+export * as ProposalProcedures from "./ProposalProcedures.js"
+export * as VotingProcedures from "./VotingProcedures.js"
+
+// Staking
 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 StakeReference from "./StakeReference.js"
+export * as Withdrawals from "./Withdrawals.js"
+
+// Network & Protocol
+export * as EpochNo from "./EpochNo.js"
+export * as Network from "./Network.js"
+export * as NetworkId from "./NetworkId.js"
 export * as ProtocolParamUpdate from "./ProtocolParamUpdate.js"
 export * as ProtocolVersion from "./ProtocolVersion.js"
-export * as Redeemer from "./Redeemer.js"
-export * as Redeemers from "./Redeemers.js"
+
+// Relay Types
+export * as DnsName from "./DnsName.js"
+export * as IPv4 from "./IPv4.js"
+export * as IPv6 from "./IPv6.js"
+export * as MultiHostName from "./MultiHostName.js"
+export * as Port from "./Port.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 Time from "./Time/index.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 TransactionWitnessSet from "./TransactionWitnessSet.js"
-export * as TSchema from "./TSchema.js"
-export * as UnitInterval from "./UnitInterval.js"
-export * as UPLC from "./uplc/index.js"
 export * as Url from "./Url.js"
-export * as UTxO from "./UTxO.js"
-export * as Value from "./Value.js"
-export * as VKey from "./VKey.js"
-export * as VotingProcedures from "./VotingProcedures.js"
+
+// Block Types
+export * as Block from "./Block.js"
+export * as BlockBodyHash from "./BlockBodyHash.js"
+export * as BlockHeaderHash from "./BlockHeaderHash.js"
+export * as Header from "./Header.js"
+export * as HeaderBody from "./HeaderBody.js"
+export * as KesSignature from "./KesSignature.js"
+export * as KESVkey from "./KESVkey.js"
+export * as OperationalCert from "./OperationalCert.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"
+
+// Auxiliary Data
+export * as AuxiliaryData from "./AuxiliaryData.js"
+export * as AuxiliaryDataHash from "./AuxiliaryDataHash.js"
+export * as Metadata from "./Metadata.js"
+
+// Witnesses
+export * as BootstrapWitness from "./BootstrapWitness.js"
+
+// UTxO
+export * as Pointer from "./Pointer.js"
+export * as UTxO from "./UTxO.js"
+
+// Time
+export * as Time from "./Time/index.js"
+
+// Numeric Types
+export * as BigInt from "./BigInt.js"
+export * as CostModel from "./CostModel.js"
+export * as Natural from "./Natural.js"
+export * as NonnegativeInterval from "./NonnegativeInterval.js"
+export * as NonZeroInt64 from "./NonZeroInt64.js"
+export * as Numeric from "./Numeric.js"
+export * as UnitInterval from "./UnitInterval.js"
+
+// Utilities
+export * as Anchor from "./Anchor.js"
+export * as BoundedBytes from "./BoundedBytes.js"
+export * as Codec from "./Codec.js"
+export * as Combinator from "./Combinator.js"
+export * as FormatError from "./FormatError.js"
+export * as Language from "./Language.js"
+
+// Message Signing (CIP-8, CIP-30)
+export * as MessageSigning from "./message-signing/index.js"
+
+// UPLC
+export * as UPLC from "./uplc/index.js"
+
+// Blueprint
+export * as Blueprint from "./blueprint/index.js"
diff --git a/packages/evolution/src/core/Certificate.ts b/packages/evolution/src/Certificate.ts
similarity index 100%
rename from packages/evolution/src/core/Certificate.ts
rename to packages/evolution/src/Certificate.ts
diff --git a/packages/evolution/src/core/Codec.ts b/packages/evolution/src/Codec.ts
similarity index 100%
rename from packages/evolution/src/core/Codec.ts
rename to packages/evolution/src/Codec.ts
diff --git a/packages/evolution/src/core/Coin.ts b/packages/evolution/src/Coin.ts
similarity index 100%
rename from packages/evolution/src/core/Coin.ts
rename to packages/evolution/src/Coin.ts
diff --git a/packages/evolution/src/core/Combinator.ts b/packages/evolution/src/Combinator.ts
similarity index 100%
rename from packages/evolution/src/core/Combinator.ts
rename to packages/evolution/src/Combinator.ts
diff --git a/packages/evolution/src/core/CommitteeColdCredential.ts b/packages/evolution/src/CommitteeColdCredential.ts
similarity index 100%
rename from packages/evolution/src/core/CommitteeColdCredential.ts
rename to packages/evolution/src/CommitteeColdCredential.ts
diff --git a/packages/evolution/src/core/CommitteeHotCredential.ts b/packages/evolution/src/CommitteeHotCredential.ts
similarity index 100%
rename from packages/evolution/src/core/CommitteeHotCredential.ts
rename to packages/evolution/src/CommitteeHotCredential.ts
diff --git a/packages/evolution/src/core/Constitution.ts b/packages/evolution/src/Constitution.ts
similarity index 100%
rename from packages/evolution/src/core/Constitution.ts
rename to packages/evolution/src/Constitution.ts
diff --git a/packages/evolution/src/core/CostModel.ts b/packages/evolution/src/CostModel.ts
similarity index 100%
rename from packages/evolution/src/core/CostModel.ts
rename to packages/evolution/src/CostModel.ts
diff --git a/packages/evolution/src/core/Credential.ts b/packages/evolution/src/Credential.ts
similarity index 100%
rename from packages/evolution/src/core/Credential.ts
rename to packages/evolution/src/Credential.ts
diff --git a/packages/evolution/src/core/DRep.ts b/packages/evolution/src/DRep.ts
similarity index 100%
rename from packages/evolution/src/core/DRep.ts
rename to packages/evolution/src/DRep.ts
diff --git a/packages/evolution/src/core/DRepCredential.ts b/packages/evolution/src/DRepCredential.ts
similarity index 100%
rename from packages/evolution/src/core/DRepCredential.ts
rename to packages/evolution/src/DRepCredential.ts
diff --git a/packages/evolution/src/core/Data.ts b/packages/evolution/src/Data.ts
similarity index 100%
rename from packages/evolution/src/core/Data.ts
rename to packages/evolution/src/Data.ts
diff --git a/packages/evolution/src/core/DataJson.ts b/packages/evolution/src/DataJson.ts
similarity index 100%
rename from packages/evolution/src/core/DataJson.ts
rename to packages/evolution/src/DataJson.ts
diff --git a/packages/evolution/src/core/DatumOption.ts b/packages/evolution/src/DatumOption.ts
similarity index 100%
rename from packages/evolution/src/core/DatumOption.ts
rename to packages/evolution/src/DatumOption.ts
diff --git a/packages/evolution/src/core/DnsName.ts b/packages/evolution/src/DnsName.ts
similarity index 100%
rename from packages/evolution/src/core/DnsName.ts
rename to packages/evolution/src/DnsName.ts
diff --git a/packages/evolution/src/core/Ed25519Signature.ts b/packages/evolution/src/Ed25519Signature.ts
similarity index 100%
rename from packages/evolution/src/core/Ed25519Signature.ts
rename to packages/evolution/src/Ed25519Signature.ts
diff --git a/packages/evolution/src/core/EnterpriseAddress.ts b/packages/evolution/src/EnterpriseAddress.ts
similarity index 100%
rename from packages/evolution/src/core/EnterpriseAddress.ts
rename to packages/evolution/src/EnterpriseAddress.ts
diff --git a/packages/evolution/src/core/EpochNo.ts b/packages/evolution/src/EpochNo.ts
similarity index 100%
rename from packages/evolution/src/core/EpochNo.ts
rename to packages/evolution/src/EpochNo.ts
diff --git a/packages/evolution/src/core/FormatError.ts b/packages/evolution/src/FormatError.ts
similarity index 100%
rename from packages/evolution/src/core/FormatError.ts
rename to packages/evolution/src/FormatError.ts
diff --git a/packages/evolution/src/core/Function.ts b/packages/evolution/src/Function.ts
similarity index 100%
rename from packages/evolution/src/core/Function.ts
rename to packages/evolution/src/Function.ts
diff --git a/packages/evolution/src/core/GovernanceAction.ts b/packages/evolution/src/GovernanceAction.ts
similarity index 100%
rename from packages/evolution/src/core/GovernanceAction.ts
rename to packages/evolution/src/GovernanceAction.ts
diff --git a/packages/evolution/src/core/Hash28.ts b/packages/evolution/src/Hash28.ts
similarity index 100%
rename from packages/evolution/src/core/Hash28.ts
rename to packages/evolution/src/Hash28.ts
diff --git a/packages/evolution/src/core/Header.ts b/packages/evolution/src/Header.ts
similarity index 100%
rename from packages/evolution/src/core/Header.ts
rename to packages/evolution/src/Header.ts
diff --git a/packages/evolution/src/core/HeaderBody.ts b/packages/evolution/src/HeaderBody.ts
similarity index 100%
rename from packages/evolution/src/core/HeaderBody.ts
rename to packages/evolution/src/HeaderBody.ts
diff --git a/packages/evolution/src/core/IPv4.ts b/packages/evolution/src/IPv4.ts
similarity index 100%
rename from packages/evolution/src/core/IPv4.ts
rename to packages/evolution/src/IPv4.ts
diff --git a/packages/evolution/src/core/IPv6.ts b/packages/evolution/src/IPv6.ts
similarity index 100%
rename from packages/evolution/src/core/IPv6.ts
rename to packages/evolution/src/IPv6.ts
diff --git a/packages/evolution/src/core/KESVkey.ts b/packages/evolution/src/KESVkey.ts
similarity index 100%
rename from packages/evolution/src/core/KESVkey.ts
rename to packages/evolution/src/KESVkey.ts
diff --git a/packages/evolution/src/core/KesSignature.ts b/packages/evolution/src/KesSignature.ts
similarity index 100%
rename from packages/evolution/src/core/KesSignature.ts
rename to packages/evolution/src/KesSignature.ts
diff --git a/packages/evolution/src/core/KeyHash.ts b/packages/evolution/src/KeyHash.ts
similarity index 100%
rename from packages/evolution/src/core/KeyHash.ts
rename to packages/evolution/src/KeyHash.ts
diff --git a/packages/evolution/src/core/Language.ts b/packages/evolution/src/Language.ts
similarity index 100%
rename from packages/evolution/src/core/Language.ts
rename to packages/evolution/src/Language.ts
diff --git a/packages/evolution/src/core/Metadata.ts b/packages/evolution/src/Metadata.ts
similarity index 100%
rename from packages/evolution/src/core/Metadata.ts
rename to packages/evolution/src/Metadata.ts
diff --git a/packages/evolution/src/core/Mint.ts b/packages/evolution/src/Mint.ts
similarity index 100%
rename from packages/evolution/src/core/Mint.ts
rename to packages/evolution/src/Mint.ts
diff --git a/packages/evolution/src/core/MultiAsset.ts b/packages/evolution/src/MultiAsset.ts
similarity index 100%
rename from packages/evolution/src/core/MultiAsset.ts
rename to packages/evolution/src/MultiAsset.ts
diff --git a/packages/evolution/src/core/MultiHostName.ts b/packages/evolution/src/MultiHostName.ts
similarity index 100%
rename from packages/evolution/src/core/MultiHostName.ts
rename to packages/evolution/src/MultiHostName.ts
diff --git a/packages/evolution/src/core/NativeScriptJSON.ts b/packages/evolution/src/NativeScriptJSON.ts
similarity index 100%
rename from packages/evolution/src/core/NativeScriptJSON.ts
rename to packages/evolution/src/NativeScriptJSON.ts
diff --git a/packages/evolution/src/core/NativeScripts.ts b/packages/evolution/src/NativeScripts.ts
similarity index 100%
rename from packages/evolution/src/core/NativeScripts.ts
rename to packages/evolution/src/NativeScripts.ts
diff --git a/packages/evolution/src/core/NativeScriptsOLD.ts b/packages/evolution/src/NativeScriptsOLD.ts
similarity index 100%
rename from packages/evolution/src/core/NativeScriptsOLD.ts
rename to packages/evolution/src/NativeScriptsOLD.ts
diff --git a/packages/evolution/src/core/Natural.ts b/packages/evolution/src/Natural.ts
similarity index 100%
rename from packages/evolution/src/core/Natural.ts
rename to packages/evolution/src/Natural.ts
diff --git a/packages/evolution/src/core/Network.ts b/packages/evolution/src/Network.ts
similarity index 100%
rename from packages/evolution/src/core/Network.ts
rename to packages/evolution/src/Network.ts
diff --git a/packages/evolution/src/core/NetworkId.ts b/packages/evolution/src/NetworkId.ts
similarity index 100%
rename from packages/evolution/src/core/NetworkId.ts
rename to packages/evolution/src/NetworkId.ts
diff --git a/packages/evolution/src/core/NonZeroInt64.ts b/packages/evolution/src/NonZeroInt64.ts
similarity index 100%
rename from packages/evolution/src/core/NonZeroInt64.ts
rename to packages/evolution/src/NonZeroInt64.ts
diff --git a/packages/evolution/src/core/NonnegativeInterval.ts b/packages/evolution/src/NonnegativeInterval.ts
similarity index 100%
rename from packages/evolution/src/core/NonnegativeInterval.ts
rename to packages/evolution/src/NonnegativeInterval.ts
diff --git a/packages/evolution/src/core/Numeric.ts b/packages/evolution/src/Numeric.ts
similarity index 100%
rename from packages/evolution/src/core/Numeric.ts
rename to packages/evolution/src/Numeric.ts
diff --git a/packages/evolution/src/core/OperationalCert.ts b/packages/evolution/src/OperationalCert.ts
similarity index 100%
rename from packages/evolution/src/core/OperationalCert.ts
rename to packages/evolution/src/OperationalCert.ts
diff --git a/packages/evolution/src/core/PaymentAddress.ts b/packages/evolution/src/PaymentAddress.ts
similarity index 100%
rename from packages/evolution/src/core/PaymentAddress.ts
rename to packages/evolution/src/PaymentAddress.ts
diff --git a/packages/evolution/src/core/PlutusV1.ts b/packages/evolution/src/PlutusV1.ts
similarity index 100%
rename from packages/evolution/src/core/PlutusV1.ts
rename to packages/evolution/src/PlutusV1.ts
diff --git a/packages/evolution/src/core/PlutusV2.ts b/packages/evolution/src/PlutusV2.ts
similarity index 100%
rename from packages/evolution/src/core/PlutusV2.ts
rename to packages/evolution/src/PlutusV2.ts
diff --git a/packages/evolution/src/core/PlutusV3.ts b/packages/evolution/src/PlutusV3.ts
similarity index 100%
rename from packages/evolution/src/core/PlutusV3.ts
rename to packages/evolution/src/PlutusV3.ts
diff --git a/packages/evolution/src/core/Pointer.ts b/packages/evolution/src/Pointer.ts
similarity index 100%
rename from packages/evolution/src/core/Pointer.ts
rename to packages/evolution/src/Pointer.ts
diff --git a/packages/evolution/src/core/PointerAddress.ts b/packages/evolution/src/PointerAddress.ts
similarity index 100%
rename from packages/evolution/src/core/PointerAddress.ts
rename to packages/evolution/src/PointerAddress.ts
diff --git a/packages/evolution/src/core/PolicyId.ts b/packages/evolution/src/PolicyId.ts
similarity index 100%
rename from packages/evolution/src/core/PolicyId.ts
rename to packages/evolution/src/PolicyId.ts
diff --git a/packages/evolution/src/core/PoolKeyHash.ts b/packages/evolution/src/PoolKeyHash.ts
similarity index 100%
rename from packages/evolution/src/core/PoolKeyHash.ts
rename to packages/evolution/src/PoolKeyHash.ts
diff --git a/packages/evolution/src/core/PoolMetadata.ts b/packages/evolution/src/PoolMetadata.ts
similarity index 100%
rename from packages/evolution/src/core/PoolMetadata.ts
rename to packages/evolution/src/PoolMetadata.ts
diff --git a/packages/evolution/src/core/PoolParams.ts b/packages/evolution/src/PoolParams.ts
similarity index 100%
rename from packages/evolution/src/core/PoolParams.ts
rename to packages/evolution/src/PoolParams.ts
diff --git a/packages/evolution/src/core/Port.ts b/packages/evolution/src/Port.ts
similarity index 100%
rename from packages/evolution/src/core/Port.ts
rename to packages/evolution/src/Port.ts
diff --git a/packages/evolution/src/core/PositiveCoin.ts b/packages/evolution/src/PositiveCoin.ts
similarity index 100%
rename from packages/evolution/src/core/PositiveCoin.ts
rename to packages/evolution/src/PositiveCoin.ts
diff --git a/packages/evolution/src/core/PrivateKey.ts b/packages/evolution/src/PrivateKey.ts
similarity index 100%
rename from packages/evolution/src/core/PrivateKey.ts
rename to packages/evolution/src/PrivateKey.ts
diff --git a/packages/evolution/src/core/ProposalProcedure.ts b/packages/evolution/src/ProposalProcedure.ts
similarity index 100%
rename from packages/evolution/src/core/ProposalProcedure.ts
rename to packages/evolution/src/ProposalProcedure.ts
diff --git a/packages/evolution/src/core/ProposalProcedures.ts b/packages/evolution/src/ProposalProcedures.ts
similarity index 100%
rename from packages/evolution/src/core/ProposalProcedures.ts
rename to packages/evolution/src/ProposalProcedures.ts
diff --git a/packages/evolution/src/core/ProtocolParamUpdate.ts b/packages/evolution/src/ProtocolParamUpdate.ts
similarity index 100%
rename from packages/evolution/src/core/ProtocolParamUpdate.ts
rename to packages/evolution/src/ProtocolParamUpdate.ts
diff --git a/packages/evolution/src/core/ProtocolVersion.ts b/packages/evolution/src/ProtocolVersion.ts
similarity index 100%
rename from packages/evolution/src/core/ProtocolVersion.ts
rename to packages/evolution/src/ProtocolVersion.ts
diff --git a/packages/evolution/src/core/Redeemer.ts b/packages/evolution/src/Redeemer.ts
similarity index 100%
rename from packages/evolution/src/core/Redeemer.ts
rename to packages/evolution/src/Redeemer.ts
diff --git a/packages/evolution/src/core/Redeemers.ts b/packages/evolution/src/Redeemers.ts
similarity index 100%
rename from packages/evolution/src/core/Redeemers.ts
rename to packages/evolution/src/Redeemers.ts
diff --git a/packages/evolution/src/core/Relay.ts b/packages/evolution/src/Relay.ts
similarity index 100%
rename from packages/evolution/src/core/Relay.ts
rename to packages/evolution/src/Relay.ts
diff --git a/packages/evolution/src/core/RewardAccount.ts b/packages/evolution/src/RewardAccount.ts
similarity index 100%
rename from packages/evolution/src/core/RewardAccount.ts
rename to packages/evolution/src/RewardAccount.ts
diff --git a/packages/evolution/src/core/RewardAddress.ts b/packages/evolution/src/RewardAddress.ts
similarity index 100%
rename from packages/evolution/src/core/RewardAddress.ts
rename to packages/evolution/src/RewardAddress.ts
diff --git a/packages/evolution/src/core/Script.ts b/packages/evolution/src/Script.ts
similarity index 100%
rename from packages/evolution/src/core/Script.ts
rename to packages/evolution/src/Script.ts
diff --git a/packages/evolution/src/core/ScriptDataHash.ts b/packages/evolution/src/ScriptDataHash.ts
similarity index 100%
rename from packages/evolution/src/core/ScriptDataHash.ts
rename to packages/evolution/src/ScriptDataHash.ts
diff --git a/packages/evolution/src/core/ScriptHash.ts b/packages/evolution/src/ScriptHash.ts
similarity index 100%
rename from packages/evolution/src/core/ScriptHash.ts
rename to packages/evolution/src/ScriptHash.ts
diff --git a/packages/evolution/src/core/ScriptRef.ts b/packages/evolution/src/ScriptRef.ts
similarity index 100%
rename from packages/evolution/src/core/ScriptRef.ts
rename to packages/evolution/src/ScriptRef.ts
diff --git a/packages/evolution/src/core/SingleHostAddr.ts b/packages/evolution/src/SingleHostAddr.ts
similarity index 100%
rename from packages/evolution/src/core/SingleHostAddr.ts
rename to packages/evolution/src/SingleHostAddr.ts
diff --git a/packages/evolution/src/core/SingleHostName.ts b/packages/evolution/src/SingleHostName.ts
similarity index 100%
rename from packages/evolution/src/core/SingleHostName.ts
rename to packages/evolution/src/SingleHostName.ts
diff --git a/packages/evolution/src/core/StakeReference.ts b/packages/evolution/src/StakeReference.ts
similarity index 100%
rename from packages/evolution/src/core/StakeReference.ts
rename to packages/evolution/src/StakeReference.ts
diff --git a/packages/evolution/src/core/TSchema.ts b/packages/evolution/src/TSchema.ts
similarity index 100%
rename from packages/evolution/src/core/TSchema.ts
rename to packages/evolution/src/TSchema.ts
diff --git a/packages/evolution/src/core/Text.ts b/packages/evolution/src/Text.ts
similarity index 100%
rename from packages/evolution/src/core/Text.ts
rename to packages/evolution/src/Text.ts
diff --git a/packages/evolution/src/core/Text128.ts b/packages/evolution/src/Text128.ts
similarity index 100%
rename from packages/evolution/src/core/Text128.ts
rename to packages/evolution/src/Text128.ts
diff --git a/packages/evolution/src/core/Time/Slot.ts b/packages/evolution/src/Time/Slot.ts
similarity index 100%
rename from packages/evolution/src/core/Time/Slot.ts
rename to packages/evolution/src/Time/Slot.ts
diff --git a/packages/evolution/src/core/Time/SlotConfig.ts b/packages/evolution/src/Time/SlotConfig.ts
similarity index 100%
rename from packages/evolution/src/core/Time/SlotConfig.ts
rename to packages/evolution/src/Time/SlotConfig.ts
diff --git a/packages/evolution/src/core/Time/UnixTime.ts b/packages/evolution/src/Time/UnixTime.ts
similarity index 100%
rename from packages/evolution/src/core/Time/UnixTime.ts
rename to packages/evolution/src/Time/UnixTime.ts
diff --git a/packages/evolution/src/core/Time/index.ts b/packages/evolution/src/Time/index.ts
similarity index 100%
rename from packages/evolution/src/core/Time/index.ts
rename to packages/evolution/src/Time/index.ts
diff --git a/packages/evolution/src/core/Transaction.ts b/packages/evolution/src/Transaction.ts
similarity index 100%
rename from packages/evolution/src/core/Transaction.ts
rename to packages/evolution/src/Transaction.ts
diff --git a/packages/evolution/src/core/TransactionBody.ts b/packages/evolution/src/TransactionBody.ts
similarity index 100%
rename from packages/evolution/src/core/TransactionBody.ts
rename to packages/evolution/src/TransactionBody.ts
diff --git a/packages/evolution/src/core/TransactionHash.ts b/packages/evolution/src/TransactionHash.ts
similarity index 100%
rename from packages/evolution/src/core/TransactionHash.ts
rename to packages/evolution/src/TransactionHash.ts
diff --git a/packages/evolution/src/core/TransactionIndex.ts b/packages/evolution/src/TransactionIndex.ts
similarity index 100%
rename from packages/evolution/src/core/TransactionIndex.ts
rename to packages/evolution/src/TransactionIndex.ts
diff --git a/packages/evolution/src/core/TransactionInput.ts b/packages/evolution/src/TransactionInput.ts
similarity index 100%
rename from packages/evolution/src/core/TransactionInput.ts
rename to packages/evolution/src/TransactionInput.ts
diff --git a/packages/evolution/src/core/TransactionMetadatum.ts b/packages/evolution/src/TransactionMetadatum.ts
similarity index 100%
rename from packages/evolution/src/core/TransactionMetadatum.ts
rename to packages/evolution/src/TransactionMetadatum.ts
diff --git a/packages/evolution/src/core/TransactionMetadatumLabels.ts b/packages/evolution/src/TransactionMetadatumLabels.ts
similarity index 100%
rename from packages/evolution/src/core/TransactionMetadatumLabels.ts
rename to packages/evolution/src/TransactionMetadatumLabels.ts
diff --git a/packages/evolution/src/core/TransactionOutput.ts b/packages/evolution/src/TransactionOutput.ts
similarity index 100%
rename from packages/evolution/src/core/TransactionOutput.ts
rename to packages/evolution/src/TransactionOutput.ts
diff --git a/packages/evolution/src/core/TransactionWitnessSet.ts b/packages/evolution/src/TransactionWitnessSet.ts
similarity index 100%
rename from packages/evolution/src/core/TransactionWitnessSet.ts
rename to packages/evolution/src/TransactionWitnessSet.ts
diff --git a/packages/evolution/src/core/TxOut.ts b/packages/evolution/src/TxOut.ts
similarity index 100%
rename from packages/evolution/src/core/TxOut.ts
rename to packages/evolution/src/TxOut.ts
diff --git a/packages/evolution/src/core/UTxO.ts b/packages/evolution/src/UTxO.ts
similarity index 100%
rename from packages/evolution/src/core/UTxO.ts
rename to packages/evolution/src/UTxO.ts
diff --git a/packages/evolution/src/core/UnitInterval.ts b/packages/evolution/src/UnitInterval.ts
similarity index 100%
rename from packages/evolution/src/core/UnitInterval.ts
rename to packages/evolution/src/UnitInterval.ts
diff --git a/packages/evolution/src/core/Url.ts b/packages/evolution/src/Url.ts
similarity index 100%
rename from packages/evolution/src/core/Url.ts
rename to packages/evolution/src/Url.ts
diff --git a/packages/evolution/src/core/VKey.ts b/packages/evolution/src/VKey.ts
similarity index 100%
rename from packages/evolution/src/core/VKey.ts
rename to packages/evolution/src/VKey.ts
diff --git a/packages/evolution/src/core/Value.ts b/packages/evolution/src/Value.ts
similarity index 100%
rename from packages/evolution/src/core/Value.ts
rename to packages/evolution/src/Value.ts
diff --git a/packages/evolution/src/core/VotingProcedures.ts b/packages/evolution/src/VotingProcedures.ts
similarity index 100%
rename from packages/evolution/src/core/VotingProcedures.ts
rename to packages/evolution/src/VotingProcedures.ts
diff --git a/packages/evolution/src/core/VrfCert.ts b/packages/evolution/src/VrfCert.ts
similarity index 100%
rename from packages/evolution/src/core/VrfCert.ts
rename to packages/evolution/src/VrfCert.ts
diff --git a/packages/evolution/src/core/VrfKeyHash.ts b/packages/evolution/src/VrfKeyHash.ts
similarity index 100%
rename from packages/evolution/src/core/VrfKeyHash.ts
rename to packages/evolution/src/VrfKeyHash.ts
diff --git a/packages/evolution/src/core/VrfVkey.ts b/packages/evolution/src/VrfVkey.ts
similarity index 100%
rename from packages/evolution/src/core/VrfVkey.ts
rename to packages/evolution/src/VrfVkey.ts
diff --git a/packages/evolution/src/core/Withdrawals.ts b/packages/evolution/src/Withdrawals.ts
similarity index 100%
rename from packages/evolution/src/core/Withdrawals.ts
rename to packages/evolution/src/Withdrawals.ts
diff --git a/packages/evolution/src/blueprint/codegen-config.ts b/packages/evolution/src/blueprint/codegen-config.ts
index 2ea33f33..623a093e 100644
--- a/packages/evolution/src/blueprint/codegen-config.ts
+++ b/packages/evolution/src/blueprint/codegen-config.ts
@@ -126,7 +126,7 @@ export interface CodegenConfig {
 
   /**
    * Explicit import lines for Data, TSchema, and effect modules
-   * e.g. data: 'import { Data } from "@evolution-sdk/evolution/core/Data"'
+   * e.g. data: 'import { Data } from "@evolution-sdk/evolution/Data"'
    */
   imports: {
     data: string
@@ -158,8 +158,8 @@ export const DEFAULT_CODEGEN_CONFIG: CodegenConfig = {
   moduleStrategy: "flat",
   useRelativeRefs: true,
   imports: {
-    data: 'import { Data } from "@evolution-sdk/evolution/core/Data"',
-    tschema: 'import { TSchema } from "@evolution-sdk/evolution/core/TSchema"'
+    data: 'import { Data } from "@evolution-sdk/evolution/Data"',
+    tschema: 'import { TSchema } from "@evolution-sdk/evolution/TSchema"'
   },
   indent: "  "
 }
diff --git a/packages/evolution/src/index.ts b/packages/evolution/src/index.ts
index ee80e19b..a184d1e3 100644
--- a/packages/evolution/src/index.ts
+++ b/packages/evolution/src/index.ts
@@ -1,8 +1,130 @@
+// Cardano namespace - single import for discovery and exploration
+export * as Cardano from "./Cardano.js"
+
+// Individual module exports - tree-shakeable for production
+export * as Address from "./Address.js"
+export * as AddressEras from "./AddressEras.js"
+export * as AddressTag from "./AddressTag.js"
+export * as Anchor from "./Anchor.js"
+export * as AssetName from "./AssetName.js"
+export * as Assets from "./Assets/index.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 Blueprint from "./blueprint/index.js"
-export * as Core from "./core/index.js"
-export * as Plutus from "./core/plutus/index.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 DatumOption from "./DatumOption.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 MessageSigning from "./message-signing/index.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 Plutus from "./plutus/index.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 Redeemers from "./Redeemers.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 * from "./sdk/client/Client.js"
 export { createClient } from "./sdk/client/ClientImpl.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 Time from "./Time/index.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 TransactionWitnessSet from "./TransactionWitnessSet.js"
+export * as TSchema from "./TSchema.js"
+export * as UnitInterval from "./UnitInterval.js"
+export * as UPLC from "./uplc/index.js"
+export * as Url from "./Url.js"
 export { runEffect } from "./utils/effect-runtime.js"
 export * as FeeValidation from "./utils/FeeValidation.js"
+export * as UTxO from "./UTxO.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 { Effect, Either, pipe, Schema } from "effect"
diff --git a/packages/evolution/src/core/message-signing/CoseKey.ts b/packages/evolution/src/message-signing/CoseKey.ts
similarity index 100%
rename from packages/evolution/src/core/message-signing/CoseKey.ts
rename to packages/evolution/src/message-signing/CoseKey.ts
diff --git a/packages/evolution/src/core/message-signing/CoseSign.ts b/packages/evolution/src/message-signing/CoseSign.ts
similarity index 100%
rename from packages/evolution/src/core/message-signing/CoseSign.ts
rename to packages/evolution/src/message-signing/CoseSign.ts
diff --git a/packages/evolution/src/core/message-signing/CoseSign1.ts b/packages/evolution/src/message-signing/CoseSign1.ts
similarity index 100%
rename from packages/evolution/src/core/message-signing/CoseSign1.ts
rename to packages/evolution/src/message-signing/CoseSign1.ts
diff --git a/packages/evolution/src/core/message-signing/Header.ts b/packages/evolution/src/message-signing/Header.ts
similarity index 100%
rename from packages/evolution/src/core/message-signing/Header.ts
rename to packages/evolution/src/message-signing/Header.ts
diff --git a/packages/evolution/src/core/message-signing/Label.ts b/packages/evolution/src/message-signing/Label.ts
similarity index 100%
rename from packages/evolution/src/core/message-signing/Label.ts
rename to packages/evolution/src/message-signing/Label.ts
diff --git a/packages/evolution/src/core/message-signing/SignData.ts b/packages/evolution/src/message-signing/SignData.ts
similarity index 100%
rename from packages/evolution/src/core/message-signing/SignData.ts
rename to packages/evolution/src/message-signing/SignData.ts
diff --git a/packages/evolution/src/core/message-signing/Utils.ts b/packages/evolution/src/message-signing/Utils.ts
similarity index 100%
rename from packages/evolution/src/core/message-signing/Utils.ts
rename to packages/evolution/src/message-signing/Utils.ts
diff --git a/packages/evolution/src/core/message-signing/index.ts b/packages/evolution/src/message-signing/index.ts
similarity index 100%
rename from packages/evolution/src/core/message-signing/index.ts
rename to packages/evolution/src/message-signing/index.ts
diff --git a/packages/evolution/src/core/plutus/Address.ts b/packages/evolution/src/plutus/Address.ts
similarity index 100%
rename from packages/evolution/src/core/plutus/Address.ts
rename to packages/evolution/src/plutus/Address.ts
diff --git a/packages/evolution/src/core/plutus/CIP68Metadata.ts b/packages/evolution/src/plutus/CIP68Metadata.ts
similarity index 100%
rename from packages/evolution/src/core/plutus/CIP68Metadata.ts
rename to packages/evolution/src/plutus/CIP68Metadata.ts
diff --git a/packages/evolution/src/core/plutus/Credential.ts b/packages/evolution/src/plutus/Credential.ts
similarity index 100%
rename from packages/evolution/src/core/plutus/Credential.ts
rename to packages/evolution/src/plutus/Credential.ts
diff --git a/packages/evolution/src/core/plutus/OutputReference.ts b/packages/evolution/src/plutus/OutputReference.ts
similarity index 100%
rename from packages/evolution/src/core/plutus/OutputReference.ts
rename to packages/evolution/src/plutus/OutputReference.ts
diff --git a/packages/evolution/src/core/plutus/Value.ts b/packages/evolution/src/plutus/Value.ts
similarity index 100%
rename from packages/evolution/src/core/plutus/Value.ts
rename to packages/evolution/src/plutus/Value.ts
diff --git a/packages/evolution/src/core/plutus/index.ts b/packages/evolution/src/plutus/index.ts
similarity index 100%
rename from packages/evolution/src/core/plutus/index.ts
rename to packages/evolution/src/plutus/index.ts
diff --git a/packages/evolution/src/sdk/EvalRedeemer.ts b/packages/evolution/src/sdk/EvalRedeemer.ts
index 04c1f3e5..48a909ec 100644
--- a/packages/evolution/src/sdk/EvalRedeemer.ts
+++ b/packages/evolution/src/sdk/EvalRedeemer.ts
@@ -1,6 +1,6 @@
 // EvalRedeemer types and utilities for transaction evaluation
 
-import type * as Redeemer from "../core/Redeemer.js"
+import type * as Redeemer from "../Redeemer.js"
 
 /**
  * Evaluation result for a single redeemer from transaction evaluation.
diff --git a/packages/evolution/src/sdk/builders/CoinSelection.ts b/packages/evolution/src/sdk/builders/CoinSelection.ts
index 4a027f08..232cdc29 100644
--- a/packages/evolution/src/sdk/builders/CoinSelection.ts
+++ b/packages/evolution/src/sdk/builders/CoinSelection.ts
@@ -1,7 +1,7 @@
 import { Data } from "effect"
 
-import * as CoreAssets from "../../core/Assets/index.js"
-import type * as UTxO from "../../core/UTxO.js"
+import * as CoreAssets from "../../Assets/index.js"
+import type * as UTxO from "../../UTxO.js"
 
 // ============================================================================
 // Error Types
diff --git a/packages/evolution/src/sdk/builders/RedeemerBuilder.ts b/packages/evolution/src/sdk/builders/RedeemerBuilder.ts
index 01396079..c9cae7c6 100644
--- a/packages/evolution/src/sdk/builders/RedeemerBuilder.ts
+++ b/packages/evolution/src/sdk/builders/RedeemerBuilder.ts
@@ -15,8 +15,8 @@
  * @since 2.0.0
  */
 
-import type * as Data from "../../core/Data.js"
-import type * as UTxO from "../../core/UTxO.js"
+import type * as Data from "../../Data.js"
+import type * as UTxO from "../../UTxO.js"
 
 /**
  * An input with its resolved transaction index.
diff --git a/packages/evolution/src/sdk/builders/SignBuilder.ts b/packages/evolution/src/sdk/builders/SignBuilder.ts
index 31bdfd3c..ae5ceddd 100644
--- a/packages/evolution/src/sdk/builders/SignBuilder.ts
+++ b/packages/evolution/src/sdk/builders/SignBuilder.ts
@@ -1,8 +1,8 @@
 import type { Effect } from "effect"
 
-import type * as Transaction from "../../core/Transaction.js"
-import type * as TransactionHash from "../../core/TransactionHash.js"
-import type * as TransactionWitnessSet from "../../core/TransactionWitnessSet.js"
+import type * as Transaction from "../../Transaction.js"
+import type * as TransactionHash from "../../TransactionHash.js"
+import type * as TransactionWitnessSet from "../../TransactionWitnessSet.js"
 import type { EffectToPromiseAPI } from "../Type.js"
 import type { SubmitBuilder } from "./SubmitBuilder.js"
 import type { ChainResult, TransactionBuilderError } from "./TransactionBuilder.js"
diff --git a/packages/evolution/src/sdk/builders/SignBuilderImpl.ts b/packages/evolution/src/sdk/builders/SignBuilderImpl.ts
index 730e3ef3..73d0214d 100644
--- a/packages/evolution/src/sdk/builders/SignBuilderImpl.ts
+++ b/packages/evolution/src/sdk/builders/SignBuilderImpl.ts
@@ -16,13 +16,13 @@
 
 import { Effect } from "effect"
 
-import * as Script from "../../core/Script.js"
-import * as Transaction from "../../core/Transaction.js"
-import * as TransactionHash from "../../core/TransactionHash.js"
-import * as TransactionWitnessSet from "../../core/TransactionWitnessSet.js"
-import type * as TxOut from "../../core/TxOut.js"
-import * as CoreUTxO from "../../core/UTxO.js"
+import * as Script from "../../Script.js"
+import * as Transaction from "../../Transaction.js"
+import * as TransactionHash from "../../TransactionHash.js"
+import * as TransactionWitnessSet from "../../TransactionWitnessSet.js"
+import type * as TxOut from "../../TxOut.js"
 import { hashTransaction } from "../../utils/Hash.js"
+import * as CoreUTxO from "../../UTxO.js"
 import type * as Provider from "../provider/Provider.js"
 import type * as WalletNew from "../wallet/WalletNew.js"
 import type { SignBuilder, SignBuilderEffect } from "./SignBuilder.js"
diff --git a/packages/evolution/src/sdk/builders/SubmitBuilder.ts b/packages/evolution/src/sdk/builders/SubmitBuilder.ts
index a5bcdd83..38bb7da9 100644
--- a/packages/evolution/src/sdk/builders/SubmitBuilder.ts
+++ b/packages/evolution/src/sdk/builders/SubmitBuilder.ts
@@ -10,8 +10,8 @@
 
 import type { Effect } from "effect"
 
-import type * as TransactionHash from "../../core/TransactionHash.js"
-import type * as TransactionWitnessSet from "../../core/TransactionWitnessSet.js"
+import type * as TransactionHash from "../../TransactionHash.js"
+import type * as TransactionWitnessSet from "../../TransactionWitnessSet.js"
 import type { EffectToPromiseAPI } from "../Type.js"
 import type { TransactionBuilderError } from "./TransactionBuilder.js"
 
diff --git a/packages/evolution/src/sdk/builders/SubmitBuilderImpl.ts b/packages/evolution/src/sdk/builders/SubmitBuilderImpl.ts
index a77cd490..ddf4f033 100644
--- a/packages/evolution/src/sdk/builders/SubmitBuilderImpl.ts
+++ b/packages/evolution/src/sdk/builders/SubmitBuilderImpl.ts
@@ -13,8 +13,8 @@
 
 import { Effect } from "effect"
 
-import type * as Transaction from "../../core/Transaction.js"
-import type * as TransactionWitnessSet from "../../core/TransactionWitnessSet.js"
+import type * as Transaction from "../../Transaction.js"
+import type * as TransactionWitnessSet from "../../TransactionWitnessSet.js"
 import type * as Provider from "../provider/Provider.js"
 import type { SubmitBuilder, SubmitBuilderEffect } from "./SubmitBuilder.js"
 import { TransactionBuilderError } from "./TransactionBuilder.js"
diff --git a/packages/evolution/src/sdk/builders/TransactionBuilder.ts b/packages/evolution/src/sdk/builders/TransactionBuilder.ts
index a27d986b..6bb1a170 100644
--- a/packages/evolution/src/sdk/builders/TransactionBuilder.ts
+++ b/packages/evolution/src/sdk/builders/TransactionBuilder.ts
@@ -28,24 +28,24 @@
 import { Context, Data, Effect, Layer, Logger, LogLevel, Ref } from "effect"
 import type { Either } from "effect/Either"
 
-import type * as CoreAddress from "../../core/Address.js"
-import * as CoreAssets from "../../core/Assets/index.js"
-import type * as AuxiliaryData from "../../core/AuxiliaryData.js"
-import type * as Certificate from "../../core/Certificate.js"
-import type * as Coin from "../../core/Coin.js"
-import type * as PlutusData from "../../core/Data.js"
-import type * as KeyHash from "../../core/KeyHash.js"
-import type * as Mint from "../../core/Mint.js"
-import type * as Network from "../../core/Network.js"
-import type * as ProposalProcedures from "../../core/ProposalProcedures.js"
-import type * as RewardAccount from "../../core/RewardAccount.js"
-import type * as CoreScript from "../../core/Script.js"
-import * as Time from "../../core/Time/index.js"
-import * as Transaction from "../../core/Transaction.js"
-import type * as TxOut from "../../core/TxOut.js"
-import type * as CoreUTxO from "../../core/UTxO.js"
-import type * as VotingProcedures from "../../core/VotingProcedures.js"
+import type * as CoreAddress from "../../Address.js"
+import * as CoreAssets from "../../Assets/index.js"
+import type * as AuxiliaryData from "../../AuxiliaryData.js"
+import type * as Certificate from "../../Certificate.js"
+import type * as Coin from "../../Coin.js"
+import type * as PlutusData from "../../Data.js"
+import type * as KeyHash from "../../KeyHash.js"
+import type * as Mint from "../../Mint.js"
+import type * as Network from "../../Network.js"
+import type * as ProposalProcedures from "../../ProposalProcedures.js"
+import type * as RewardAccount from "../../RewardAccount.js"
+import type * as CoreScript from "../../Script.js"
+import * as Time from "../../Time/index.js"
+import * as Transaction from "../../Transaction.js"
+import type * as TxOut from "../../TxOut.js"
 import { runEffectPromise } from "../../utils/effect-runtime.js"
+import type * as CoreUTxO from "../../UTxO.js"
+import type * as VotingProcedures from "../../VotingProcedures.js"
 import type { EvalRedeemer } from "../EvalRedeemer.js"
 import type * as Provider from "../provider/Provider.js"
 import type * as WalletNew from "../wallet/WalletNew.js"
@@ -1611,8 +1611,8 @@ export interface TransactionBuilderBase {
    *
    * @example
    * ```typescript
-   * import * as Script from "../../core/Script.js"
-   * import * as NativeScripts from "../../core/NativeScripts.js"
+   * import * as Script from "../../Script.js"
+   * import * as NativeScripts from "../../NativeScripts.js"
    *
    * const nativeScript = NativeScripts.makeScriptPubKey(keyHashBytes)
    * const script = Script.fromNativeScript(nativeScript)
@@ -1689,7 +1689,7 @@ export interface TransactionBuilderBase {
    *
    * @example
    * ```typescript
-   * import * as UTxO from "../../core/UTxO.js"
+   * import * as UTxO from "../../UTxO.js"
    *
    * // Use reference script stored on-chain instead of attaching to transaction
    * const refScriptUtxo = await provider.getUtxoByTxHash("abc123...")
@@ -1962,7 +1962,7 @@ export interface TransactionBuilderBase {
    *
    * @example
    * ```typescript
-   * import * as Time from "@evolution-sdk/core/Time"
+   * import * as Time from "@evolution-sdk/Time"
    *
    * // Transaction valid for 10 minutes from now
    * const tx = await builder
@@ -2001,9 +2001,9 @@ export interface TransactionBuilderBase {
    *
    * @example
    * ```typescript
-   * import * as VotingProcedures from "@evolution-sdk/core/VotingProcedures"
-   * import * as Vote from "@evolution-sdk/core/Vote"
-   * import * as Data from "@evolution-sdk/core/Data"
+   * import * as VotingProcedures from "@evolution-sdk/VotingProcedures"
+   * import * as Vote from "@evolution-sdk/Vote"
+   * import * as Data from "@evolution-sdk/Data"
    *
    * // Simple single vote with helper
    * await client.newTx()
@@ -2059,8 +2059,8 @@ export interface TransactionBuilderBase {
    *
    * @example
    * ```typescript
-   * import * as GovernanceAction from "@evolution-sdk/core/GovernanceAction"
-   * import * as RewardAccount from "@evolution-sdk/core/RewardAccount"
+   * import * as GovernanceAction from "@evolution-sdk/GovernanceAction"
+   * import * as RewardAccount from "@evolution-sdk/RewardAccount"
    *
    * // Submit single proposal (deposit auto-fetched)
    * await client.newTx()
@@ -2112,8 +2112,8 @@ export interface TransactionBuilderBase {
    *
    * @example
    * ```typescript
-   * import * as KeyHash from "@evolution-sdk/core/KeyHash"
-   * import * as Address from "@evolution-sdk/core/Address"
+   * import * as KeyHash from "@evolution-sdk/KeyHash"
+   * import * as Address from "@evolution-sdk/Address"
    *
    * // Add signer from address credential
    * const address = Address.fromBech32("addr_test1...")
@@ -2148,7 +2148,7 @@ export interface TransactionBuilderBase {
    *
    * @example
    * ```typescript
-   * import { fromEntries } from "@evolution-sdk/evolution/core/TransactionMetadatum"
+   * import { fromEntries } from "@evolution-sdk/evolution/TransactionMetadatum"
    *
    * // Attach a simple message (CIP-20)
    * const tx = await builder
diff --git a/packages/evolution/src/sdk/builders/TransactionResult.ts b/packages/evolution/src/sdk/builders/TransactionResult.ts
index c93721f0..e1504819 100644
--- a/packages/evolution/src/sdk/builders/TransactionResult.ts
+++ b/packages/evolution/src/sdk/builders/TransactionResult.ts
@@ -11,7 +11,7 @@
 
 import { Effect } from "effect"
 
-import type * as Transaction from "../../core/Transaction.js"
+import type * as Transaction from "../../Transaction.js"
 import type { TransactionBuilderError } from "./TransactionBuilder.js"
 
 /**
diff --git a/packages/evolution/src/sdk/builders/TxBuilderImpl.ts b/packages/evolution/src/sdk/builders/TxBuilderImpl.ts
index fd04736d..8e0e5936 100644
--- a/packages/evolution/src/sdk/builders/TxBuilderImpl.ts
+++ b/packages/evolution/src/sdk/builders/TxBuilderImpl.ts
@@ -3,36 +3,36 @@ import { Effect, Ref } from "effect"
 import type * as Array from "effect/Array"
 
 // Core imports
-import * as CoreAddress from "../../core/Address.js"
-import * as CoreAssets from "../../core/Assets/index.js"
-import * as Bytes from "../../core/Bytes.js"
-import type * as Certificate from "../../core/Certificate.js"
-import * as CostModel from "../../core/CostModel.js"
-import type * as PlutusData from "../../core/Data.js"
-import type * as DatumOption from "../../core/DatumOption.js"
-import * as Ed25519Signature from "../../core/Ed25519Signature.js"
-import type * as KeyHash from "../../core/KeyHash.js"
-import * as NativeScripts from "../../core/NativeScripts.js"
-import type * as PlutusV1 from "../../core/PlutusV1.js"
-import type * as PlutusV2 from "../../core/PlutusV2.js"
-import type * as PlutusV3 from "../../core/PlutusV3.js"
-import * as PolicyId from "../../core/PolicyId.js"
-import * as Redeemer from "../../core/Redeemer.js"
-import type * as RewardAccount from "../../core/RewardAccount.js"
-import * as CoreScript from "../../core/Script.js"
-import * as ScriptDataHash from "../../core/ScriptDataHash.js"
-import * as ScriptRef from "../../core/ScriptRef.js"
-import * as Time from "../../core/Time/index.js"
-import * as Transaction from "../../core/Transaction.js"
-import * as TransactionBody from "../../core/TransactionBody.js"
-import * as TransactionHash from "../../core/TransactionHash.js"
-import * as TransactionInput from "../../core/TransactionInput.js"
-import * as TransactionWitnessSet from "../../core/TransactionWitnessSet.js"
-import * as TxOut from "../../core/TxOut.js"
-import * as CoreUTxO from "../../core/UTxO.js"
-import * as VKey from "../../core/VKey.js"
-import * as Withdrawals from "../../core/Withdrawals.js"
+import * as CoreAddress from "../../Address.js"
+import * as CoreAssets from "../../Assets/index.js"
+import * as Bytes from "../../Bytes.js"
+import type * as Certificate from "../../Certificate.js"
+import * as CostModel from "../../CostModel.js"
+import type * as PlutusData from "../../Data.js"
+import type * as DatumOption from "../../DatumOption.js"
+import * as Ed25519Signature from "../../Ed25519Signature.js"
+import type * as KeyHash from "../../KeyHash.js"
+import * as NativeScripts from "../../NativeScripts.js"
+import type * as PlutusV1 from "../../PlutusV1.js"
+import type * as PlutusV2 from "../../PlutusV2.js"
+import type * as PlutusV3 from "../../PlutusV3.js"
+import * as PolicyId from "../../PolicyId.js"
+import * as Redeemer from "../../Redeemer.js"
+import type * as RewardAccount from "../../RewardAccount.js"
+import * as CoreScript from "../../Script.js"
+import * as ScriptDataHash from "../../ScriptDataHash.js"
+import * as ScriptRef from "../../ScriptRef.js"
+import * as Time from "../../Time/index.js"
+import * as Transaction from "../../Transaction.js"
+import * as TransactionBody from "../../TransactionBody.js"
+import * as TransactionHash from "../../TransactionHash.js"
+import * as TransactionInput from "../../TransactionInput.js"
+import * as TransactionWitnessSet from "../../TransactionWitnessSet.js"
+import * as TxOut from "../../TxOut.js"
 import { hashAuxiliaryData, hashScriptData } from "../../utils/Hash.js"
+import * as CoreUTxO from "../../UTxO.js"
+import * as VKey from "../../VKey.js"
+import * as Withdrawals from "../../Withdrawals.js"
 // Internal imports
 import { voterToKey } from "./phases/utils.js"
 import type { UnfrackOptions } from "./TransactionBuilder.js"
diff --git a/packages/evolution/src/sdk/builders/Unfrack.ts b/packages/evolution/src/sdk/builders/Unfrack.ts
index f553f89e..d39ad3b0 100644
--- a/packages/evolution/src/sdk/builders/Unfrack.ts
+++ b/packages/evolution/src/sdk/builders/Unfrack.ts
@@ -12,9 +12,9 @@
 
 import * as Effect from "effect/Effect"
 
-import type * as CoreAddress from "../../core/Address.js"
-import * as CoreAssets from "../../core/Assets/index.js"
-import type * as TxOut from "../../core/TxOut.js"
+import type * as CoreAddress from "../../Address.js"
+import * as CoreAssets from "../../Assets/index.js"
+import type * as TxOut from "../../TxOut.js"
 import type { UnfrackOptions } from "./TransactionBuilder.js"
 import { calculateMinimumUtxoLovelace, txOutputToTransactionOutput } from "./TxBuilderImpl.js"
 
diff --git a/packages/evolution/src/sdk/builders/operations/Attach.ts b/packages/evolution/src/sdk/builders/operations/Attach.ts
index 7bde6cad..27deae19 100644
--- a/packages/evolution/src/sdk/builders/operations/Attach.ts
+++ b/packages/evolution/src/sdk/builders/operations/Attach.ts
@@ -1,7 +1,7 @@
 import { Effect, Ref } from "effect"
 
-import type * as ScriptCore from "../../../core/Script.js"
-import * as ScriptHashCore from "../../../core/ScriptHash.js"
+import type * as ScriptCore from "../../../Script.js"
+import * as ScriptHashCore from "../../../ScriptHash.js"
 import { TxContext } from "../TransactionBuilder.js"
 
 /**
diff --git a/packages/evolution/src/sdk/builders/operations/AttachMetadata.ts b/packages/evolution/src/sdk/builders/operations/AttachMetadata.ts
index e48d6ffa..e26c161b 100644
--- a/packages/evolution/src/sdk/builders/operations/AttachMetadata.ts
+++ b/packages/evolution/src/sdk/builders/operations/AttachMetadata.ts
@@ -12,8 +12,8 @@
 
 import { Effect, Ref } from "effect"
 
-import * as AuxiliaryData from "../../../core/AuxiliaryData.js"
-import type * as TransactionMetadatum from "../../../core/TransactionMetadatum.js"
+import * as AuxiliaryData from "../../../AuxiliaryData.js"
+import type * as TransactionMetadatum from "../../../TransactionMetadatum.js"
 import { TransactionBuilderError, TxContext } from "../TransactionBuilder.js"
 import type { AttachMetadataParams } from "./Operations.js"
 
diff --git a/packages/evolution/src/sdk/builders/operations/Collect.ts b/packages/evolution/src/sdk/builders/operations/Collect.ts
index ac1b20a7..21bfbafd 100644
--- a/packages/evolution/src/sdk/builders/operations/Collect.ts
+++ b/packages/evolution/src/sdk/builders/operations/Collect.ts
@@ -7,9 +7,9 @@
 
 import { Effect, Ref } from "effect"
 
-import * as CoreAssets from "../../../core/Assets/index.js"
-import * as ScriptHash from "../../../core/ScriptHash.js"
-import * as UTxO from "../../../core/UTxO.js"
+import * as CoreAssets from "../../../Assets/index.js"
+import * as ScriptHash from "../../../ScriptHash.js"
+import * as UTxO from "../../../UTxO.js"
 import * as RedeemerBuilder from "../RedeemerBuilder.js"
 import { TransactionBuilderError, TxContext } from "../TransactionBuilder.js"
 import { calculateTotalAssets, filterScriptUtxos } from "../TxBuilderImpl.js"
diff --git a/packages/evolution/src/sdk/builders/operations/Governance.ts b/packages/evolution/src/sdk/builders/operations/Governance.ts
index 0c296591..da4479de 100644
--- a/packages/evolution/src/sdk/builders/operations/Governance.ts
+++ b/packages/evolution/src/sdk/builders/operations/Governance.ts
@@ -7,8 +7,8 @@
 
 import { Effect, Ref } from "effect"
 
-import * as Bytes from "../../../core/Bytes.js"
-import * as Certificate from "../../../core/Certificate.js"
+import * as Bytes from "../../../Bytes.js"
+import * as Certificate from "../../../Certificate.js"
 import * as RedeemerBuilder from "../RedeemerBuilder.js"
 import { TransactionBuilderError, TxBuilderConfigTag, TxContext } from "../TransactionBuilder.js"
 import type {
diff --git a/packages/evolution/src/sdk/builders/operations/Mint.ts b/packages/evolution/src/sdk/builders/operations/Mint.ts
index d2b005fe..901c0f03 100644
--- a/packages/evolution/src/sdk/builders/operations/Mint.ts
+++ b/packages/evolution/src/sdk/builders/operations/Mint.ts
@@ -7,11 +7,11 @@
 
 import { Effect, Ref } from "effect"
 
-import * as AssetName from "../../../core/AssetName.js"
-import * as Assets from "../../../core/Assets/index.js"
-import * as Mint from "../../../core/Mint.js"
-import * as NonZeroInt64 from "../../../core/NonZeroInt64.js"
-import * as PolicyId from "../../../core/PolicyId.js"
+import * as AssetName from "../../../AssetName.js"
+import * as Assets from "../../../Assets/index.js"
+import * as Mint from "../../../Mint.js"
+import * as NonZeroInt64 from "../../../NonZeroInt64.js"
+import * as PolicyId from "../../../PolicyId.js"
 import * as RedeemerBuilder from "../RedeemerBuilder.js"
 import { TransactionBuilderError, TxContext } from "../TransactionBuilder.js"
 import type { MintTokensParams } from "./Operations.js"
diff --git a/packages/evolution/src/sdk/builders/operations/Operations.ts b/packages/evolution/src/sdk/builders/operations/Operations.ts
index 66fad3f4..1fb51271 100644
--- a/packages/evolution/src/sdk/builders/operations/Operations.ts
+++ b/packages/evolution/src/sdk/builders/operations/Operations.ts
@@ -1,21 +1,21 @@
-import type * as CoreAddress from "../../../core/Address.js"
-import type * as Anchor from "../../../core/Anchor.js"
-import type * as CoreAssets from "../../../core/Assets/index.js"
-import type * as Credential from "../../../core/Credential.js"
-import type * as CoreDatumOption from "../../../core/DatumOption.js"
-import type * as DRep from "../../../core/DRep.js"
-import type * as EpochNo from "../../../core/EpochNo.js"
-import type * as GovernanceAction from "../../../core/GovernanceAction.js"
-import type * as KeyHash from "../../../core/KeyHash.js"
-import type * as Metadata from "../../../core/Metadata.js"
-import type * as PoolKeyHash from "../../../core/PoolKeyHash.js"
-import type * as PoolParams from "../../../core/PoolParams.js"
-import type * as RewardAccount from "../../../core/RewardAccount.js"
-import type * as CoreScript from "../../../core/Script.js"
-import type * as Time from "../../../core/Time/index.js"
-import type * as TransactionMetadatum from "../../../core/TransactionMetadatum.js"
-import type * as UTxO from "../../../core/UTxO.js"
-import type * as VotingProcedures from "../../../core/VotingProcedures.js"
+import type * as CoreAddress from "../../../Address.js"
+import type * as Anchor from "../../../Anchor.js"
+import type * as CoreAssets from "../../../Assets/index.js"
+import type * as Credential from "../../../Credential.js"
+import type * as CoreDatumOption from "../../../DatumOption.js"
+import type * as DRep from "../../../DRep.js"
+import type * as EpochNo from "../../../EpochNo.js"
+import type * as GovernanceAction from "../../../GovernanceAction.js"
+import type * as KeyHash from "../../../KeyHash.js"
+import type * as Metadata from "../../../Metadata.js"
+import type * as PoolKeyHash from "../../../PoolKeyHash.js"
+import type * as PoolParams from "../../../PoolParams.js"
+import type * as RewardAccount from "../../../RewardAccount.js"
+import type * as CoreScript from "../../../Script.js"
+import type * as Time from "../../../Time/index.js"
+import type * as TransactionMetadatum from "../../../TransactionMetadatum.js"
+import type * as UTxO from "../../../UTxO.js"
+import type * as VotingProcedures from "../../../VotingProcedures.js"
 import type * as RedeemerBuilder from "../RedeemerBuilder.js"
 
 // ============================================================================
diff --git a/packages/evolution/src/sdk/builders/operations/Pay.ts b/packages/evolution/src/sdk/builders/operations/Pay.ts
index d885add2..35bd8eac 100644
--- a/packages/evolution/src/sdk/builders/operations/Pay.ts
+++ b/packages/evolution/src/sdk/builders/operations/Pay.ts
@@ -7,7 +7,7 @@
 
 import { Effect, Ref } from "effect"
 
-import * as CoreAssets from "../../../core/Assets/index.js"
+import * as CoreAssets from "../../../Assets/index.js"
 import { TxContext } from "../TransactionBuilder.js"
 import { makeTxOutput } from "../TxBuilderImpl.js"
 import type { PayToAddressParams } from "./Operations.js"
diff --git a/packages/evolution/src/sdk/builders/operations/Pool.ts b/packages/evolution/src/sdk/builders/operations/Pool.ts
index 8a38569f..20aa87f8 100644
--- a/packages/evolution/src/sdk/builders/operations/Pool.ts
+++ b/packages/evolution/src/sdk/builders/operations/Pool.ts
@@ -7,8 +7,8 @@
 
 import { Effect, Ref } from "effect"
 
-import * as Certificate from "../../../core/Certificate.js"
-import * as PoolKeyHash from "../../../core/PoolKeyHash.js"
+import * as Certificate from "../../../Certificate.js"
+import * as PoolKeyHash from "../../../PoolKeyHash.js"
 import { TransactionBuilderError,TxBuilderConfigTag, TxContext } from "../TransactionBuilder.js"
 import type { RegisterPoolParams, RetirePoolParams } from "./Operations.js"
 
diff --git a/packages/evolution/src/sdk/builders/operations/Propose.ts b/packages/evolution/src/sdk/builders/operations/Propose.ts
index 3226131d..965b6832 100644
--- a/packages/evolution/src/sdk/builders/operations/Propose.ts
+++ b/packages/evolution/src/sdk/builders/operations/Propose.ts
@@ -7,8 +7,8 @@
 
 import { Effect, Ref } from "effect"
 
-import * as ProposalProcedure from "../../../core/ProposalProcedure.js"
-import * as ProposalProcedures from "../../../core/ProposalProcedures.js"
+import * as ProposalProcedure from "../../../ProposalProcedure.js"
+import * as ProposalProcedures from "../../../ProposalProcedures.js"
 import { TransactionBuilderError, TxBuilderConfigTag, TxContext } from "../TransactionBuilder.js"
 import type { ProposeParams } from "./Operations.js"
 
diff --git a/packages/evolution/src/sdk/builders/operations/ReadFrom.ts b/packages/evolution/src/sdk/builders/operations/ReadFrom.ts
index 63faef91..57ae3864 100644
--- a/packages/evolution/src/sdk/builders/operations/ReadFrom.ts
+++ b/packages/evolution/src/sdk/builders/operations/ReadFrom.ts
@@ -13,7 +13,7 @@
 
 import { Effect, Ref } from "effect"
 
-import * as CoreUTxO from "../../../core/UTxO.js"
+import * as CoreUTxO from "../../../UTxO.js"
 import { TransactionBuilderError, TxContext } from "../TransactionBuilder.js"
 import type { ReadFromParams } from "./Operations.js"
 
diff --git a/packages/evolution/src/sdk/builders/operations/Stake.ts b/packages/evolution/src/sdk/builders/operations/Stake.ts
index b7a9eb09..4c9f338e 100644
--- a/packages/evolution/src/sdk/builders/operations/Stake.ts
+++ b/packages/evolution/src/sdk/builders/operations/Stake.ts
@@ -7,9 +7,9 @@
 
 import { Effect, Ref } from "effect"
 
-import * as Bytes from "../../../core/Bytes.js"
-import * as Certificate from "../../../core/Certificate.js"
-import * as RewardAccount from "../../../core/RewardAccount.js"
+import * as Bytes from "../../../Bytes.js"
+import * as Certificate from "../../../Certificate.js"
+import * as RewardAccount from "../../../RewardAccount.js"
 import * as RedeemerBuilder from "../RedeemerBuilder.js"
 import { TransactionBuilderError, type TxBuilderConfig, TxBuilderConfigTag, TxContext } from "../TransactionBuilder.js"
 import type { DelegateToDRepParams, DelegateToParams, DelegateToPoolAndDRepParams, DelegateToPoolParams, DeregisterStakeParams, RegisterAndDelegateToParams, RegisterStakeParams, WithdrawParams } from "./Operations.js"
diff --git a/packages/evolution/src/sdk/builders/operations/Vote.ts b/packages/evolution/src/sdk/builders/operations/Vote.ts
index a7f77b4a..60b58216 100644
--- a/packages/evolution/src/sdk/builders/operations/Vote.ts
+++ b/packages/evolution/src/sdk/builders/operations/Vote.ts
@@ -7,8 +7,8 @@
 
 import { Effect, Ref } from "effect"
 
-import type * as GovernanceAction from "../../../core/GovernanceAction.js"
-import * as VotingProcedures from "../../../core/VotingProcedures.js"
+import type * as GovernanceAction from "../../../GovernanceAction.js"
+import * as VotingProcedures from "../../../VotingProcedures.js"
 import { voterToKey } from "../phases/utils.js"
 import * as RedeemerBuilder from "../RedeemerBuilder.js"
 import { TransactionBuilderError, TxContext } from "../TransactionBuilder.js"
diff --git a/packages/evolution/src/sdk/builders/phases/Balance.ts b/packages/evolution/src/sdk/builders/phases/Balance.ts
index b57c1ab5..658fd076 100644
--- a/packages/evolution/src/sdk/builders/phases/Balance.ts
+++ b/packages/evolution/src/sdk/builders/phases/Balance.ts
@@ -10,7 +10,7 @@
 
 import { Effect, Ref } from "effect"
 
-import * as CoreAssets from "../../../core/Assets/index.js"
+import * as CoreAssets from "../../../Assets/index.js"
 import * as EvaluationStateManager from "../EvaluationStateManager.js"
 import { mintToAssets } from "../operations/Mint.js"
 import {
diff --git a/packages/evolution/src/sdk/builders/phases/ChangeCreation.ts b/packages/evolution/src/sdk/builders/phases/ChangeCreation.ts
index cb09eda1..f9607075 100644
--- a/packages/evolution/src/sdk/builders/phases/ChangeCreation.ts
+++ b/packages/evolution/src/sdk/builders/phases/ChangeCreation.ts
@@ -10,10 +10,10 @@
 
 import { Effect, Ref } from "effect"
 
-import type * as CoreAddress from "../../../core/Address.js"
-import * as CoreAssets from "../../../core/Assets/index.js"
-import type * as TxOut from "../../../core/TxOut.js"
-import * as CoreUTxO from "../../../core/UTxO.js"
+import type * as CoreAddress from "../../../Address.js"
+import * as CoreAssets from "../../../Assets/index.js"
+import type * as TxOut from "../../../TxOut.js"
+import * as CoreUTxO from "../../../UTxO.js"
 import { mintToAssets } from "../operations/Mint.js"
 import {
   AvailableUtxosTag,
diff --git a/packages/evolution/src/sdk/builders/phases/Collateral.ts b/packages/evolution/src/sdk/builders/phases/Collateral.ts
index d92bc433..fc832098 100644
--- a/packages/evolution/src/sdk/builders/phases/Collateral.ts
+++ b/packages/evolution/src/sdk/builders/phases/Collateral.ts
@@ -11,9 +11,9 @@
 
 import { Effect, Ref } from "effect"
 
-import * as CoreAssets from "../../../core/Assets/index.js"
-import * as TxOut from "../../../core/TxOut.js"
-import * as UTxO from "../../../core/UTxO.js"
+import * as CoreAssets from "../../../Assets/index.js"
+import * as TxOut from "../../../TxOut.js"
+import * as UTxO from "../../../UTxO.js"
 import {
   AvailableUtxosTag,
   BuildOptionsTag,
diff --git a/packages/evolution/src/sdk/builders/phases/Evaluation.ts b/packages/evolution/src/sdk/builders/phases/Evaluation.ts
index 501ae850..035216cd 100644
--- a/packages/evolution/src/sdk/builders/phases/Evaluation.ts
+++ b/packages/evolution/src/sdk/builders/phases/Evaluation.ts
@@ -10,11 +10,11 @@
 
 import { Effect, Ref } from "effect"
 
-import * as Bytes from "../../../core/Bytes.js"
-import * as CostModel from "../../../core/CostModel.js"
-import { INT64_MAX } from "../../../core/Numeric.js"
-import * as PolicyId from "../../../core/PolicyId.js"
-import * as CoreUTxO from "../../../core/UTxO.js"
+import * as Bytes from "../../../Bytes.js"
+import * as CostModel from "../../../CostModel.js"
+import { INT64_MAX } from "../../../Numeric.js"
+import * as PolicyId from "../../../PolicyId.js"
+import * as CoreUTxO from "../../../UTxO.js"
 import type * as Provider from "../../provider/Provider.js"
 import * as EvaluationStateManager from "../EvaluationStateManager.js"
 import type { IndexedInput } from "../RedeemerBuilder.js"
diff --git a/packages/evolution/src/sdk/builders/phases/FeeCalculation.ts b/packages/evolution/src/sdk/builders/phases/FeeCalculation.ts
index cd0b18b2..798cef03 100644
--- a/packages/evolution/src/sdk/builders/phases/FeeCalculation.ts
+++ b/packages/evolution/src/sdk/builders/phases/FeeCalculation.ts
@@ -10,7 +10,7 @@
 
 import { Effect, Ref } from "effect"
 
-import * as CoreAssets from "../../../core/Assets/index.js"
+import * as CoreAssets from "../../../Assets/index.js"
 import type { BuildOptionsTag,TransactionBuilderError } from "../TransactionBuilder.js"
 import { PhaseContextTag, ProtocolParametersTag, TxContext } from "../TransactionBuilder.js"
 import { buildTransactionInputs, calculateFeeIteratively, calculateReferenceScriptFee } from "../TxBuilderImpl.js"
diff --git a/packages/evolution/src/sdk/builders/phases/Selection.ts b/packages/evolution/src/sdk/builders/phases/Selection.ts
index a2d17e67..32868ae5 100644
--- a/packages/evolution/src/sdk/builders/phases/Selection.ts
+++ b/packages/evolution/src/sdk/builders/phases/Selection.ts
@@ -10,8 +10,8 @@
 
 import { Effect, Ref } from "effect"
 
-import * as CoreAssets from "../../../core/Assets/index.js"
-import * as CoreUTxO from "../../../core/UTxO.js"
+import * as CoreAssets from "../../../Assets/index.js"
+import * as CoreUTxO from "../../../UTxO.js"
 import type { CoinSelectionAlgorithm, CoinSelectionFunction } from "../CoinSelection.js"
 import { largestFirstSelection } from "../CoinSelection.js"
 import * as EvaluationStateManager from "../EvaluationStateManager.js"
diff --git a/packages/evolution/src/sdk/builders/phases/utils.ts b/packages/evolution/src/sdk/builders/phases/utils.ts
index 76206f65..7f44b661 100644
--- a/packages/evolution/src/sdk/builders/phases/utils.ts
+++ b/packages/evolution/src/sdk/builders/phases/utils.ts
@@ -5,9 +5,9 @@
  * @since 2.0.0
  */
 
-import * as Bytes from "../../../core/Bytes.js"
-import type * as Certificate from "../../../core/Certificate.js"
-import * as PoolKeyHash from "../../../core/PoolKeyHash.js"
+import * as Bytes from "../../../Bytes.js"
+import type * as Certificate from "../../../Certificate.js"
+import * as PoolKeyHash from "../../../PoolKeyHash.js"
 
 /**
  * Calculate certificate deposits and refunds from a list of certificates.
diff --git a/packages/evolution/src/sdk/client/Client.ts b/packages/evolution/src/sdk/client/Client.ts
index 1e45a19c..1f060922 100644
--- a/packages/evolution/src/sdk/client/Client.ts
+++ b/packages/evolution/src/sdk/client/Client.ts
@@ -1,6 +1,6 @@
 import { Data, type Effect, type Schedule } from "effect"
 
-import type * as CoreUTxO from "../../core/UTxO.js"
+import type * as CoreUTxO from "../../UTxO.js"
 import type { ReadOnlyTransactionBuilder, SigningTransactionBuilder } from "../builders/TransactionBuilder.js"
 import type * as Provider from "../provider/Provider.js"
 import type { EffectToPromiseAPI } from "../Type.js"
diff --git a/packages/evolution/src/sdk/client/ClientImpl.ts b/packages/evolution/src/sdk/client/ClientImpl.ts
index 30364a00..edbf0841 100644
--- a/packages/evolution/src/sdk/client/ClientImpl.ts
+++ b/packages/evolution/src/sdk/client/ClientImpl.ts
@@ -1,20 +1,20 @@
 import { Effect, Equal, ParseResult, Schema } from "effect"
 
-import * as CoreAddress from "../../core/Address.js"
-import * as Bytes from "../../core/Bytes.js"
-import * as KeyHash from "../../core/KeyHash.js"
-import type * as NativeScripts from "../../core/NativeScripts.js"
-import * as PrivateKey from "../../core/PrivateKey.js"
-import * as CoreRewardAccount from "../../core/RewardAccount.js"
-import * as CoreRewardAddress from "../../core/RewardAddress.js"
-import type * as Time from "../../core/Time/index.js"
-import * as Transaction from "../../core/Transaction.js"
-import * as TransactionHash from "../../core/TransactionHash.js"
-import * as TransactionWitnessSet from "../../core/TransactionWitnessSet.js"
-import * as CoreUTxO from "../../core/UTxO.js"
-import * as VKey from "../../core/VKey.js"
+import * as CoreAddress from "../../Address.js"
+import * as Bytes from "../../Bytes.js"
+import * as KeyHash from "../../KeyHash.js"
+import type * as NativeScripts from "../../NativeScripts.js"
+import * as PrivateKey from "../../PrivateKey.js"
+import * as CoreRewardAccount from "../../RewardAccount.js"
+import * as CoreRewardAddress from "../../RewardAddress.js"
+import type * as Time from "../../Time/index.js"
+import * as Transaction from "../../Transaction.js"
+import * as TransactionHash from "../../TransactionHash.js"
+import * as TransactionWitnessSet from "../../TransactionWitnessSet.js"
 import { runEffectPromise } from "../../utils/effect-runtime.js"
 import { hashTransaction } from "../../utils/Hash.js"
+import * as CoreUTxO from "../../UTxO.js"
+import * as VKey from "../../VKey.js"
 import {
   makeTxBuilder,
   type ReadOnlyTransactionBuilder,
diff --git a/packages/evolution/src/sdk/provider/Provider.ts b/packages/evolution/src/sdk/provider/Provider.ts
index 9250636f..87b90ee6 100644
--- a/packages/evolution/src/sdk/provider/Provider.ts
+++ b/packages/evolution/src/sdk/provider/Provider.ts
@@ -1,16 +1,16 @@
 import type { Effect } from "effect"
 import { Context, Data } from "effect"
 
-import type * as CoreAddress from "../../core/Address.js"
-import type * as Credential from "../../core/Credential.js"
-import type * as PlutusData from "../../core/Data.js"
-import type * as DatumOption from "../../core/DatumOption.js"
-import type * as PoolKeyHash from "../../core/PoolKeyHash.js"
-import type * as RewardAddress from "../../core/RewardAddress.js"
-import type * as Transaction from "../../core/Transaction.js"
-import type * as TransactionHash from "../../core/TransactionHash.js"
-import type * as TransactionInput from "../../core/TransactionInput.js"
-import type * as CoreUTxO from "../../core/UTxO.js"
+import type * as CoreAddress from "../../Address.js"
+import type * as Credential from "../../Credential.js"
+import type * as PlutusData from "../../Data.js"
+import type * as DatumOption from "../../DatumOption.js"
+import type * as PoolKeyHash from "../../PoolKeyHash.js"
+import type * as RewardAddress from "../../RewardAddress.js"
+import type * as Transaction from "../../Transaction.js"
+import type * as TransactionHash from "../../TransactionHash.js"
+import type * as TransactionInput from "../../TransactionInput.js"
+import type * as CoreUTxO from "../../UTxO.js"
 import type { EvalRedeemer } from "../EvalRedeemer.js"
 import type { EffectToPromiseAPI } from "../Type.js"
 
diff --git a/packages/evolution/src/sdk/provider/internal/Blockfrost.ts b/packages/evolution/src/sdk/provider/internal/Blockfrost.ts
index c048ec7a..c3855844 100644
--- a/packages/evolution/src/sdk/provider/internal/Blockfrost.ts
+++ b/packages/evolution/src/sdk/provider/internal/Blockfrost.ts
@@ -5,12 +5,12 @@
 
 import { Schema } from "effect"
 
-import * as CoreAddress from "../../../core/Address.js"
-import * as CoreAssets from "../../../core/Assets/index.js"
-import * as PoolKeyHash from "../../../core/PoolKeyHash.js"
-import * as Redeemer from "../../../core/Redeemer.js"
-import * as TransactionHash from "../../../core/TransactionHash.js"
-import * as CoreUTxO from "../../../core/UTxO.js"
+import * as CoreAddress from "../../../Address.js"
+import * as CoreAssets from "../../../Assets/index.js"
+import * as PoolKeyHash from "../../../PoolKeyHash.js"
+import * as Redeemer from "../../../Redeemer.js"
+import * as TransactionHash from "../../../TransactionHash.js"
+import * as CoreUTxO from "../../../UTxO.js"
 import type { EvalRedeemer } from "../../EvalRedeemer.js"
 import type * as Provider from "../Provider.js"
 
diff --git a/packages/evolution/src/sdk/provider/internal/BlockfrostEffect.ts b/packages/evolution/src/sdk/provider/internal/BlockfrostEffect.ts
index d75d7a73..82aa5aee 100644
--- a/packages/evolution/src/sdk/provider/internal/BlockfrostEffect.ts
+++ b/packages/evolution/src/sdk/provider/internal/BlockfrostEffect.ts
@@ -5,16 +5,16 @@
 
 import { Effect, Schedule, Schema } from "effect"
 
-import * as CoreAddress from "../../../core/Address.js"
-import * as Bytes from "../../../core/Bytes.js"
-import type * as Credential from "../../../core/Credential.js"
-import * as PlutusData from "../../../core/Data.js"
-import type * as DatumOption from "../../../core/DatumOption.js"
-import type * as RewardAddress from "../../../core/RewardAddress.js"
-import * as Transaction from "../../../core/Transaction.js"
-import * as TransactionHash from "../../../core/TransactionHash.js"
-import type * as TransactionInput from "../../../core/TransactionInput.js"
-import type * as CoreUTxO from "../../../core/UTxO.js"
+import * as CoreAddress from "../../../Address.js"
+import * as Bytes from "../../../Bytes.js"
+import type * as Credential from "../../../Credential.js"
+import * as PlutusData from "../../../Data.js"
+import type * as DatumOption from "../../../DatumOption.js"
+import type * as RewardAddress from "../../../RewardAddress.js"
+import * as Transaction from "../../../Transaction.js"
+import * as TransactionHash from "../../../TransactionHash.js"
+import type * as TransactionInput from "../../../TransactionInput.js"
+import type * as CoreUTxO from "../../../UTxO.js"
 import { ProviderError } from "../Provider.js"
 import * as Blockfrost from "./Blockfrost.js"
 import * as HttpUtils from "./HttpUtils.js"
diff --git a/packages/evolution/src/sdk/provider/internal/Koios.ts b/packages/evolution/src/sdk/provider/internal/Koios.ts
index 694b1b6b..a223d38b 100644
--- a/packages/evolution/src/sdk/provider/internal/Koios.ts
+++ b/packages/evolution/src/sdk/provider/internal/Koios.ts
@@ -3,11 +3,11 @@ import { FetchHttpClient } from "@effect/platform"
 import { Effect, pipe, Schema } from "effect"
 import type { ParseError } from "effect/ParseResult"
 
-import * as CoreAddress from "../../../core/Address.js"
-import * as CoreAssets from "../../../core/Assets/index.js"
-import type * as Credential from "../../../core/Credential.js"
-import * as TransactionHash from "../../../core/TransactionHash.js"
-import * as CoreUTxO from "../../../core/UTxO.js"
+import * as CoreAddress from "../../../Address.js"
+import * as CoreAssets from "../../../Assets/index.js"
+import type * as Credential from "../../../Credential.js"
+import * as TransactionHash from "../../../TransactionHash.js"
+import * as CoreUTxO from "../../../UTxO.js"
 import * as HttpUtils from "./HttpUtils.js"
 
 export const ProtocolParametersSchema = Schema.Struct({
diff --git a/packages/evolution/src/sdk/provider/internal/KoiosEffect.ts b/packages/evolution/src/sdk/provider/internal/KoiosEffect.ts
index 3dcba042..04c9f855 100644
--- a/packages/evolution/src/sdk/provider/internal/KoiosEffect.ts
+++ b/packages/evolution/src/sdk/provider/internal/KoiosEffect.ts
@@ -1,21 +1,21 @@
 import { FetchHttpClient } from "@effect/platform"
 import { Effect, pipe, Schedule, Schema } from "effect"
 
-import * as CoreAddress from "../../../core/Address.js"
-import * as CoreAssets from "../../../core/Assets/index.js"
-import * as AssetsUnit from "../../../core/Assets/Unit.js"
-import * as Bytes from "../../../core/Bytes.js"
-import type * as Credential from "../../../core/Credential.js"
-import * as PlutusData from "../../../core/Data.js"
-import type * as DatumOption from "../../../core/DatumOption.js"
-import * as PolicyId from "../../../core/PolicyId.js"
-import * as PoolKeyHash from "../../../core/PoolKeyHash.js"
-import * as Redeemer from "../../../core/Redeemer.js"
-import type * as CoreRewardAddress from "../../../core/RewardAddress.js"
-import * as Transaction from "../../../core/Transaction.js"
-import * as TransactionHash from "../../../core/TransactionHash.js"
-import type * as TransactionInput from "../../../core/TransactionInput.js"
-import type * as CoreUTxO from "../../../core/UTxO.js"
+import * as CoreAddress from "../../../Address.js"
+import * as CoreAssets from "../../../Assets/index.js"
+import * as AssetsUnit from "../../../Assets/Unit.js"
+import * as Bytes from "../../../Bytes.js"
+import type * as Credential from "../../../Credential.js"
+import * as PlutusData from "../../../Data.js"
+import type * as DatumOption from "../../../DatumOption.js"
+import * as PolicyId from "../../../PolicyId.js"
+import * as PoolKeyHash from "../../../PoolKeyHash.js"
+import * as Redeemer from "../../../Redeemer.js"
+import type * as CoreRewardAddress from "../../../RewardAddress.js"
+import * as Transaction from "../../../Transaction.js"
+import * as TransactionHash from "../../../TransactionHash.js"
+import type * as TransactionInput from "../../../TransactionInput.js"
+import type * as CoreUTxO from "../../../UTxO.js"
 import type * as EvalRedeemer from "../../EvalRedeemer.js"
 import * as Provider from "../Provider.js"
 import * as HttpUtils from "./HttpUtils.js"
diff --git a/packages/evolution/src/sdk/provider/internal/KupmiosEffects.ts b/packages/evolution/src/sdk/provider/internal/KupmiosEffects.ts
index b3bd1752..de6b5169 100644
--- a/packages/evolution/src/sdk/provider/internal/KupmiosEffects.ts
+++ b/packages/evolution/src/sdk/provider/internal/KupmiosEffects.ts
@@ -1,26 +1,26 @@
 import { FetchHttpClient } from "@effect/platform"
 import { Array as _Array, Effect, pipe, Schedule, Schema } from "effect"
 
-import * as CoreAddress from "../../../core/Address.js"
-import * as CoreAssets from "../../../core/Assets/index.js"
-import * as AssetsUnit from "../../../core/Assets/Unit.js"
-import * as Bytes from "../../../core/Bytes.js"
-import type * as Credential from "../../../core/Credential.js"
-import * as PlutusData from "../../../core/Data.js"
-import * as DatumOption from "../../../core/DatumOption.js"
-import * as NativeScripts from "../../../core/NativeScripts.js"
-import * as PlutusV1 from "../../../core/PlutusV1.js"
-import * as PlutusV2 from "../../../core/PlutusV2.js"
-import * as PlutusV3 from "../../../core/PlutusV3.js"
-import * as PolicyId from "../../../core/PolicyId.js"
-import * as Redeemer from "../../../core/Redeemer.js"
-import type * as CoreRewardAddress from "../../../core/RewardAddress.js"
-import type * as CoreScript from "../../../core/Script.js"
-import * as Transaction from "../../../core/Transaction.js"
-import * as TransactionHash from "../../../core/TransactionHash.js"
-import type * as TransactionInput from "../../../core/TransactionInput.js"
-import * as UPLC from "../../../core/uplc/UPLC.js"
-import * as CoreUTxO from "../../../core/UTxO.js"
+import * as CoreAddress from "../../../Address.js"
+import * as CoreAssets from "../../../Assets/index.js"
+import * as AssetsUnit from "../../../Assets/Unit.js"
+import * as Bytes from "../../../Bytes.js"
+import type * as Credential from "../../../Credential.js"
+import * as PlutusData from "../../../Data.js"
+import * as DatumOption from "../../../DatumOption.js"
+import * as NativeScripts from "../../../NativeScripts.js"
+import * as PlutusV1 from "../../../PlutusV1.js"
+import * as PlutusV2 from "../../../PlutusV2.js"
+import * as PlutusV3 from "../../../PlutusV3.js"
+import * as PolicyId from "../../../PolicyId.js"
+import * as Redeemer from "../../../Redeemer.js"
+import type * as CoreRewardAddress from "../../../RewardAddress.js"
+import type * as CoreScript from "../../../Script.js"
+import * as Transaction from "../../../Transaction.js"
+import * as TransactionHash from "../../../TransactionHash.js"
+import type * as TransactionInput from "../../../TransactionInput.js"
+import * as UPLC from "../../../uplc/UPLC.js"
+import * as CoreUTxO from "../../../UTxO.js"
 import type { EvalRedeemer } from "../../EvalRedeemer.js"
 import * as Provider from "../Provider.js"
 import * as HttpUtils from "./HttpUtils.js"
diff --git a/packages/evolution/src/sdk/provider/internal/Maestro.ts b/packages/evolution/src/sdk/provider/internal/Maestro.ts
index a8f27757..c13cea7c 100644
--- a/packages/evolution/src/sdk/provider/internal/Maestro.ts
+++ b/packages/evolution/src/sdk/provider/internal/Maestro.ts
@@ -5,11 +5,11 @@
 
 import { Schema } from "effect"
 
-import * as CoreAddress from "../../../core/Address.js"
-import * as CoreAssets from "../../../core/Assets/index.js"
-import * as PoolKeyHash from "../../../core/PoolKeyHash.js"
-import * as TransactionHash from "../../../core/TransactionHash.js"
-import * as CoreUTxO from "../../../core/UTxO.js"
+import * as CoreAddress from "../../../Address.js"
+import * as CoreAssets from "../../../Assets/index.js"
+import * as PoolKeyHash from "../../../PoolKeyHash.js"
+import * as TransactionHash from "../../../TransactionHash.js"
+import * as CoreUTxO from "../../../UTxO.js"
 import type { EvalRedeemer } from "../../EvalRedeemer.js"
 import type * as Provider from "../Provider.js"
 
diff --git a/packages/evolution/src/sdk/provider/internal/MaestroEffect.ts b/packages/evolution/src/sdk/provider/internal/MaestroEffect.ts
index dc5553bc..75f8a4bc 100644
--- a/packages/evolution/src/sdk/provider/internal/MaestroEffect.ts
+++ b/packages/evolution/src/sdk/provider/internal/MaestroEffect.ts
@@ -5,15 +5,15 @@
 
 import { Effect, Schema } from "effect"
 
-import * as CoreAddress from "../../../core/Address.js"
-import * as Bytes from "../../../core/Bytes.js"
-import type * as Credential from "../../../core/Credential.js"
-import * as PlutusData from "../../../core/Data.js"
-import type * as DatumOption from "../../../core/DatumOption.js"
-import * as Transaction from "../../../core/Transaction.js"
-import * as TransactionHash from "../../../core/TransactionHash.js"
-import type * as TransactionInput from "../../../core/TransactionInput.js"
-import type * as CoreUTxO from "../../../core/UTxO.js"
+import * as CoreAddress from "../../../Address.js"
+import * as Bytes from "../../../Bytes.js"
+import type * as Credential from "../../../Credential.js"
+import * as PlutusData from "../../../Data.js"
+import type * as DatumOption from "../../../DatumOption.js"
+import * as Transaction from "../../../Transaction.js"
+import * as TransactionHash from "../../../TransactionHash.js"
+import type * as TransactionInput from "../../../TransactionInput.js"
+import type * as CoreUTxO from "../../../UTxO.js"
 import type { EvalRedeemer } from "../../EvalRedeemer.js"
 import { ProviderError } from "../Provider.js"
 import * as HttpUtils from "./HttpUtils.js"
diff --git a/packages/evolution/src/sdk/provider/internal/Ogmios.ts b/packages/evolution/src/sdk/provider/internal/Ogmios.ts
index 12c3e16c..b7d98982 100644
--- a/packages/evolution/src/sdk/provider/internal/Ogmios.ts
+++ b/packages/evolution/src/sdk/provider/internal/Ogmios.ts
@@ -1,16 +1,16 @@
 import type { Record } from "effect"
 import { Schema } from "effect"
 
-import * as CoreAddress from "../../../core/Address.js"
-import * as AssetName from "../../../core/AssetName.js"
-import type * as CoreAssets from "../../../core/Assets/index.js"
-import * as Bytes from "../../../core/Bytes.js"
-import * as PlutusData from "../../../core/Data.js"
-import type * as DatumOption from "../../../core/DatumOption.js"
-import * as PolicyId from "../../../core/PolicyId.js"
-import * as CoreScript from "../../../core/Script.js"
-import * as TransactionHash from "../../../core/TransactionHash.js"
-import type * as CoreUTxO from "../../../core/UTxO.js"
+import * as CoreAddress from "../../../Address.js"
+import * as AssetName from "../../../AssetName.js"
+import type * as CoreAssets from "../../../Assets/index.js"
+import * as Bytes from "../../../Bytes.js"
+import * as PlutusData from "../../../Data.js"
+import type * as DatumOption from "../../../DatumOption.js"
+import * as PolicyId from "../../../PolicyId.js"
+import * as CoreScript from "../../../Script.js"
+import * as TransactionHash from "../../../TransactionHash.js"
+import type * as CoreUTxO from "../../../UTxO.js"
 
 export const JSONRPCSchema = <A, I, R>(schema: Schema.Schema<A, I, R>) =>
   Schema.Struct({
diff --git a/packages/evolution/src/sdk/wallet/Derivation.ts b/packages/evolution/src/sdk/wallet/Derivation.ts
index 36ae7623..8939407a 100644
--- a/packages/evolution/src/sdk/wallet/Derivation.ts
+++ b/packages/evolution/src/sdk/wallet/Derivation.ts
@@ -4,13 +4,13 @@ import * as Data from "effect/Data"
 import * as Effect from "effect/Effect"
 import * as Schema from "effect/Schema"
 
-import * as CoreAddress from "../../core/Address.js"
-import * as AddressEras from "../../core/AddressEras.js"
-import * as Bip32PrivateKey from "../../core/Bip32PrivateKey.js"
-import * as KeyHash from "../../core/KeyHash.js"
-import * as PrivateKey from "../../core/PrivateKey.js"
-import * as RewardAccount from "../../core/RewardAccount.js"
-import * as CoreRewardAddress from "../../core/RewardAddress.js"
+import * as CoreAddress from "../../Address.js"
+import * as AddressEras from "../../AddressEras.js"
+import * as Bip32PrivateKey from "../../Bip32PrivateKey.js"
+import * as KeyHash from "../../KeyHash.js"
+import * as PrivateKey from "../../PrivateKey.js"
+import * as RewardAccount from "../../RewardAccount.js"
+import * as CoreRewardAddress from "../../RewardAddress.js"
 
 export class DerivationError extends Data.TaggedError("DerivationError")<{
   readonly message: string
diff --git a/packages/evolution/src/sdk/wallet/WalletNew.ts b/packages/evolution/src/sdk/wallet/WalletNew.ts
index 60b16e99..90faaefd 100644
--- a/packages/evolution/src/sdk/wallet/WalletNew.ts
+++ b/packages/evolution/src/sdk/wallet/WalletNew.ts
@@ -1,11 +1,11 @@
 import { Data, type Effect } from "effect"
 
-import type * as CoreAddress from "../../core/Address.js"
-import type * as RewardAddress from "../../core/RewardAddress.js"
-import type * as Transaction from "../../core/Transaction.js"
-import type * as TransactionHash from "../../core/TransactionHash.js"
-import type * as TransactionWitnessSet from "../../core/TransactionWitnessSet.js"
-import type * as CoreUTxO from "../../core/UTxO.js"
+import type * as CoreAddress from "../../Address.js"
+import type * as RewardAddress from "../../RewardAddress.js"
+import type * as Transaction from "../../Transaction.js"
+import type * as TransactionHash from "../../TransactionHash.js"
+import type * as TransactionWitnessSet from "../../TransactionWitnessSet.js"
+import type * as CoreUTxO from "../../UTxO.js"
 import type { EffectToPromiseAPI } from "../Type.js"
 
 /**
diff --git a/packages/evolution/src/core/uplc/UPLC.ts b/packages/evolution/src/uplc/UPLC.ts
similarity index 100%
rename from packages/evolution/src/core/uplc/UPLC.ts
rename to packages/evolution/src/uplc/UPLC.ts
diff --git a/packages/evolution/src/core/uplc/index.ts b/packages/evolution/src/uplc/index.ts
similarity index 100%
rename from packages/evolution/src/core/uplc/index.ts
rename to packages/evolution/src/uplc/index.ts
diff --git a/packages/evolution/src/utils/FeeValidation.ts b/packages/evolution/src/utils/FeeValidation.ts
index 0a375ea0..fffffa23 100644
--- a/packages/evolution/src/utils/FeeValidation.ts
+++ b/packages/evolution/src/utils/FeeValidation.ts
@@ -9,8 +9,8 @@
  * @category validation
  */
 
-import * as Transaction from "../core/Transaction.js"
-import type * as TransactionWitnessSet from "../core/TransactionWitnessSet.js"
+import * as Transaction from "../Transaction.js"
+import type * as TransactionWitnessSet from "../TransactionWitnessSet.js"
 
 /**
  * Protocol parameters required for fee calculation.
diff --git a/packages/evolution/src/utils/Hash.ts b/packages/evolution/src/utils/Hash.ts
index 95ca2946..26e1e605 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 * 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 Redeemers from "../core/Redeemers.js"
-import * as ScriptDataHash from "../core/ScriptDataHash.js"
-import * as TransactionBody from "../core/TransactionBody.js"
-import * as TransactionHash from "../core/TransactionHash.js"
+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 Redeemers from "../Redeemers.js"
+import * as ScriptDataHash from "../ScriptDataHash.js"
+import * as TransactionBody from "../TransactionBody.js"
+import * as TransactionHash from "../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 5180c22e..406294cf 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 { Equal, FastCheck } from "effect"
 
-import * as Address from "../src/core/AddressEras.js"
+import * as Address from "../src/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 5a3b698c..d7bdb848 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 { Equal, FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as AuxiliaryData from "../src/core/AuxiliaryData.js"
+import * as AuxiliaryData from "../src/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 dc361fe5..336ac0e8 100644
--- a/packages/evolution/test/Bip32PrivateKey.CML.test.ts
+++ b/packages/evolution/test/Bip32PrivateKey.CML.test.ts
@@ -2,9 +2,9 @@ import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs"
 import { mnemonicToEntropy } from "bip39"
 import { beforeEach, describe, expect, it } from "vitest"
 
-import * as Bip32PrivateKey from "../src/core/Bip32PrivateKey.js"
-import * as Bip32PublicKey from "../src/core/Bip32PublicKey.js"
-import * as PrivateKey from "../src/core/PrivateKey.js"
+import * as Bip32PrivateKey from "../src/Bip32PrivateKey.js"
+import * as Bip32PublicKey from "../src/Bip32PublicKey.js"
+import * as PrivateKey from "../src/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 3f9254e7..b80daea9 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/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"
+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"
 
 // CML compatibility tests for BootstrapWitness
 
diff --git a/packages/evolution/test/CBOR.Aiken.test.ts b/packages/evolution/test/CBOR.Aiken.test.ts
index 16351c90..a8c716d0 100644
--- a/packages/evolution/test/CBOR.Aiken.test.ts
+++ b/packages/evolution/test/CBOR.Aiken.test.ts
@@ -1,10 +1,10 @@
 import { describe, expect, it } from "vitest"
 
-import * as Bytes from "../src/core/Bytes.js"
-import * as CBOR from "../src/core/CBOR.js"
-import * as Data from "../src/core/Data.js"
-import * as Text from "../src/core/Text.js"
-import * as TSchema from "../src/core/TSchema.js"
+import * as Bytes from "../src/Bytes.js"
+import * as CBOR from "../src/CBOR.js"
+import * as Data from "../src/Data.js"
+import * as Text from "../src/Text.js"
+import * as TSchema from "../src/TSchema.js"
 
 describe("Aiken CBOR Encoding Compatibility", () => {
   // Test #1: encode_int_small
diff --git a/packages/evolution/test/CBOR.test.ts b/packages/evolution/test/CBOR.test.ts
index d76f98c3..9b50bc6c 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/core/CBOR.js"
+import * as CBOR from "../src/CBOR.js"
 
 describe("CBOR Implementation Tests", () => {
   describe("Integer Encoding Boundaries", () => {
diff --git a/packages/evolution/test/CoinSelection.test.ts b/packages/evolution/test/CoinSelection.test.ts
index 3f52d82f..be1763a0 100644
--- a/packages/evolution/test/CoinSelection.test.ts
+++ b/packages/evolution/test/CoinSelection.test.ts
@@ -1,8 +1,8 @@
 import { describe, expect, it } from "vitest"
 
-import * as CoreAssets from "../src/core/Assets/index.js"
-import type * as CoreUTxO from "../src/core/UTxO.js"
+import * as CoreAssets from "../src/Assets/index.js"
 import { CoinSelectionError, largestFirstSelection } from "../src/sdk/builders/CoinSelection.js"
+import type * as CoreUTxO from "../src/UTxO.js"
 import { createCoreTestUtxo } from "./utils/utxo-helpers.js"
 
 /**
diff --git a/packages/evolution/test/Credential.CML.test.ts b/packages/evolution/test/Credential.CML.test.ts
index 4dc9e025..c54a6549 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/core/Credential.js"
+import * as Credential from "../src/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 8ae895b8..b2eba557 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/core/Data.js"
+import * as Data from "../src/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 d6d64483..00839176 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/core/Data.js"
+import * as Data from "../src/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 7099dc98..80d3fea4 100644
--- a/packages/evolution/test/Data.test.ts
+++ b/packages/evolution/test/Data.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from "@effect/vitest"
 
-import * as Bytes from "../src/core/Bytes.js"
-import * as Data from "../src/core/Data.js"
+import * as Bytes from "../src/Bytes.js"
+import * as Data from "../src/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 439d57fb..8a56c671 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 { Equal, FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as GovernanceAction from "../src/core/GovernanceAction.js"
-import * as ProtocolParams from "../src/core/ProtocolParamUpdate.js"
-import * as ScriptHash from "../src/core/ScriptHash.js"
+import * as GovernanceAction from "../src/GovernanceAction.js"
+import * as ProtocolParams from "../src/ProtocolParamUpdate.js"
+import * as ScriptHash from "../src/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/GovernanceAction.CML.test.ts b/packages/evolution/test/GovernanceAction.CML.test.ts
index fc6c9d01..896bb97a 100644
--- a/packages/evolution/test/GovernanceAction.CML.test.ts
+++ b/packages/evolution/test/GovernanceAction.CML.test.ts
@@ -1,15 +1,15 @@
 import { Equal, ParseResult } from "effect"
 import { describe, expect, test } from "vitest"
 
-import type * as Coin from "../src/core/Coin.js"
-import * as Credential from "../src/core/Credential.js"
-import type * as EpochNo from "../src/core/EpochNo.js"
-import * as GovernanceAction from "../src/core/GovernanceAction.js"
-import * as KeyHash from "../src/core/KeyHash.js"
-import * as RewardAccount from "../src/core/RewardAccount.js"
-import * as ScriptHash from "../src/core/ScriptHash.js"
-import * as TransactionHash from "../src/core/TransactionHash.js"
-import * as UnitInterval from "../src/core/UnitInterval.js"
+import type * as Coin from "../src/Coin.js"
+import * as Credential from "../src/Credential.js"
+import type * as EpochNo from "../src/EpochNo.js"
+import * as GovernanceAction from "../src/GovernanceAction.js"
+import * as KeyHash from "../src/KeyHash.js"
+import * as RewardAccount from "../src/RewardAccount.js"
+import * as ScriptHash from "../src/ScriptHash.js"
+import * as TransactionHash from "../src/TransactionHash.js"
+import * as UnitInterval from "../src/UnitInterval.js"
 
 describe("GovernanceAction Map types CBOR round-trip", () => {
   test("TreasuryWithdrawalsAction with Map<RewardAccount, Coin> should round-trip correctly", () => {
diff --git a/packages/evolution/test/Metadata.CML.test.ts b/packages/evolution/test/Metadata.CML.test.ts
index bf47f655..c81bbc8d 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/core/AuxiliaryData.js"
-import * as TransactionMetadatum from "../src/core/TransactionMetadatum.js"
+import * as AuxiliaryData from "../src/AuxiliaryData.js"
+import * as TransactionMetadatum from "../src/TransactionMetadatum.js"
 
 describe("Metadata CML Compatibility", () => {
   it("validates metadata CBOR parity when embedded in Conway AuxiliaryData", () => {
diff --git a/packages/evolution/test/Mint.CML.test.ts b/packages/evolution/test/Mint.CML.test.ts
index 16bc4e9f..300a5267 100644
--- a/packages/evolution/test/Mint.CML.test.ts
+++ b/packages/evolution/test/Mint.CML.test.ts
@@ -1,7 +1,7 @@
 import { Equal, FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as Mint from "../src/core/Mint.js"
+import * as Mint from "../src/Mint.js"
 
 describe("Mint CML Compatibility", () => {
   it("property: Mint round-trips through CBOR with Equal.equals", () => {
diff --git a/packages/evolution/test/MultiAsset.equals.test.ts b/packages/evolution/test/MultiAsset.equals.test.ts
index cf61e438..899fb98b 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/core/MultiAsset.js"
+import * as MultiAsset from "../src/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 070674bf..a9d15d59 100644
--- a/packages/evolution/test/NativeScripts.CML.test.ts
+++ b/packages/evolution/test/NativeScripts.CML.test.ts
@@ -2,7 +2,7 @@ import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs"
 import { Equal, FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as NativeScripts from "../src/core/NativeScripts.js"
+import * as NativeScripts from "../src/NativeScripts.js"
 
 describe("NativeScripts CML Compatibility (property)", () => {
   it("Evolution NativeScript CBOR is parseable by CML and roundtrips CBOR", () => {
diff --git a/packages/evolution/test/ParameterChangeAction.CML.test.ts b/packages/evolution/test/ParameterChangeAction.CML.test.ts
index 23ab0208..e2e276ef 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/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"
+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"
 
 // 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 26e994b6..12429064 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/core/PrivateKey"
-import * as VKey from "../src/core/VKey"
+import * as PrivateKey from "../src/PrivateKey"
+import * as VKey from "../src/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 e3bc965c..61feb362 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/core/Anchor.js"
-import { InfoAction } from "../src/core/GovernanceAction.js"
-import * as ProposalProcedure from "../src/core/ProposalProcedure.js"
-import * as RewardAccount from "../src/core/RewardAccount.js"
+import * as Anchor from "../src/Anchor.js"
+import { InfoAction } from "../src/GovernanceAction.js"
+import * as ProposalProcedure from "../src/ProposalProcedure.js"
+import * as RewardAccount from "../src/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 ae97de23..03821024 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/core/ProtocolParamUpdate.js"
+import * as ProtocolParamUpdate from "../src/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 1c58de10..521ecd50 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/core/CBOR.js"
-import * as Redeemer from "../src/core/Redeemer.js"
+import * as CBOR from "../src/CBOR.js"
+import * as Redeemer from "../src/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 c1ce3756..d852ca3a 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/core/KeyHash.js"
-import type * as NetworkId from "../src/core/NetworkId.js"
-import * as RewardAccount from "../src/core/RewardAccount.js"
+import * as KeyHash from "../src/KeyHash.js"
+import type * as NetworkId from "../src/NetworkId.js"
+import * as RewardAccount from "../src/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
index 32e40028..d5d4a97a 100644
--- a/packages/evolution/test/Script.CML.test.ts
+++ b/packages/evolution/test/Script.CML.test.ts
@@ -2,11 +2,11 @@ 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"
+import * as PlutusV1 from "../src/PlutusV1.js"
+import * as PlutusV2 from "../src/PlutusV2.js"
+import * as PlutusV3 from "../src/PlutusV3.js"
+import * as Script from "../src/Script.js"
+import * as ScriptHash from "../src/ScriptHash.js"
 
 /**
  * CML compatibility test for Script CBOR serialization.
diff --git a/packages/evolution/test/SignData.CSL.test.ts b/packages/evolution/test/SignData.CSL.test.ts
index 27f44005..65a366ee 100644
--- a/packages/evolution/test/SignData.CSL.test.ts
+++ b/packages/evolution/test/SignData.CSL.test.ts
@@ -2,10 +2,10 @@ import * as CSL from "@emurgo/cardano-message-signing-nodejs"
 import { FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as Ed25519Signature from "../src/core/Ed25519Signature.js"
-import { COSEKey, COSESign1, Header, Label, Utils } from "../src/core/message-signing/index.js"
-import * as PrivateKey from "../src/core/PrivateKey.js"
-import * as VKey from "../src/core/VKey.js"
+import * as Ed25519Signature from "../src/Ed25519Signature.js"
+import { COSEKey, COSESign1, Header, Label, Utils } from "../src/message-signing/index.js"
+import * as PrivateKey from "../src/PrivateKey.js"
+import * as VKey from "../src/VKey.js"
 
 describe("SignData CSL Primitive Compatibility", () => {
   describe("Enum values", () => {
diff --git a/packages/evolution/test/SignData.Parity.test.ts b/packages/evolution/test/SignData.Parity.test.ts
index 82634697..83b681cb 100644
--- a/packages/evolution/test/SignData.Parity.test.ts
+++ b/packages/evolution/test/SignData.Parity.test.ts
@@ -4,10 +4,10 @@ import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs"
 import * as M from "@emurgo/cardano-message-signing-nodejs"
 import { describe, expect, it } from "vitest"
 
-import { fromHex, toHex } from "../src/core/Bytes.js"
-import * as KeyHash from "../src/core/KeyHash.js"
-import { SignData } from "../src/core/message-signing/index.js"
-import * as PrivateKey from "../src/core/PrivateKey.js"
+import { fromHex, toHex } from "../src/Bytes.js"
+import * as KeyHash from "../src/KeyHash.js"
+import { SignData } from "../src/message-signing/index.js"
+import * as PrivateKey from "../src/PrivateKey.js"
 
 function signData(addressHex: string, payload: string, privateKey: string): { signature: string; key: string } {
   const protectedHeaders = M.HeaderMap.new()
diff --git a/packages/evolution/test/SignData.test.ts b/packages/evolution/test/SignData.test.ts
index a538de9c..2cba190f 100644
--- a/packages/evolution/test/SignData.test.ts
+++ b/packages/evolution/test/SignData.test.ts
@@ -1,11 +1,11 @@
 import { FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as Bytes from "../src/core/Bytes.js"
-import * as KeyHash from "../src/core/KeyHash.js"
-import { COSESign1, Header, SignData, Utils } from "../src/core/message-signing/index.js"
-import * as PrivateKey from "../src/core/PrivateKey.js"
-import * as VKey from "../src/core/VKey.js"
+import * as Bytes from "../src/Bytes.js"
+import * as KeyHash from "../src/KeyHash.js"
+import { COSESign1, Header, SignData, Utils } from "../src/message-signing/index.js"
+import * as PrivateKey from "../src/PrivateKey.js"
+import * as VKey from "../src/VKey.js"
 
 describe("SignData", () => {
   describe("Payload", () => {
diff --git a/packages/evolution/test/TSchema-flat-option.test.ts b/packages/evolution/test/TSchema-flat-option.test.ts
index 4b6aee9e..f87d8a51 100644
--- a/packages/evolution/test/TSchema-flat-option.test.ts
+++ b/packages/evolution/test/TSchema-flat-option.test.ts
@@ -1,9 +1,9 @@
 import { describe, expect, it } from "vitest"
 
-import * as Bytes from "../src/core/Bytes.js"
-import { fromHex } from "../src/core/Bytes.js"
-import * as Data from "../src/core/Data.js"
-import * as TSchema from "../src/core/TSchema.js"
+import * as Bytes from "../src/Bytes.js"
+import { fromHex } from "../src/Bytes.js"
+import * as Data from "../src/Data.js"
+import * as TSchema from "../src/TSchema.js"
 
 describe("TSchema.Struct with flatInUnion option", () => {
   describe("Default behavior (nested)", () => {
diff --git a/packages/evolution/test/TSchema.TaggedUnion.test.ts b/packages/evolution/test/TSchema.TaggedUnion.test.ts
index cc36e86f..42a5d690 100644
--- a/packages/evolution/test/TSchema.TaggedUnion.test.ts
+++ b/packages/evolution/test/TSchema.TaggedUnion.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from "vitest"
 
-import * as Data from "../src/core/Data.js"
-import * as TSchema from "../src/core/TSchema.js"
+import * as Data from "../src/Data.js"
+import * as TSchema from "../src/TSchema.js"
 
 describe("TSchema.TaggedUnion", () => {
   describe("Auto-detection with _tag field", () => {
diff --git a/packages/evolution/test/TSchema.equivalence.test.ts b/packages/evolution/test/TSchema.equivalence.test.ts
index c758e3c4..4b7e5de8 100644
--- a/packages/evolution/test/TSchema.equivalence.test.ts
+++ b/packages/evolution/test/TSchema.equivalence.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from "vitest"
 
-import { fromHex } from "../src/core/Bytes.js"
-import * as TSchema from "../src/core/TSchema.js"
+import { fromHex } from "../src/Bytes.js"
+import * as TSchema from "../src/TSchema.js"
 
 describe("TSchema Equivalence", () => {
   describe("Basic Types", () => {
diff --git a/packages/evolution/test/TSchema.recursive.test.ts b/packages/evolution/test/TSchema.recursive.test.ts
index f2776858..e9740cd4 100644
--- a/packages/evolution/test/TSchema.recursive.test.ts
+++ b/packages/evolution/test/TSchema.recursive.test.ts
@@ -1,9 +1,9 @@
 import { Schema } from "effect"
 import { describe, expect, it } from "vitest"
 
-import { fromHex } from "../src/core/Bytes.js"
-import * as Data from "../src/core/Data.js"
-import * as TSchema from "../src/core/TSchema.js"
+import { fromHex } from "../src/Bytes.js"
+import * as Data from "../src/Data.js"
+import * as TSchema from "../src/TSchema.js"
 
 /**
  * Tests for recursive TSchema structures
diff --git a/packages/evolution/test/TSchema.test.ts b/packages/evolution/test/TSchema.test.ts
index c78ad6d4..085d8e1b 100644
--- a/packages/evolution/test/TSchema.test.ts
+++ b/packages/evolution/test/TSchema.test.ts
@@ -1,9 +1,9 @@
 import { describe, expect, it } from "vitest"
 
-import * as Bytes from "../src/core/Bytes.js"
-import { fromHex } from "../src/core/Bytes.js"
-import * as Data from "../src/core/Data.js"
-import * as TSchema from "../src/core/TSchema.js"
+import * as Bytes from "../src/Bytes.js"
+import { fromHex } from "../src/Bytes.js"
+import * as Data from "../src/Data.js"
+import * as TSchema from "../src/TSchema.js"
 
 /**
  * Tests for TypeTaggedSchema module functionality -
diff --git a/packages/evolution/test/Transaction.CML.test.ts b/packages/evolution/test/Transaction.CML.test.ts
index a520796a..73fee79c 100644
--- a/packages/evolution/test/Transaction.CML.test.ts
+++ b/packages/evolution/test/Transaction.CML.test.ts
@@ -2,7 +2,7 @@ import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs"
 import { Equal, FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as Transaction from "../src/core/Transaction.js"
+import * as Transaction from "../src/Transaction.js"
 
 /**
  * CML compatibility test for full Transaction CBOR serialization.
diff --git a/packages/evolution/test/TransactionBody.CML.test.ts b/packages/evolution/test/TransactionBody.CML.test.ts
index f71137ef..854cb91e 100644
--- a/packages/evolution/test/TransactionBody.CML.test.ts
+++ b/packages/evolution/test/TransactionBody.CML.test.ts
@@ -3,11 +3,11 @@ import { Equal, 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/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"
+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"
 
 /**
  * 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 1f944184..6989c258 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/core/TransactionMetadatum.js"
+import * as TransactionMetadatum from "../src/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 f077a436..ee9c741f 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 { Equal, FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as TransactionOutput from "../src/core/TransactionOutput.js"
+import * as TransactionOutput from "../src/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 0019218a..fb04ba66 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/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"
+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"
 
 /**
  * CML compatibility test for TransactionWitnessSet CBOR serialization.
diff --git a/packages/evolution/test/TxBuilder.CoinSelectionFailures.test.ts b/packages/evolution/test/TxBuilder.CoinSelectionFailures.test.ts
index afaabc85..f4163d3c 100644
--- a/packages/evolution/test/TxBuilder.CoinSelectionFailures.test.ts
+++ b/packages/evolution/test/TxBuilder.CoinSelectionFailures.test.ts
@@ -1,10 +1,10 @@
 import { describe, expect, it } from "@effect/vitest"
 
-import * as CoreAddress from "../src/core/Address.js"
-import * as CoreAssets from "../src/core/Assets/index.js"
-import type * as CoreUTxO from "../src/core/UTxO.js"
+import * as CoreAddress from "../src/Address.js"
+import * as CoreAssets from "../src/Assets/index.js"
 import type { TxBuilderConfig } from "../src/sdk/builders/TransactionBuilder.js"
 import { makeTxBuilder } from "../src/sdk/builders/TransactionBuilder.js"
+import type * as CoreUTxO from "../src/UTxO.js"
 import { createCoreTestUtxo } from "./utils/utxo-helpers.js"
 
 const PROTOCOL_PARAMS = {
diff --git a/packages/evolution/test/TxBuilder.EdgeCases.test.ts b/packages/evolution/test/TxBuilder.EdgeCases.test.ts
index 31bae144..cc9f2e1e 100644
--- a/packages/evolution/test/TxBuilder.EdgeCases.test.ts
+++ b/packages/evolution/test/TxBuilder.EdgeCases.test.ts
@@ -1,10 +1,10 @@
 import { describe, expect, it } from "@effect/vitest"
 
-import * as Address from "../src/core/Address.js"
-import * as CoreAssets from "../src/core/Assets/index.js"
-import type * as CoreUTxO from "../src/core/UTxO.js"
+import * as Address from "../src/Address.js"
+import * as CoreAssets from "../src/Assets/index.js"
 import type { TxBuilderConfig } from "../src/sdk/builders/TransactionBuilder.js"
 import { makeTxBuilder } from "../src/sdk/builders/TransactionBuilder.js"
+import type * as CoreUTxO from "../src/UTxO.js"
 import { createCoreTestUtxo } from "./utils/utxo-helpers.js"
 
 const PROTOCOL_PARAMS = {
diff --git a/packages/evolution/test/TxBuilder.FeeCalculation.test.ts b/packages/evolution/test/TxBuilder.FeeCalculation.test.ts
index 483c56e2..6594a8f0 100644
--- a/packages/evolution/test/TxBuilder.FeeCalculation.test.ts
+++ b/packages/evolution/test/TxBuilder.FeeCalculation.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from "@effect/vitest"
 import { Effect } from "effect"
 
-import * as CoreAssets from "../src/core/Assets/index.js"
+import * as CoreAssets from "../src/Assets/index.js"
 import {
   calculateLeftoverAssets,
   calculateMinimumFee,
diff --git a/packages/evolution/test/TxBuilder.InsufficientChange.test.ts b/packages/evolution/test/TxBuilder.InsufficientChange.test.ts
index 4be2f710..6869cb1c 100644
--- a/packages/evolution/test/TxBuilder.InsufficientChange.test.ts
+++ b/packages/evolution/test/TxBuilder.InsufficientChange.test.ts
@@ -1,13 +1,13 @@
 import { describe, expect, it } from "@effect/vitest"
 import { FastCheck, Schema } from "effect"
 
-import * as Address from "../src/core/Address.js"
-import * as CoreAssets from "../src/core/Assets/index.js"
-import * as KeyHash from "../src/core/KeyHash.js"
-import * as CoreUTxO from "../src/core/UTxO.js"
+import * as Address from "../src/Address.js"
+import * as CoreAssets from "../src/Assets/index.js"
+import * as KeyHash from "../src/KeyHash.js"
 import type { TxBuilderConfig } from "../src/sdk/builders/TransactionBuilder.js"
 import { makeTxBuilder } from "../src/sdk/builders/TransactionBuilder.js"
 import * as FeeValidation from "../src/utils/FeeValidation.js"
+import * as CoreUTxO from "../src/UTxO.js"
 import { createCoreTestUtxo } from "./utils/utxo-helpers.js"
 
 /**
diff --git a/packages/evolution/test/TxBuilder.Mint.test.ts b/packages/evolution/test/TxBuilder.Mint.test.ts
index 638ec116..deb924c8 100644
--- a/packages/evolution/test/TxBuilder.Mint.test.ts
+++ b/packages/evolution/test/TxBuilder.Mint.test.ts
@@ -1,15 +1,15 @@
 import { describe, expect, it } from "@effect/vitest"
 import { Effect } from "effect"
 
-import * as CoreAddress from "../src/core/Address.js"
-import * as CoreAssets from "../src/core/Assets/index.js"
-import * as Mint from "../src/core/Mint.js"
-import * as NativeScripts from "../src/core/NativeScripts.js"
-import * as ScriptHash from "../src/core/ScriptHash.js"
-import * as Text from "../src/core/Text.js"
+import * as CoreAddress from "../src/Address.js"
+import * as CoreAssets from "../src/Assets/index.js"
+import * as Mint from "../src/Mint.js"
+import * as NativeScripts from "../src/NativeScripts.js"
+import * as ScriptHash from "../src/ScriptHash.js"
 import type { TxBuilderConfig } from "../src/sdk/builders/TransactionBuilder.js"
 import { makeTxBuilder } from "../src/sdk/builders/TransactionBuilder.js"
 import { calculateTransactionSize } from "../src/sdk/builders/TxBuilderImpl.js"
+import * as Text from "../src/Text.js"
 import * as FeeValidation from "../src/utils/FeeValidation.js"
 import { createCoreTestUtxo } from "./utils/utxo-helpers.js"
 
diff --git a/packages/evolution/test/TxBuilder.Reselection.test.ts b/packages/evolution/test/TxBuilder.Reselection.test.ts
index 63cc262e..909c282f 100644
--- a/packages/evolution/test/TxBuilder.Reselection.test.ts
+++ b/packages/evolution/test/TxBuilder.Reselection.test.ts
@@ -1,14 +1,14 @@
 import { describe, expect, it } from "@effect/vitest"
 import { Effect, FastCheck, Schema } from "effect"
 
-import * as CoreAddress from "../src/core/Address.js"
-import * as CoreAssets from "../src/core/Assets/index.js"
-import * as KeyHash from "../src/core/KeyHash.js"
-import * as CoreUTxO from "../src/core/UTxO.js"
+import * as CoreAddress from "../src/Address.js"
+import * as CoreAssets from "../src/Assets/index.js"
+import * as KeyHash from "../src/KeyHash.js"
 import type { TxBuilderConfig } from "../src/sdk/builders/TransactionBuilder.js"
 import { makeTxBuilder } from "../src/sdk/builders/TransactionBuilder.js"
 import { calculateTransactionSize } from "../src/sdk/builders/TxBuilderImpl.js"
 import * as FeeValidation from "../src/utils/FeeValidation.js"
+import * as CoreUTxO from "../src/UTxO.js"
 import { createCoreTestUtxo } from "./utils/utxo-helpers.js"
 
 describe("TxBuilder Re-selection Loop", () => {
diff --git a/packages/evolution/test/TxBuilder.UnfrackChangeHandling.test.ts b/packages/evolution/test/TxBuilder.UnfrackChangeHandling.test.ts
index 903d0e1e..9a9787d4 100644
--- a/packages/evolution/test/TxBuilder.UnfrackChangeHandling.test.ts
+++ b/packages/evolution/test/TxBuilder.UnfrackChangeHandling.test.ts
@@ -1,9 +1,9 @@
 import { describe, expect, it } from "@effect/vitest"
 
-import * as CoreAddress from "../src/core/Address.js"
-import * as CoreAssets from "../src/core/Assets/index.js"
-import * as CoreUTxO from "../src/core/UTxO.js"
+import * as CoreAddress from "../src/Address.js"
+import * as CoreAssets from "../src/Assets/index.js"
 import { makeTxBuilder } from "../src/sdk/builders/TransactionBuilder.js"
+import * as CoreUTxO from "../src/UTxO.js"
 import { createCoreTestUtxo } from "./utils/utxo-helpers.js"
 
 const PROTOCOL_PARAMS = {
diff --git a/packages/evolution/test/TxBuilder.UnfrackDrain.test.ts b/packages/evolution/test/TxBuilder.UnfrackDrain.test.ts
index 514d38ba..6706b663 100644
--- a/packages/evolution/test/TxBuilder.UnfrackDrain.test.ts
+++ b/packages/evolution/test/TxBuilder.UnfrackDrain.test.ts
@@ -1,10 +1,10 @@
 import { describe, expect, it } from "@effect/vitest"
 
-import * as CoreAddress from "../src/core/Address.js"
-import * as CoreAssets from "../src/core/Assets/index.js"
-import * as CoreUTxO from "../src/core/UTxO.js"
+import * as CoreAddress from "../src/Address.js"
+import * as CoreAssets from "../src/Assets/index.js"
 import type { TxBuilderConfig } from "../src/sdk/builders/TransactionBuilder.js"
 import { makeTxBuilder } from "../src/sdk/builders/TransactionBuilder.js"
+import * as CoreUTxO from "../src/UTxO.js"
 import { createCoreTestUtxo } from "./utils/utxo-helpers.js"
 
 const PROTOCOL_PARAMS = {
diff --git a/packages/evolution/test/TxBuilder.UnfrackMinUTxO.test.ts b/packages/evolution/test/TxBuilder.UnfrackMinUTxO.test.ts
index c8fcd6e4..cee9a052 100644
--- a/packages/evolution/test/TxBuilder.UnfrackMinUTxO.test.ts
+++ b/packages/evolution/test/TxBuilder.UnfrackMinUTxO.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from "@effect/vitest"
 
-import * as Address from "../src/core/Address.js"
-import * as CoreAssets from "../src/core/Assets/index.js"
+import * as Address from "../src/Address.js"
+import * as CoreAssets from "../src/Assets/index.js"
 import type { TxBuilderConfig } from "../src/sdk/builders/TransactionBuilder.js"
 import { makeTxBuilder } from "../src/sdk/builders/TransactionBuilder.js"
 import { createCoreTestUtxo } from "./utils/utxo-helpers.js"
diff --git a/packages/evolution/test/UPLC.test.ts b/packages/evolution/test/UPLC.test.ts
index f9ed5a1e..5cf36903 100644
--- a/packages/evolution/test/UPLC.test.ts
+++ b/packages/evolution/test/UPLC.test.ts
@@ -1,11 +1,11 @@
 import { FastCheck, Schema } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as CBOR from "../src/core/CBOR.js"
-import * as Data from "../src/core/Data.js"
-import { PlutusV2 } from "../src/core/PlutusV2.js"
-import * as ScriptHash from "../src/core/ScriptHash.js"
-import * as UPLC from "../src/core/uplc/UPLC.js"
+import * as CBOR from "../src/CBOR.js"
+import * as Data from "../src/Data.js"
+import { PlutusV2 } from "../src/PlutusV2.js"
+import * as ScriptHash from "../src/ScriptHash.js"
+import * as UPLC from "../src/uplc/UPLC.js"
 import plutusJson from "./spec/plutus.json"
 
 describe("UPLC Module", () => {
diff --git a/packages/evolution/test/Unfrack.test.ts b/packages/evolution/test/Unfrack.test.ts
index 0e144cad..279ce2ae 100644
--- a/packages/evolution/test/Unfrack.test.ts
+++ b/packages/evolution/test/Unfrack.test.ts
@@ -1,8 +1,8 @@
 import { describe, expect, it } from "@effect/vitest"
 import { Effect } from "effect"
 
-import * as Address from "../src/core/Address.js"
-import * as CoreAssets from "../src/core/Assets/index.js"
+import * as Address from "../src/Address.js"
+import * as CoreAssets from "../src/Assets/index.js"
 import type { UnfrackOptions } from "../src/sdk/builders/TransactionBuilder.js"
 import * as Unfrack from "../src/sdk/builders/Unfrack.js"
 
diff --git a/packages/evolution/test/UtilsHash.CML.test.ts b/packages/evolution/test/UtilsHash.CML.test.ts
index bedbe812..578d7f51 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/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 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 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 2f63ac22..9df32e3c 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 { Equal, FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
-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"
+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"
 
 /**
  * CML compatibility test for VotingProcedures CBOR serialization.
diff --git a/packages/evolution/test/VotingProcedures.individual.test.ts b/packages/evolution/test/VotingProcedures.individual.test.ts
index 46048725..892c313a 100644
--- a/packages/evolution/test/VotingProcedures.individual.test.ts
+++ b/packages/evolution/test/VotingProcedures.individual.test.ts
@@ -1,7 +1,7 @@
 import { Equal, FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as VotingProcedures from "../src/core/VotingProcedures.js"
+import * as VotingProcedures from "../src/VotingProcedures.js"
 
 describe("VotingProcedures Individual Test", () => {
   it("property: VotingProcedures round-trips through CBOR with Equal.equals", () => {
diff --git a/packages/evolution/test/WalletFromSeed.test.ts b/packages/evolution/test/WalletFromSeed.test.ts
index 883a3b09..92870974 100644
--- a/packages/evolution/test/WalletFromSeed.test.ts
+++ b/packages/evolution/test/WalletFromSeed.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from "@effect/vitest"
 import { Effect } from "effect"
 
-import * as Address from "../src/core/Address.js"
+import * as Address from "../src/Address.js"
 import { walletFromSeed } from "../src/sdk/wallet/Derivation.js"
 
 const seedPhrase =
diff --git a/packages/evolution/test/Withdrawals.CML.test.ts b/packages/evolution/test/Withdrawals.CML.test.ts
index b339c542..ade2b300 100644
--- a/packages/evolution/test/Withdrawals.CML.test.ts
+++ b/packages/evolution/test/Withdrawals.CML.test.ts
@@ -1,7 +1,7 @@
 import { Equal, FastCheck } from "effect"
 import { describe, expect, it } from "vitest"
 
-import * as Withdrawals from "../src/core/Withdrawals.js"
+import * as Withdrawals from "../src/Withdrawals.js"
 
 describe("Withdrawals CML Compatibility", () => {
   it("property: Withdrawals round-trips through CBOR with Equal.equals", () => {
diff --git a/packages/evolution/test/plutus/Address.test.ts b/packages/evolution/test/plutus/Address.test.ts
index f1d61af8..6aab72ab 100644
--- a/packages/evolution/test/plutus/Address.test.ts
+++ b/packages/evolution/test/plutus/Address.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from "@effect/vitest"
 
-import * as Bytes from "../../src/core/Bytes.js"
-import * as Address from "../../src/core/plutus/Address.js"
+import * as Bytes from "../../src/Bytes.js"
+import * as Address from "../../src/plutus/Address.js"
 
 describe("Plutus Address", () => {
   describe("Address with payment credential only", () => {
diff --git a/packages/evolution/test/plutus/CIP68Metadata.test.ts b/packages/evolution/test/plutus/CIP68Metadata.test.ts
index 402f5175..1e351b51 100644
--- a/packages/evolution/test/plutus/CIP68Metadata.test.ts
+++ b/packages/evolution/test/plutus/CIP68Metadata.test.ts
@@ -1,8 +1,8 @@
 import { describe, expect, it } from "@effect/vitest"
 
-import * as Data from "../../src/core/Data.js"
-import * as CIP68Metadata from "../../src/core/plutus/CIP68Metadata.js"
-import * as Text from "../../src/core/Text.js"
+import * as Data from "../../src/Data.js"
+import * as CIP68Metadata from "../../src/plutus/CIP68Metadata.js"
+import * as Text from "../../src/Text.js"
 
 describe("CIP68 Metadata", () => {
   describe("CIP68Datum", () => {
diff --git a/packages/evolution/test/plutus/Credential.test.ts b/packages/evolution/test/plutus/Credential.test.ts
index 560cdd9c..ee1f477e 100644
--- a/packages/evolution/test/plutus/Credential.test.ts
+++ b/packages/evolution/test/plutus/Credential.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from "@effect/vitest"
 
-import * as Bytes from "../../src/core/Bytes.js"
-import * as Credential from "../../src/core/plutus/Credential.js"
+import * as Bytes from "../../src/Bytes.js"
+import * as Credential from "../../src/plutus/Credential.js"
 
 describe("Plutus Credential", () => {
   describe("VerificationKeyHash", () => {
diff --git a/packages/evolution/test/plutus/OutputReference.test.ts b/packages/evolution/test/plutus/OutputReference.test.ts
index 044e9ce9..f7a651fe 100644
--- a/packages/evolution/test/plutus/OutputReference.test.ts
+++ b/packages/evolution/test/plutus/OutputReference.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from "@effect/vitest"
 
-import * as Bytes from "../../src/core/Bytes.js"
-import * as OutputReference from "../../src/core/plutus/OutputReference.js"
+import * as Bytes from "../../src/Bytes.js"
+import * as OutputReference from "../../src/plutus/OutputReference.js"
 
 describe("Plutus OutputReference", () => {
   describe("TransactionId", () => {
diff --git a/packages/evolution/test/plutus/Value.test.ts b/packages/evolution/test/plutus/Value.test.ts
index 508171b4..36735b54 100644
--- a/packages/evolution/test/plutus/Value.test.ts
+++ b/packages/evolution/test/plutus/Value.test.ts
@@ -1,8 +1,8 @@
 import { describe, expect, it } from "@effect/vitest"
 
-import * as Bytes from "../../src/core/Bytes.js"
-import * as Value from "../../src/core/plutus/Value.js"
-import * as Text from "../../src/core/Text.js"
+import * as Bytes from "../../src/Bytes.js"
+import * as Value from "../../src/plutus/Value.js"
+import * as Text from "../../src/Text.js"
 
 describe("Plutus Value", () => {
   describe("PolicyId", () => {
diff --git a/packages/evolution/test/utils/utxo-helpers.ts b/packages/evolution/test/utils/utxo-helpers.ts
index 7e3836f3..b6cdee14 100644
--- a/packages/evolution/test/utils/utxo-helpers.ts
+++ b/packages/evolution/test/utils/utxo-helpers.ts
@@ -1,11 +1,11 @@
-import * as CoreAddress from "../../src/core/Address.js"
-import * as CoreAssets from "../../src/core/Assets/index.js"
-import * as CoreTransactionHash from "../../src/core/TransactionHash.js"
-import * as CoreUTxO from "../../src/core/UTxO.js"
+import * as CoreAddress from "../../src/Address.js"
+import * as CoreAssets from "../../src/Assets/index.js"
 import type * as Assets from "../../src/sdk/Assets.js"
 import type * as Datum from "../../src/sdk/Datum.js"
 import type * as Script from "../../src/sdk/Script.js"
 import type * as UTxO from "../../src/sdk/UTxO.js"
+import * as CoreTransactionHash from "../../src/TransactionHash.js"
+import * as CoreUTxO from "../../src/UTxO.js"
 
 /**
  * Options for creating a test UTxO.