diff --git a/packages/lex-gql-sqlite/package.json b/packages/lex-gql-sqlite/package.json
index 186e88c..a96b3a9 100644
--- a/packages/lex-gql-sqlite/package.json
+++ b/packages/lex-gql-sqlite/package.json
@@ -3,12 +3,12 @@
   "version": "0.1.0",
   "description": "SQLite adapter for lex-gql",
   "type": "module",
-  "main": "lex-gql-sqlite.js",
-  "types": "lex-gql-sqlite.d.ts",
+  "main": "src/lex-gql-sqlite.js",
+  "types": "src/lex-gql-sqlite.d.ts",
   "exports": {
     ".": {
-      "types": "./lex-gql-sqlite.d.ts",
-      "default": "./lex-gql-sqlite.js"
+      "types": "./src/lex-gql-sqlite.d.ts",
+      "default": "./src/lex-gql-sqlite.js"
     }
   },
   "scripts": {
diff --git a/packages/lex-gql-sqlite/lex-gql-sqlite.d.ts b/packages/lex-gql-sqlite/src/lex-gql-sqlite.d.ts
similarity index 100%
rename from packages/lex-gql-sqlite/lex-gql-sqlite.d.ts
rename to packages/lex-gql-sqlite/src/lex-gql-sqlite.d.ts
diff --git a/packages/lex-gql-sqlite/lex-gql-sqlite.js b/packages/lex-gql-sqlite/src/lex-gql-sqlite.js
similarity index 100%
rename from packages/lex-gql-sqlite/lex-gql-sqlite.js
rename to packages/lex-gql-sqlite/src/lex-gql-sqlite.js
diff --git a/packages/lex-gql-sqlite/lex-gql-sqlite.test.js b/packages/lex-gql-sqlite/test/lex-gql-sqlite.test.js
similarity index 99%
rename from packages/lex-gql-sqlite/lex-gql-sqlite.test.js
rename to packages/lex-gql-sqlite/test/lex-gql-sqlite.test.js
index db18c68..d57ad3b 100644
--- a/packages/lex-gql-sqlite/lex-gql-sqlite.test.js
+++ b/packages/lex-gql-sqlite/test/lex-gql-sqlite.test.js
@@ -6,7 +6,7 @@ import {
   createSqliteAdapter,
   createWriter,
   setupSchema,
-} from './lex-gql-sqlite.js';
+} from '../src/lex-gql-sqlite.js';
 
 describe('setupSchema', () => {
   let db;
diff --git a/packages/lex-gql-sqlite/tsconfig.json b/packages/lex-gql-sqlite/tsconfig.json
index ef9c737..d99727e 100644
--- a/packages/lex-gql-sqlite/tsconfig.json
+++ b/packages/lex-gql-sqlite/tsconfig.json
@@ -7,6 +7,6 @@
     "emitDeclarationOnly": true,
     "types": ["node"]
   },
-  "include": ["lex-gql-sqlite.js"],
-  "exclude": ["node_modules"]
+  "include": ["src/lex-gql-sqlite.js"],
+  "exclude": ["node_modules", "test"]
 }
diff --git a/packages/lex-gql/package.json b/packages/lex-gql/package.json
index 44d7322..756ee6e 100644
--- a/packages/lex-gql/package.json
+++ b/packages/lex-gql/package.json
@@ -4,11 +4,11 @@
   "description": "Generate a complete GraphQL API from AT Protocol lexicons",
   "license": "MIT",
   "type": "module",
