diff --git a/packages/client/index.html b/pkg/client/index.html
similarity index 100%
rename from packages/client/index.html
rename to pkg/client/index.html
diff --git a/packages/client/package.json b/pkg/client/package.json
similarity index 100%
rename from packages/client/package.json
rename to pkg/client/package.json
diff --git a/packages/client/public/favicon.ico b/pkg/client/public/favicon.ico
similarity index 100%
rename from packages/client/public/favicon.ico
rename to pkg/client/public/favicon.ico
diff --git a/packages/client/public/views/back.svg b/pkg/client/public/views/back.svg
similarity index 100%
rename from packages/client/public/views/back.svg
rename to pkg/client/public/views/back.svg
diff --git a/packages/client/public/views/cards b/pkg/client/public/views/cards
similarity index 100%
rename from packages/client/public/views/cards
rename to pkg/client/public/views/cards
diff --git a/packages/client/src/api.ts b/pkg/client/src/api.ts
similarity index 100%
rename from packages/client/src/api.ts
rename to pkg/client/src/api.ts
diff --git a/packages/client/src/app.tsx b/pkg/client/src/app.tsx
similarity index 100%
rename from packages/client/src/app.tsx
rename to pkg/client/src/app.tsx
diff --git a/packages/client/src/components/Card.tsx b/pkg/client/src/components/Card.tsx
similarity index 100%
rename from packages/client/src/components/Card.tsx
rename to pkg/client/src/components/Card.tsx
diff --git a/packages/client/src/components/FannedHand.tsx b/pkg/client/src/components/FannedHand.tsx
similarity index 100%
rename from packages/client/src/components/FannedHand.tsx
rename to pkg/client/src/components/FannedHand.tsx
diff --git a/packages/client/src/components/Game.tsx b/pkg/client/src/components/Game.tsx
similarity index 100%
rename from packages/client/src/components/Game.tsx
rename to pkg/client/src/components/Game.tsx
diff --git a/packages/client/src/components/Hand.tsx b/pkg/client/src/components/Hand.tsx
similarity index 100%
rename from packages/client/src/components/Hand.tsx
rename to pkg/client/src/components/Hand.tsx
diff --git a/packages/client/src/components/Pile.tsx b/pkg/client/src/components/Pile.tsx
similarity index 100%
rename from packages/client/src/components/Pile.tsx
rename to pkg/client/src/components/Pile.tsx
diff --git a/packages/client/src/components/Player.tsx b/pkg/client/src/components/Player.tsx
similarity index 100%
rename from packages/client/src/components/Player.tsx
rename to pkg/client/src/components/Player.tsx
diff --git a/packages/client/src/components/Table.tsx b/pkg/client/src/components/Table.tsx
similarity index 100%
rename from packages/client/src/components/Table.tsx
rename to pkg/client/src/components/Table.tsx
diff --git a/packages/client/src/components/toolbox.tsx b/pkg/client/src/components/toolbox.tsx
similarity index 100%
rename from packages/client/src/components/toolbox.tsx
rename to pkg/client/src/components/toolbox.tsx
diff --git a/packages/client/src/fn.ts b/pkg/client/src/fn.ts
similarity index 100%
rename from packages/client/src/fn.ts
rename to pkg/client/src/fn.ts
diff --git a/packages/client/src/global.d.ts b/pkg/client/src/global.d.ts
similarity index 100%
rename from packages/client/src/global.d.ts
rename to pkg/client/src/global.d.ts
diff --git a/packages/client/src/profile.ts b/pkg/client/src/profile.ts
similarity index 100%
rename from packages/client/src/profile.ts
rename to pkg/client/src/profile.ts
diff --git a/packages/client/src/renaissance.ts b/pkg/client/src/renaissance.ts
similarity index 100%
rename from packages/client/src/renaissance.ts
rename to pkg/client/src/renaissance.ts
diff --git a/packages/client/src/routes/[table].tsx b/pkg/client/src/routes/[table].tsx
similarity index 100%
rename from packages/client/src/routes/[table].tsx
rename to pkg/client/src/routes/[table].tsx
diff --git a/packages/client/src/routes/index.tsx b/pkg/client/src/routes/index.tsx
similarity index 100%
rename from packages/client/src/routes/index.tsx
rename to pkg/client/src/routes/index.tsx
diff --git a/packages/client/src/style.css b/pkg/client/src/style.css
similarity index 100%
rename from packages/client/src/style.css
rename to pkg/client/src/style.css
diff --git a/packages/client/tsconfig.json b/pkg/client/tsconfig.json
similarity index 78%
rename from packages/client/tsconfig.json
rename to pkg/client/tsconfig.json
index 5c4db87..4727f8f 100644
--- a/packages/client/tsconfig.json
+++ b/pkg/client/tsconfig.json
@@ -14,9 +14,9 @@
 		"isolatedModules": true,
 		"paths": {
 			"^/*": ["./*"],
-			"@games/*": ["./packages/*"],
-			"$/*": ["./packages/client/*"],
-			"~/*": ["./packages/client/src/*"]
+			"@games/*": ["./pkg/*"],
+			"$/*": ["./pkg/client/*"],
+			"~/*": ["./pkg/client/src/*"]
 		}
 	}
 }
