diff --git a/playground/package.json b/playground/package.json
index 130655fe1295..8034efb534fa 100644
--- a/playground/package.json
+++ b/playground/package.json
@@ -15,12 +15,12 @@
     "@aztec/accounts": "link:../yarn-project/accounts",
     "@aztec/aztec.js": "link:../yarn-project/aztec.js",
     "@aztec/bb-prover": "link:../yarn-project/bb-prover",
-    "@aztec/stdlib": "link:../yarn-project/stdlib",
     "@aztec/foundation": "link:../yarn-project/foundation",
     "@aztec/key-store": "link:../yarn-project/key-store",
     "@aztec/kv-store": "link:../yarn-project/kv-store",
     "@aztec/pxe": "link:../yarn-project/pxe",
     "@aztec/simulator": "link:../yarn-project/simulator",
+    "@aztec/stdlib": "link:../yarn-project/stdlib",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.0",
     "@fontsource/roboto": "^5.1.1",
diff --git a/playground/yarn.lock b/playground/yarn.lock
index d1c6d057f65c..e38ec06cf2c6 100644
--- a/playground/yarn.lock
+++ b/playground/yarn.lock
@@ -23,12 +23,6 @@ __metadata:
   languageName: node
   linkType: soft
 
-"@aztec/stdlib@link:../yarn-project/stdlib::locator=playground%40workspace%3A.":
-  version: 0.0.0-use.local
-  resolution: "@aztec/stdlib@link:../yarn-project/stdlib::locator=playground%40workspace%3A."
-  languageName: node
-  linkType: soft
-
 "@aztec/foundation@link:../yarn-project/foundation::locator=playground%40workspace%3A.":
   version: 0.0.0-use.local
   resolution: "@aztec/foundation@link:../yarn-project/foundation::locator=playground%40workspace%3A."
@@ -59,6 +53,12 @@ __metadata:
   languageName: node
   linkType: soft
 
+"@aztec/stdlib@link:../yarn-project/stdlib::locator=playground%40workspace%3A.":
+  version: 0.0.0-use.local
+  resolution: "@aztec/stdlib@link:../yarn-project/stdlib::locator=playground%40workspace%3A."
+  languageName: node
+  linkType: soft
+
 "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.25.9, @babel/code-frame@npm:^7.26.2":
   version: 7.26.2
   resolution: "@babel/code-frame@npm:7.26.2"
@@ -3747,12 +3747,12 @@ __metadata:
     "@aztec/accounts": "link:../yarn-project/accounts"
     "@aztec/aztec.js": "link:../yarn-project/aztec.js"
     "@aztec/bb-prover": "link:../yarn-project/bb-prover"
-    "@aztec/stdlib": "link:../yarn-project/stdlib"
     "@aztec/foundation": "link:../yarn-project/foundation"
     "@aztec/key-store": "link:../yarn-project/key-store"
     "@aztec/kv-store": "link:../yarn-project/kv-store"
     "@aztec/pxe": "link:../yarn-project/pxe"
     "@aztec/simulator": "link:../yarn-project/simulator"
+    "@aztec/stdlib": "link:../yarn-project/stdlib"
     "@emotion/react": "npm:^11.14.0"
     "@emotion/styled": "npm:^11.14.0"
     "@eslint/js": "npm:^9.18.0"
