diff --git a/packages/postgres-best-practices-build/package-lock.json b/packages/skills-build/package-lock.json
similarity index 100%
rename from packages/postgres-best-practices-build/package-lock.json
rename to packages/skills-build/package-lock.json
diff --git a/packages/postgres-best-practices-build/package.json b/packages/skills-build/package.json
similarity index 100%
rename from packages/postgres-best-practices-build/package.json
rename to packages/skills-build/package.json
diff --git a/packages/postgres-best-practices-build/src/build.ts b/packages/skills-build/src/postgres/build.ts
similarity index 99%
rename from packages/postgres-best-practices-build/src/build.ts
rename to packages/skills-build/src/postgres/build.ts
index f858c87..56503b7 100644
--- a/packages/postgres-best-practices-build/src/build.ts
+++ b/packages/skills-build/src/postgres/build.ts
@@ -2,7 +2,7 @@ import { existsSync, readdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, join } from "node:path";
 import { AGENTS_OUTPUT, METADATA_FILE, RULES_DIR } from "./config.js";
 import { parseRuleFile } from "./parser.js";
-import type { Metadata, Rule, Section } from "./types.js";
+import type { Metadata, Rule, Section } from "../types.js";
 import { validateRuleFile } from "./validate.js";
 
 /**
diff --git a/packages/postgres-best-practices-build/src/config.ts b/packages/skills-build/src/postgres/config.ts
similarity index 89%
rename from packages/postgres-best-practices-build/src/config.ts
rename to packages/skills-build/src/postgres/config.ts
index 33bc32c..4b911d7 100644
--- a/packages/postgres-best-practices-build/src/config.ts
+++ b/packages/skills-build/src/postgres/config.ts
@@ -4,8 +4,8 @@ import { fileURLToPath } from "node:url";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-// Build package directory
-export const BUILD_DIR = join(__dirname, "..");
+// Build package directory (now we're in src/postgres/, so go up two levels)
+export const BUILD_DIR = join(__dirname, "../..");
 
 // Skill directory (relative to build package)
 export const SKILL_DIR = join(
diff --git a/packages/postgres-best-practices-build/src/parser.ts b/packages/skills-build/src/postgres/parser.ts
similarity index 99%
rename from packages/postgres-best-practices-build/src/parser.ts
rename to packages/skills-build/src/postgres/parser.ts
index 6efee67..58c1332 100644
--- a/packages/postgres-best-practices-build/src/parser.ts
+++ b/packages/skills-build/src/postgres/parser.ts
@@ -1,7 +1,7 @@
 import { readFileSync } from "node:fs";
 import { basename } from "node:path";
 import { IMPACT_LEVELS } from "./config.js";
-import type { CodeExample, ImpactLevel, ParseResult, Rule } from "./types.js";
+import type { CodeExample, ImpactLevel, ParseResult, Rule } from "../types.js";
 
 /**
  * Parse YAML-style frontmatter from markdown content
diff --git a/packages/postgres-best-practices-build/src/validate.ts b/packages/skills-build/src/postgres/validate.ts
similarity index 99%
rename from packages/postgres-best-practices-build/src/validate.ts
rename to packages/skills-build/src/postgres/validate.ts
index fa43909..f15b77d 100644
--- a/packages/postgres-best-practices-build/src/validate.ts
+++ b/packages/skills-build/src/postgres/validate.ts
@@ -3,7 +3,7 @@ import { basename, join } from "node:path";
 import { generateSectionMap, parseSections } from "./build.js";
 import { IMPACT_LEVELS, RULES_DIR } from "./config.js";
 import { parseRuleFile } from "./parser.js";
-import type { ValidationResult } from "./types.js";
+import type { ValidationResult } from "../types.js";
 
 /**
  * Check if an example label indicates a "bad" pattern
diff --git a/packages/postgres-best-practices-build/src/types.ts b/packages/skills-build/src/types.ts
similarity index 100%
rename from packages/postgres-best-practices-build/src/types.ts
rename to packages/skills-build/src/types.ts
diff --git a/packages/postgres-best-practices-build/tsconfig.json b/packages/skills-build/tsconfig.json
similarity index 100%
rename from packages/postgres-best-practices-build/tsconfig.json
rename to packages/skills-build/tsconfig.json