-  "main": "lex-gql.js",
-  "types": "lex-gql.d.ts",
+  "main": "src/lex-gql.js",
+  "types": "src/lex-gql.d.ts",
   "files": [
-    "lex-gql.js",
-    "lex-gql.d.ts"
+    "src/lex-gql.js",
+    "src/lex-gql.d.ts"
   ],
   "keywords": [
     "graphql",
diff --git a/packages/lex-gql/lex-gql.d.ts b/packages/lex-gql/src/lex-gql.d.ts
similarity index 100%
rename from packages/lex-gql/lex-gql.d.ts
rename to packages/lex-gql/src/lex-gql.d.ts
diff --git a/packages/lex-gql/lex-gql.js b/packages/lex-gql/src/lex-gql.js
similarity index 100%
rename from packages/lex-gql/lex-gql.js
rename to packages/lex-gql/src/lex-gql.js
diff --git a/packages/lex-gql/test/compare-schemas.js b/packages/lex-gql/test/compare-schemas.js
index 6f1085f..311b185 100644
--- a/packages/lex-gql/test/compare-schemas.js
+++ b/packages/lex-gql/test/compare-schemas.js
@@ -4,7 +4,7 @@
 import { readdirSync, readFileSync, statSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { printSchema } from 'graphql';
-import { buildSchema, parseLexicon } from '../lex-gql.js';
+import { buildSchema, parseLexicon } from '../src/lex-gql.js';
 
 // Load all lexicon files recursively
 function loadLexicons(dir) {
@@ -54,7 +54,7 @@ function parseTypes(sdl) {
 
 // Main comparison
 console.log('Loading lexicons...');
-const lexicons = loadLexicons('./test/lexicons');
+const lexicons = loadLexicons('./lexicons');
 console.log(`Loaded ${lexicons.length} lexicons`);
 
 console.log('\nParsing lexicons...');
@@ -65,10 +65,10 @@ const schema = buildSchema(parsedLexicons);
 const generatedSdl = printSchema(schema);
 
 console.log('Loading oracle schema...');
-const oracleSdl = readFileSync('./test/schema.graphql', 'utf-8');
+const oracleSdl = readFileSync('./schema.graphql', 'utf-8');
 
 // Write generated schema for manual comparison
-writeFileSync('./test/generated-schema.graphql', generatedSdl);
+writeFileSync('./generated-schema.graphql', generatedSdl);
 console.log('Written generated-schema.graphql');
 
 // Parse types
diff --git a/packages/lex-gql/lex-gql.test.js b/packages/lex-gql/test/lex-gql.test.js
similarity index 99%
rename from packages/lex-gql/lex-gql.test.js
rename to packages/lex-gql/test/lex-gql.test.js
index b4dd7af..a917d33 100644
--- a/packages/lex-gql/lex-gql.test.js
+++ b/packages/lex-gql/test/lex-gql.test.js
@@ -19,7 +19,7 @@ import {
   parseRefUri,
   refToTypeName,
   resolveRefKey,
-} from './lex-gql.js';
+} from '../src/lex-gql.js';
 
 // Load all lexicon files recursively
 function loadLexicons(dir) {
@@ -37,7 +37,7 @@ function loadLexicons(dir) {
   return lexicons;
 }
 
-const LEXICONS_DIR = new URL('./test/lexicons', import.meta.url).pathname;
+const LEXICONS_DIR = new URL('./lexicons', import.meta.url).pathname;
 const realLexicons = loadLexicons(LEXICONS_DIR);
 
 describe('NSID utilities', () => {
@@ -2399,7 +2399,7 @@ describe('Schema Comparison', () => {
 
   it('compares generated schema against oracle', () => {
     const oracleSchema = readFileSync(
-      new URL('./test/schema.graphql', import.meta.url).pathname,
+      new URL('./schema.graphql', import.meta.url).pathname,
       'utf-8',
     );
 
@@ -2455,7 +2455,7 @@ describe('Schema Comparison', () => {
 
   it('achieves target type coverage against oracle', () => {
     const oracleSchema = readFileSync(
-      new URL('./test/schema.graphql', import.meta.url).pathname,
+      new URL('./schema.graphql', import.meta.url).pathname,
       'utf-8',
     );
     const parsedLexicons = realLexicons.map((l) => parseLexicon(l.content));
@@ -2486,17 +2486,17 @@ describe('Schema Comparison', () => {
 
 describe('Public API', () => {
   it('exports createAdapter as main entry point', async () => {
-    const { createAdapter } = await import('./lex-gql.js');
+    const { createAdapter } = await import('../src/lex-gql.js');
     expect(typeof createAdapter).toBe('function');
   });
 
   it('exports parseLexicon for parsing lexicon JSON', async () => {
-    const { parseLexicon } = await import('./lex-gql.js');
+    const { parseLexicon } = await import('../src/lex-gql.js');
     expect(typeof parseLexicon).toBe('function');
   });
 
   it('exports buildSchema for schema-only use cases', async () => {
-    const { buildSchema } = await import('./lex-gql.js');
+    const { buildSchema } = await import('../src/lex-gql.js');
     expect(typeof buildSchema).toBe('function');
   });
 
@@ -2508,7 +2508,7 @@ describe('Public API', () => {
       parseRefUri,
       refToTypeName,
       mapLexiconType,
-    } = await import('./lex-gql.js');
+    } = await import('../src/lex-gql.js');
 
     expect(typeof nsidToTypeName).toBe('function');
     expect(typeof nsidToFieldName).toBe('function');
@@ -2519,7 +2519,7 @@ describe('Public API', () => {
   });
 
   it('exports error types', async () => {
-    const { LexGqlError, ErrorCodes } = await import('./lex-gql.js');
+    const { LexGqlError, ErrorCodes } = await import('../src/lex-gql.js');
     expect(LexGqlError).toBeDefined();
     expect(ErrorCodes).toBeDefined();
   });
diff --git a/packages/lex-gql/tsconfig.json b/packages/lex-gql/tsconfig.json
index c6ebd55..4867ce1 100644
--- a/packages/lex-gql/tsconfig.json
+++ b/packages/lex-gql/tsconfig.json
@@ -7,6 +7,6 @@
     "emitDeclarationOnly": true,
     "types": ["node"]
   },
-  "include": ["lex-gql.js"],
+  "include": ["src/lex-gql.js"],
   "exclude": ["node_modules", "test"]
 }