diff --git a/yarn-project/stdlib/src/block/body.ts b/yarn-project/stdlib/src/block/body.ts
index 936012e5f8cb..1da3c21c6cab 100644
--- a/yarn-project/stdlib/src/block/body.ts
+++ b/yarn-project/stdlib/src/block/body.ts
@@ -1,12 +1,12 @@
 import { timesParallel } from '@aztec/foundation/collection';
 import type { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { ContractClass2BlockL2Logs } from '@aztec/stdlib/logs';
-import type { ZodFor } from '@aztec/stdlib/schemas';
 
 import { inspect } from 'util';
 import { z } from 'zod';
 
+import { ContractClass2BlockL2Logs } from '../logs/l2_block_l2_logs.js';
+import type { ZodFor } from '../schemas/index.js';
 import { TxEffect } from '../tx/tx_effect.js';
 
 export class Body {
diff --git a/yarn-project/stdlib/src/block/in_block.ts b/yarn-project/stdlib/src/block/in_block.ts
index 3ef782a0d8cb..a85e6155c3d3 100644
--- a/yarn-project/stdlib/src/block/in_block.ts
+++ b/yarn-project/stdlib/src/block/in_block.ts
@@ -1,8 +1,8 @@
 import { Fr } from '@aztec/foundation/fields';
-import { schemas } from '@aztec/stdlib/schemas';
 
 import { type ZodTypeAny, z } from 'zod';
 
+import { schemas } from '../schemas/index.js';
 import type { L2Block } from './l2_block.js';
 
 export type InBlock<T> = {
diff --git a/yarn-project/stdlib/src/block/l2_block.ts b/yarn-project/stdlib/src/block/l2_block.ts
index 3427848147c1..14cd48b1b442 100644
--- a/yarn-project/stdlib/src/block/l2_block.ts
+++ b/yarn-project/stdlib/src/block/l2_block.ts
@@ -2,11 +2,11 @@ import { sha256, sha256ToField } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
-import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
-import { BlockHeader } from '@aztec/stdlib/tx';
 
 import { z } from 'zod';
 
+import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
+import { BlockHeader } from '../tx/block_header.js';
 import { Body } from './body.js';
 import { makeAppendOnlyTreeSnapshot, makeHeader } from './l2_block_code_to_purge.js';
 
diff --git a/yarn-project/stdlib/src/block/l2_block_code_to_purge.ts b/yarn-project/stdlib/src/block/l2_block_code_to_purge.ts
index 84ea8d627b53..bdbaa73bcd11 100644
--- a/yarn-project/stdlib/src/block/l2_block_code_to_purge.ts
+++ b/yarn-project/stdlib/src/block/l2_block_code_to_purge.ts
@@ -1,17 +1,15 @@
 import { toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { GasFees } from '@aztec/stdlib/gas';
-import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
-import {
-  BlockHeader,
-  ContentCommitment,
-  GlobalVariables,
-  NUM_BYTES_PER_SHA256,
-  PartialStateReference,
-  StateReference,
-} from '@aztec/stdlib/tx';
+
+import { AztecAddress } from '../aztec-address/index.js';
+import { GasFees } from '../gas/gas_fees.js';
+import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
+import { BlockHeader } from '../tx/block_header.js';
+import { ContentCommitment, NUM_BYTES_PER_SHA256 } from '../tx/content_commitment.js';
+import { GlobalVariables } from '../tx/global_variables.js';
+import { PartialStateReference } from '../tx/partial_state_reference.js';
+import { StateReference } from '../tx/state_reference.js';
 
 /**
  * Makes header.
diff --git a/yarn-project/stdlib/src/block/l2_block_downloader/l2_block_stream.test.ts b/yarn-project/stdlib/src/block/l2_block_downloader/l2_block_stream.test.ts
index c563520b8c27..0f571a853404 100644
--- a/yarn-project/stdlib/src/block/l2_block_downloader/l2_block_stream.test.ts
+++ b/yarn-project/stdlib/src/block/l2_block_downloader/l2_block_stream.test.ts
@@ -1,10 +1,10 @@
 import { compactArray } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
-import type { BlockHeader } from '@aztec/stdlib/tx';
 
 import { type MockProxy, mock } from 'jest-mock-extended';
 import times from 'lodash.times';
 
+import type { BlockHeader } from '../../tx/block_header.js';
 import type { L2Block } from '../l2_block.js';
 import type { L2BlockSource, L2Tips } from '../l2_block_source.js';
 import {
diff --git a/yarn-project/stdlib/src/block/l2_block_number.ts b/yarn-project/stdlib/src/block/l2_block_number.ts
index 4dc3d2ade659..11ed2813ae67 100644
--- a/yarn-project/stdlib/src/block/l2_block_number.ts
+++ b/yarn-project/stdlib/src/block/l2_block_number.ts
@@ -1,7 +1,7 @@
-import { schemas } from '@aztec/stdlib/schemas';
-
 import { z } from 'zod';
 
+import { schemas } from '../schemas/index.js';
+
 export const L2BlockNumberSchema = z.union([schemas.Integer, z.literal('latest')]);
 
 /** Helper type for a specific L2 block number or the latest block number */
diff --git a/yarn-project/stdlib/src/block/l2_block_source.ts b/yarn-project/stdlib/src/block/l2_block_source.ts
index e573c6d3811b..4d7b3adb66d2 100644
--- a/yarn-project/stdlib/src/block/l2_block_source.ts
+++ b/yarn-project/stdlib/src/block/l2_block_source.ts
@@ -1,11 +1,12 @@
 import type { EthAddress } from '@aztec/foundation/eth-address';
-import type { BlockHeader, TxReceipt } from '@aztec/stdlib/tx';
 
 import { z } from 'zod';
 
 import type { L1RollupConstants } from '../epoch-helpers/index.js';
+import type { BlockHeader } from '../tx/block_header.js';
 import type { TxEffect } from '../tx/tx_effect.js';
 import type { TxHash } from '../tx/tx_hash.js';
+import type { TxReceipt } from '../tx/tx_receipt.js';
 import type { InBlock } from './in_block.js';
 import type { L2Block } from './l2_block.js';
 
diff --git a/yarn-project/stdlib/src/epoch-helpers/index.ts b/yarn-project/stdlib/src/epoch-helpers/index.ts
index df57e86a312a..2374abecba20 100644
--- a/yarn-project/stdlib/src/epoch-helpers/index.ts
+++ b/yarn-project/stdlib/src/epoch-helpers/index.ts
@@ -1,7 +1,7 @@
-import { type ZodFor, schemas } from '@aztec/stdlib/schemas';
-
 import { z } from 'zod';
 
+import { type ZodFor, schemas } from '../schemas/index.js';
+
 export type L1RollupConstants = {
   l1StartBlock: bigint;
   l1GenesisTime: bigint;
diff --git a/yarn-project/stdlib/src/interfaces/block-builder.ts b/yarn-project/stdlib/src/interfaces/block-builder.ts
index eef7b4c1fe5a..b6c3af34b90b 100644
--- a/yarn-project/stdlib/src/interfaces/block-builder.ts
+++ b/yarn-project/stdlib/src/interfaces/block-builder.ts
@@ -1,7 +1,8 @@
 import type { Fr } from '@aztec/foundation/fields';
-import type { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx';
 
 import type { L2Block } from '../block/l2_block.js';
+import type { BlockHeader } from '../tx/block_header.js';
+import type { GlobalVariables } from '../tx/global_variables.js';
 import type { ProcessedTx } from '../tx/processed_tx.js';
 import type { ProcessedTxHandler } from './processed-tx-handler.js';
 
diff --git a/yarn-project/stdlib/src/interfaces/configs.ts b/yarn-project/stdlib/src/interfaces/configs.ts
index 0289708c11a1..170f087e6211 100644
--- a/yarn-project/stdlib/src/interfaces/configs.ts
+++ b/yarn-project/stdlib/src/interfaces/configs.ts
@@ -1,11 +1,12 @@
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { Fr } from '@aztec/foundation/fields';
-import type { FunctionSelector } from '@aztec/stdlib/abi';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { type ZodFor, schemas } from '@aztec/stdlib/schemas';
 
 import { z } from 'zod';
 
+import type { FunctionSelector } from '../abi/function_selector.js';
+import type { AztecAddress } from '../aztec-address/index.js';
+import { type ZodFor, schemas } from '../schemas/index.js';
+
 type AllowedInstance = { address: AztecAddress };
 type AllowedInstanceFunction = { address: AztecAddress; selector: FunctionSelector };
 type AllowedClass = { classId: Fr };
diff --git a/yarn-project/stdlib/src/interfaces/epoch-prover.ts b/yarn-project/stdlib/src/interfaces/epoch-prover.ts
index b0334e11e5ec..a32055e5a815 100644
--- a/yarn-project/stdlib/src/interfaces/epoch-prover.ts
+++ b/yarn-project/stdlib/src/interfaces/epoch-prover.ts
@@ -1,9 +1,9 @@
 import type { Fr } from '@aztec/foundation/fields';
-import type { Proof } from '@aztec/stdlib/proofs';
-import type { RootRollupPublicInputs } from '@aztec/stdlib/rollup';
-import type { BlockHeader } from '@aztec/stdlib/tx';
 
 import type { L2Block } from '../block/l2_block.js';
+import type { Proof } from '../proofs/proof.js';
+import type { RootRollupPublicInputs } from '../rollup/root_rollup.js';
+import type { BlockHeader } from '../tx/block_header.js';
 import type { Tx } from '../tx/tx.js';
 import type { BlockBuilder } from './block-builder.js';
 
diff --git a/yarn-project/stdlib/src/interfaces/get_logs_response.test.ts b/yarn-project/stdlib/src/interfaces/get_logs_response.test.ts
index aa3b8e7f4f60..bd30e6ead385 100644
--- a/yarn-project/stdlib/src/interfaces/get_logs_response.test.ts
+++ b/yarn-project/stdlib/src/interfaces/get_logs_response.test.ts
@@ -1,5 +1,6 @@
 import { jsonStringify } from '@aztec/foundation/json-rpc';
-import { TxScopedL2Log } from '@aztec/stdlib/logs';
+
+import { TxScopedL2Log } from '../logs/tx_scoped_l2_log.js';
 
 describe('TxScopedL2Log', () => {
   it('serializes to JSON', () => {
diff --git a/yarn-project/stdlib/src/interfaces/get_logs_response.ts b/yarn-project/stdlib/src/interfaces/get_logs_response.ts
index 49401d1e1826..5cc92881fdf7 100644
--- a/yarn-project/stdlib/src/interfaces/get_logs_response.ts
+++ b/yarn-project/stdlib/src/interfaces/get_logs_response.ts
@@ -1,9 +1,8 @@
-import type { ZodFor } from '@aztec/stdlib/schemas';
-
 import { z } from 'zod';
 
 import { ExtendedPublicLog } from '../logs/extended_public_log.js';
 import { ExtendedUnencryptedL2Log } from '../logs/extended_unencrypted_l2_log.js';
+import type { ZodFor } from '../schemas/index.js';
 
 /** Response for the getContractClassLogs archiver call. */
 export type GetContractClassLogsResponse = {
diff --git a/yarn-project/stdlib/src/interfaces/l2_logs_source.ts b/yarn-project/stdlib/src/interfaces/l2_logs_source.ts
index b98c88c21ba5..01f27e5504b0 100644
--- a/yarn-project/stdlib/src/interfaces/l2_logs_source.ts
+++ b/yarn-project/stdlib/src/interfaces/l2_logs_source.ts
@@ -1,6 +1,8 @@
 import type { Fr } from '@aztec/foundation/fields';
-import { type LogFilter, PrivateLog, TxScopedL2Log } from '@aztec/stdlib/logs';
 
+import type { LogFilter } from '../logs/log_filter.js';
+import type { PrivateLog } from '../logs/private_log.js';
+import type { TxScopedL2Log } from '../logs/tx_scoped_l2_log.js';
 import type { GetContractClassLogsResponse, GetPublicLogsResponse } from './get_logs_response.js';
 
 /**
diff --git a/yarn-project/stdlib/src/interfaces/p2p-bootstrap.ts b/yarn-project/stdlib/src/interfaces/p2p-bootstrap.ts
index 0e181509c2a4..6a039e6e0bd5 100644
--- a/yarn-project/stdlib/src/interfaces/p2p-bootstrap.ts
+++ b/yarn-project/stdlib/src/interfaces/p2p-bootstrap.ts
@@ -1,7 +1,7 @@
-import type { ApiSchemaFor } from '@aztec/stdlib/schemas';
-
 import { z } from 'zod';
 
+import type { ApiSchemaFor } from '../schemas/index.js';
+
 /** Exposed API to the P2P bootstrap node. */
 export interface P2PBootstrapApi {
   /**
diff --git a/yarn-project/stdlib/src/interfaces/p2p.ts b/yarn-project/stdlib/src/interfaces/p2p.ts
index 1f8d48f9dd43..e04b2765b9d8 100644
--- a/yarn-project/stdlib/src/interfaces/p2p.ts
+++ b/yarn-project/stdlib/src/interfaces/p2p.ts
@@ -1,9 +1,8 @@
-import { type ApiSchemaFor, optional, schemas } from '@aztec/stdlib/schemas';
-
 import { z } from 'zod';
 
 import { BlockAttestation } from '../p2p/block_attestation.js';
 import type { P2PClientType } from '../p2p/client_type.js';
+import { type ApiSchemaFor, optional, schemas } from '../schemas/index.js';
 import { Tx } from '../tx/tx.js';
 
 export type PeerInfo =
diff --git a/yarn-project/stdlib/src/interfaces/prover-agent.ts b/yarn-project/stdlib/src/interfaces/prover-agent.ts
index 373734072d9e..1a8c06474778 100644
--- a/yarn-project/stdlib/src/interfaces/prover-agent.ts
+++ b/yarn-project/stdlib/src/interfaces/prover-agent.ts
@@ -1,7 +1,7 @@
-import type { ApiSchemaFor } from '@aztec/stdlib/schemas';
-
 import { z } from 'zod';
 
+import type { ApiSchemaFor } from '../schemas/index.js';
+
 export interface ProverAgentApi {
   setMaxConcurrency(maxConcurrency: number): Promise<void>;
 
diff --git a/yarn-project/stdlib/src/interfaces/prover-client.ts b/yarn-project/stdlib/src/interfaces/prover-client.ts
index 8f722b6f1e8e..5251c6998ff9 100644
--- a/yarn-project/stdlib/src/interfaces/prover-client.ts
+++ b/yarn-project/stdlib/src/interfaces/prover-client.ts
@@ -1,9 +1,9 @@
 import { type ConfigMappingsType, booleanConfigHelper, numberConfigHelper } from '@aztec/foundation/config';
 import { Fr } from '@aztec/foundation/fields';
-import { type ZodFor, schemas } from '@aztec/stdlib/schemas';
 
 import { z } from 'zod';
 
+import { type ZodFor, schemas } from '../schemas/index.js';
 import type { TxHash } from '../tx/tx_hash.js';
 import type { EpochProver } from './epoch-prover.js';
 import type { ProvingJobConsumer } from './prover-broker.js';
diff --git a/yarn-project/stdlib/src/interfaces/prover-coordination.ts b/yarn-project/stdlib/src/interfaces/prover-coordination.ts
index 10dfca73084a..6ce99c0f3dcb 100644
--- a/yarn-project/stdlib/src/interfaces/prover-coordination.ts
+++ b/yarn-project/stdlib/src/interfaces/prover-coordination.ts
@@ -1,9 +1,8 @@
-import type { ApiSchemaFor } from '@aztec/stdlib/schemas';
-import { TxHash } from '@aztec/stdlib/tx';
-
 import { z } from 'zod';
 
+import type { ApiSchemaFor } from '../schemas/index.js';
 import { Tx } from '../tx/tx.js';
+import { TxHash } from '../tx/tx_hash.js';
 
 /** Provides basic operations for ProverNodes to interact with other nodes in the network. */
 export interface ProverCoordination {
diff --git a/yarn-project/stdlib/src/interfaces/prover-node.ts b/yarn-project/stdlib/src/interfaces/prover-node.ts
index 24728a1b487b..683deacf20f0 100644
--- a/yarn-project/stdlib/src/interfaces/prover-node.ts
+++ b/yarn-project/stdlib/src/interfaces/prover-node.ts
@@ -1,7 +1,7 @@
-import { type ApiSchemaFor, schemas } from '@aztec/stdlib/schemas';
-
 import { z } from 'zod';
 
+import { type ApiSchemaFor, schemas } from '../schemas/index.js';
+
 const EpochProvingJobState = [
   'initialized',
   'processing',
diff --git a/yarn-project/stdlib/src/interfaces/proving-job-source.ts b/yarn-project/stdlib/src/interfaces/proving-job-source.ts
index d45d468e8abd..a05573791b20 100644
--- a/yarn-project/stdlib/src/interfaces/proving-job-source.ts
+++ b/yarn-project/stdlib/src/interfaces/proving-job-source.ts
@@ -1,7 +1,6 @@
-import type { ApiSchemaFor } from '@aztec/stdlib/schemas';
-
 import { z } from 'zod';
 
+import type { ApiSchemaFor } from '../schemas/index.js';
 import { ProvingJob, ProvingJobId, ProvingJobResult } from './proving-job.js';
 
 export interface ProvingJobSource {
diff --git a/yarn-project/stdlib/src/interfaces/server_circuit_prover.ts b/yarn-project/stdlib/src/interfaces/server_circuit_prover.ts
index 695121161eb4..d6b7e8c22949 100644
--- a/yarn-project/stdlib/src/interfaces/server_circuit_prover.ts
+++ b/yarn-project/stdlib/src/interfaces/server_circuit_prover.ts
@@ -5,23 +5,21 @@ import type {
   RECURSIVE_PROOF_LENGTH,
   TUBE_PROOF_LENGTH,
 } from '@aztec/constants';
-import type { AvmCircuitInputs } from '@aztec/stdlib/avm';
-import type { BaseParityInputs, ParityPublicInputs, RootParityInputs } from '@aztec/stdlib/parity';
-import type {
-  BaseOrMergeRollupPublicInputs,
-  BlockMergeRollupInputs,
-  BlockRootOrBlockMergePublicInputs,
-  BlockRootRollupInputs,
-  EmptyBlockRootRollupInputs,
-  MergeRollupInputs,
-  PrivateBaseRollupInputs,
-  PublicBaseRollupInputs,
-  RootRollupInputs,
-  RootRollupPublicInputs,
-  SingleTxBlockRootRollupInputs,
-  TubeInputs,
-} from '@aztec/stdlib/rollup';
 
+import type { AvmCircuitInputs } from '../avm/avm.js';
+import type { BaseParityInputs } from '../parity/base_parity_inputs.js';
+import type { ParityPublicInputs } from '../parity/parity_public_inputs.js';
+import type { RootParityInputs } from '../parity/root_parity_inputs.js';
+import type { BaseOrMergeRollupPublicInputs } from '../rollup/base_or_merge_rollup_public_inputs.js';
+import type { BlockMergeRollupInputs } from '../rollup/block_merge_rollup.js';
+import type { BlockRootOrBlockMergePublicInputs } from '../rollup/block_root_or_block_merge_public_inputs.js';
+import type { BlockRootRollupInputs, SingleTxBlockRootRollupInputs } from '../rollup/block_root_rollup.js';
+import type { EmptyBlockRootRollupInputs } from '../rollup/empty_block_root_rollup_inputs.js';
+import type { MergeRollupInputs } from '../rollup/merge_rollup.js';
+import type { PrivateBaseRollupInputs } from '../rollup/private_base_rollup_inputs.js';
+import type { PublicBaseRollupInputs } from '../rollup/public_base_rollup_inputs.js';
+import type { RootRollupInputs, RootRollupPublicInputs } from '../rollup/root_rollup.js';
+import type { TubeInputs } from '../rollup/tube_inputs.js';
 import type { Tx } from '../tx/tx.js';
 import type { ProofAndVerificationKey, PublicInputsAndRecursiveProof } from './proving-job.js';
 
diff --git a/yarn-project/stdlib/src/messaging/l2_actor.ts b/yarn-project/stdlib/src/messaging/l2_actor.ts
index e0f9d3bc6a36..db91a61f7b70 100644
--- a/yarn-project/stdlib/src/messaging/l2_actor.ts
+++ b/yarn-project/stdlib/src/messaging/l2_actor.ts
@@ -1,7 +1,8 @@
 import { randomInt } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
+
+import { AztecAddress } from '../aztec-address/index.js';
 
 /**
  * The recipient of an L2 message.
diff --git a/yarn-project/stdlib/src/tx/global_variable_builder.ts b/yarn-project/stdlib/src/tx/global_variable_builder.ts
index 52ff719cea7a..755118904199 100644
--- a/yarn-project/stdlib/src/tx/global_variable_builder.ts
+++ b/yarn-project/stdlib/src/tx/global_variable_builder.ts
@@ -1,8 +1,9 @@
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { Fr } from '@aztec/foundation/fields';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { GasFees } from '@aztec/stdlib/gas';
-import type { GlobalVariables } from '@aztec/stdlib/tx';
+
+import type { AztecAddress } from '../aztec-address/index.js';
+import type { GasFees } from '../gas/gas_fees.js';
+import type { GlobalVariables } from './global_variables.js';
 
 /**
  * Interface for building global variables for Aztec blocks.
diff --git a/yarn-project/stdlib/src/tx/tx_execution_request.ts b/yarn-project/stdlib/src/tx/tx_execution_request.ts
index bf29e3311797..9c9be764a438 100644
--- a/yarn-project/stdlib/src/tx/tx_execution_request.ts
+++ b/yarn-project/stdlib/src/tx/tx_execution_request.ts
@@ -2,18 +2,20 @@ import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import type { FieldsOf } from '@aztec/foundation/types';
-import { FunctionSelector } from '@aztec/stdlib/abi';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { type ZodFor, schemas } from '@aztec/stdlib/schemas';
-import { FunctionData, TxContext, TxRequest } from '@aztec/stdlib/tx';
-import { Vector } from '@aztec/stdlib/types';
 
 import { inspect } from 'util';
 import { z } from 'zod';
 
+import { FunctionSelector } from '../abi/function_selector.js';
 import { AuthWitness } from '../auth_witness/auth_witness.js';
+import { AztecAddress } from '../aztec-address/index.js';
+import { type ZodFor, schemas } from '../schemas/index.js';
+import { Vector } from '../types/shared.js';
 import { Capsule } from './capsule.js';
+import { FunctionData } from './function_data.js';
 import { HashedValues } from './hashed_values.js';
+import { TxContext } from './tx_context.js';
+import { TxRequest } from './tx_request.js';
 
 /**
  * Request to execute a transaction. Similar to TxRequest, but has the full args.
diff --git a/yarn-project/stdlib/src/versioning/versioning.test.ts b/yarn-project/stdlib/src/versioning/versioning.test.ts
index c3dd5126f79b..6826f5502fc1 100644
--- a/yarn-project/stdlib/src/versioning/versioning.test.ts
+++ b/yarn-project/stdlib/src/versioning/versioning.test.ts
@@ -2,10 +2,10 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { createSafeJsonRpcClient } from '@aztec/foundation/json-rpc/client';
 import { type JsonRpcTestContext, createJsonRpcTestSetup } from '@aztec/foundation/json-rpc/test';
-import type { ApiSchemaFor } from '@aztec/stdlib/schemas';
 
 import { z } from 'zod';
 
+import type { ApiSchemaFor } from '../schemas/index.js';
 import {
   type ComponentsVersions,
   checkCompressedComponentVersion,