diff --git a/packages/core/package.json b/packages/core/package.json
index 99a8d58..872db92 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -2,7 +2,6 @@
   "type": "module",
   "main": "src/exports.ts",
   "scripts": {
-    "build": "tsc --build",
     "test:unit": "vitest --run --passWithNoTests",
     "test": "pnpm run \"/^test:/\""
   },
@@ -34,4 +33,4 @@
     "pg": "^8.16.3",
     "zod": "^4.1.5"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
index d5439d6..9f1a0af 100644
--- a/packages/core/tsconfig.json
+++ b/packages/core/tsconfig.json
@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
     "outDir": "./dist",
+    "rootDir": "./src",
     "paths": {
       "#root/*": ["./src"]
     }
diff --git a/packages/server/bin/cli.js b/packages/server/bin/cli.js
new file mode 100755
index 0000000..1988bae
--- /dev/null
+++ b/packages/server/bin/cli.js
@@ -0,0 +1,3 @@
+#!/usr/bin/env node --no-warnings
+
+import '../src/cli.ts';
diff --git a/packages/server/package.json b/packages/server/package.json
index c3caa8a..d3857d8 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,20 +1,24 @@
 {
   "type": "module",
-  "main": "dist/exports.js",
+  "bin": {
+    "fluxcurrent-server": "./bin/cli.js"
+  },
+  "main": "./src/start.ts",
   "scripts": {
-    "build": "tsc --build",
+    "dev": "node --watch --no-warnings ./bin/cli.js",
     "test:unit": "vitest --run --passWithNoTests",
     "test": "pnpm run \"/^test:/\""
   },
   "packageManager": "pnpm@10.6.0",
   "files": [
-    "dist"
+    "bin",
+    "src"
   ],
   "imports": {
     "#root/*": "./src/*"
   },
   "exports": {
-    ".": "./dist/exports.js"
+    ".": "./src/exports.ts"
   },
   "devDependencies": {
     "@morten-olsen/fluxcurrent-configs": "workspace:*",
diff --git a/packages/server/src/start.ts b/packages/server/src/cli.ts
similarity index 100%
rename from packages/server/src/start.ts
rename to packages/server/src/cli.ts
diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json
index 382e78a..ffc25ae 100644
--- a/packages/server/tsconfig.json
+++ b/packages/server/tsconfig.json
@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
     "outDir": "./dist",
+    "rootDir": "./src",
     "paths": {
       "#root/*": ["./src"]
     }