diff --git a/packages/client/uno.config.ts b/pkg/client/uno.config.ts
similarity index 100%
rename from packages/client/uno.config.ts
rename to pkg/client/uno.config.ts
diff --git a/packages/client/vite.config.ts b/pkg/client/vite.config.ts
similarity index 100%
rename from packages/client/vite.config.ts
rename to pkg/client/vite.config.ts
diff --git a/packages/server/.gitignore b/pkg/server/.gitignore
similarity index 100%
rename from packages/server/.gitignore
rename to pkg/server/.gitignore
diff --git a/packages/server/db/migrations/20250805231347_init/migration.sql b/pkg/server/db/migrations/20250805231347_init/migration.sql
similarity index 100%
rename from packages/server/db/migrations/20250805231347_init/migration.sql
rename to pkg/server/db/migrations/20250805231347_init/migration.sql
diff --git a/packages/server/db/migrations/20250809034803_strings_are_just_better/migration.sql b/pkg/server/db/migrations/20250809034803_strings_are_just_better/migration.sql
similarity index 100%
rename from packages/server/db/migrations/20250809034803_strings_are_just_better/migration.sql
rename to pkg/server/db/migrations/20250809034803_strings_are_just_better/migration.sql
diff --git a/packages/server/db/migrations/20250809191236_strings/migration.sql b/pkg/server/db/migrations/20250809191236_strings/migration.sql
similarity index 100%
rename from packages/server/db/migrations/20250809191236_strings/migration.sql
rename to pkg/server/db/migrations/20250809191236_strings/migration.sql
diff --git a/packages/server/db/migrations/20250809192322_humans/migration.sql b/pkg/server/db/migrations/20250809192322_humans/migration.sql
similarity index 100%
rename from packages/server/db/migrations/20250809192322_humans/migration.sql
rename to pkg/server/db/migrations/20250809192322_humans/migration.sql
diff --git a/packages/server/db/migrations/20250813041445_names_optional/migration.sql b/pkg/server/db/migrations/20250813041445_names_optional/migration.sql
similarity index 100%
rename from packages/server/db/migrations/20250813041445_names_optional/migration.sql
rename to pkg/server/db/migrations/20250813041445_names_optional/migration.sql
diff --git a/packages/server/db/migrations/20250818213152_tokens/migration.sql b/pkg/server/db/migrations/20250818213152_tokens/migration.sql
similarity index 100%
rename from packages/server/db/migrations/20250818213152_tokens/migration.sql
rename to pkg/server/db/migrations/20250818213152_tokens/migration.sql
diff --git a/packages/server/db/migrations/20250819011115_gamestate_nullable/migration.sql b/pkg/server/db/migrations/20250819011115_gamestate_nullable/migration.sql
similarity index 100%
rename from packages/server/db/migrations/20250819011115_gamestate_nullable/migration.sql
rename to pkg/server/db/migrations/20250819011115_gamestate_nullable/migration.sql
diff --git a/packages/server/db/migrations/migration_lock.toml b/pkg/server/db/migrations/migration_lock.toml
similarity index 100%
rename from packages/server/db/migrations/migration_lock.toml
rename to pkg/server/db/migrations/migration_lock.toml
diff --git a/packages/server/db/schema.prisma b/pkg/server/db/schema.prisma
similarity index 100%
rename from packages/server/db/schema.prisma
rename to pkg/server/db/schema.prisma
diff --git a/packages/server/package.json b/pkg/server/package.json
similarity index 100%
rename from packages/server/package.json
rename to pkg/server/package.json
diff --git a/packages/server/prisma.config.ts b/pkg/server/prisma.config.ts
similarity index 100%
rename from packages/server/prisma.config.ts
rename to pkg/server/prisma.config.ts
diff --git a/packages/server/src/api.ts b/pkg/server/src/api.ts
similarity index 100%
rename from packages/server/src/api.ts
rename to pkg/server/src/api.ts
diff --git a/packages/server/src/db.ts b/pkg/server/src/db.ts
similarity index 100%
rename from packages/server/src/db.ts
rename to pkg/server/src/db.ts
diff --git a/packages/server/src/human.ts b/pkg/server/src/human.ts
similarity index 100%
rename from packages/server/src/human.ts
rename to pkg/server/src/human.ts
diff --git a/packages/server/src/index.ts b/pkg/server/src/index.ts
similarity index 100%
rename from packages/server/src/index.ts
rename to pkg/server/src/index.ts
diff --git a/packages/server/src/kefir-extension.ts b/pkg/server/src/kefir-extension.ts
similarity index 100%
rename from packages/server/src/kefir-extension.ts
rename to pkg/server/src/kefir-extension.ts
diff --git a/packages/server/src/logging.ts b/pkg/server/src/logging.ts
similarity index 100%
rename from packages/server/src/logging.ts
rename to pkg/server/src/logging.ts
diff --git a/packages/server/src/table.ts b/pkg/server/src/table.ts
similarity index 100%
rename from packages/server/src/table.ts
rename to pkg/server/src/table.ts
diff --git a/packages/server/tsconfig.json b/pkg/server/tsconfig.json
similarity index 100%
rename from packages/server/tsconfig.json
rename to pkg/server/tsconfig.json
diff --git a/packages/shared/cards.ts b/pkg/shared/cards.ts
similarity index 100%
rename from packages/shared/cards.ts
rename to pkg/shared/cards.ts
diff --git a/packages/shared/games/index.ts b/pkg/shared/games/index.ts
similarity index 100%
rename from packages/shared/games/index.ts
rename to pkg/shared/games/index.ts
diff --git a/packages/shared/games/renaissance.ts b/pkg/shared/games/renaissance.ts
similarity index 100%
rename from packages/shared/games/renaissance.ts
rename to pkg/shared/games/renaissance.ts
diff --git a/packages/shared/games/simple.ts b/pkg/shared/games/simple.ts
similarity index 100%
rename from packages/shared/games/simple.ts
rename to pkg/shared/games/simple.ts
diff --git a/packages/shared/package.json b/pkg/shared/package.json
similarity index 100%
rename from packages/shared/package.json
rename to pkg/shared/package.json
diff --git a/packages/shared/tsconfig.json b/pkg/shared/tsconfig.json
similarity index 100%
rename from packages/shared/tsconfig.json
rename to pkg/shared/tsconfig.json
diff --git a/packages/shared/utils.ts b/pkg/shared/utils.ts
similarity index 100%
rename from packages/shared/utils.ts
rename to pkg/shared/utils.ts
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index a206693..523603b 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -2,4 +2,4 @@ onlyBuiltDependencies:
     - "@parcel/watcher"
     - esbuild
 packages:
-    - "packages/*"
+    - "pkg/*"
diff --git a/tsconfig.json b/tsconfig.json
index 15651b3..6ed49ef 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,7 +2,7 @@
 	"compilerOptions": {
 		"baseUrl": ".",
 		"paths": {
-			"@games/*": ["packages/*"]
+			"@games/*": ["pkg/*"]
 		}
 	}
 }