diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f87e8a7..c16c31c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [main, develop]
+    branches: [master, develop]
   pull_request:
-    branches: [main, develop]
+    branches: [master, develop]
 
 jobs:
   build-and-test:
@@ -27,14 +27,23 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
-      - name: Build packages
-        run: npm run build
+      - name: Build packages (only published packages)
+        run: |
+          npm run build:shared
+          npm run build:core
+          npm run build:cli
 
-      - name: Run linter
-        run: npm run lint --if-present
+      - name: Run linter (only published packages)
+        run: |
+          npm run lint --workspace=packages/shared --if-present
+          npm run lint --workspace=packages/core --if-present
+          npm run lint --workspace=packages/cli --if-present
 
-      - name: Run tests
-        run: npm test --if-present
+      - name: Run tests (only published packages)
+        run: |
+          npm test --workspace=packages/shared --if-present
+          npm test --workspace=packages/core --if-present
+          npm test --workspace=packages/cli --if-present
 
       - name: Check package integrity
         run: |
@@ -68,18 +77,21 @@ jobs:
       - name: Install Node dependencies
         run: npm ci
 
-      - name: Build packages
-        run: npm run build
+      - name: Build packages (only published packages)
+        run: |
+          npm run build:shared
+          npm run build:core
+          npm run build:cli
 
-      - name: Create test project
+      - name: Build Android client
         run: |
-          npx jetstart create test-ci-app --package com.jetstart.ci
-          cd test-ci-app
+          cd packages/client
+          chmod +x gradlew
           ./gradlew assembleDebug --no-daemon
 
       - name: Upload APK artifact
         uses: actions/upload-artifact@v4
         with:
-          name: test-app-debug
-          path: test-ci-app/app/build/outputs/apk/debug/app-debug.apk
+          name: jetstart-client-debug
+          path: packages/client/app/build/outputs/apk/debug/app-debug.apk
           retention-days: 7
diff --git a/.gitignore b/.gitignore
index b34b6aa..f4885b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,7 @@ pnpm-debug.log*
 *.dex
 *.class
 bin/
+!packages/cli/bin/
 gen/
 out/
 .gradle/
diff --git a/package.json b/package.json
index a30350f..2c01078 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/phantom/jetstart.git"
+    "url": "https://github.com/dev-phantom/jetstart.git"
   },
   "keywords": [
     "android",
@@ -41,11 +41,11 @@
     "mobile-development"
   ],
   "author": "Phantom",
-  "license": "Apache-2.0",
+  "license": "MIT",
   "bugs": {
-    "url": "https://github.com/phantom/jetstart/issues"
+    "url": "https://github.com/dev-phantom/jetstart/issues"
   },
-  "homepage": "https://github.com/phantom/jetstart#readme",
+  "homepage": "https://github.com/dev-phantom/jetstart#readme",
   "engines": {
     "node": ">=18.0.0",
     "npm": ">=9.0.0"
diff --git a/packages/cli/bin/jetstart.js b/packages/cli/bin/jetstart.js
new file mode 100644
index 0000000..9618031
--- /dev/null
+++ b/packages/cli/bin/jetstart.js
@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('../dist/cli.js');
diff --git a/packages/cli/package.json b/packages/cli/package.json
index afdf15d..f916cbe 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -25,7 +25,16 @@
     "jetpack-compose"
   ],
   "author": "Phantom",
-  "license": "Apache-2.0",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dev-phantom/jetstart.git",
+    "directory": "packages/cli"
+  },
+  "bugs": {
+    "url": "https://github.com/dev-phantom/jetstart/issues"
+  },
+  "homepage": "https://github.com/dev-phantom/jetstart#readme",
   "dependencies": {
     "@jetstart/shared": "0.1.0",
     "axios": "^1.6.2",
diff --git a/packages/core/package.json b/packages/core/package.json
index 63a0bfb..7d497cd 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -22,7 +22,16 @@
     "websocket"
   ],
   "author": "Phantom",
-  "license": "Apache-2.0",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dev-phantom/jetstart.git",
+    "directory": "packages/core"
+  },
+  "bugs": {
+    "url": "https://github.com/dev-phantom/jetstart/issues"
+  },
+  "homepage": "https://github.com/dev-phantom/jetstart#readme",
   "dependencies": {
     "@jetstart/shared": "0.1.0",
     "express": "^4.18.2",
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 93d3414..6f90e4d 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -20,7 +20,16 @@
     "protocols"
   ],
   "author": "Phantom",
-  "license": "Apache-2.0",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dev-phantom/jetstart.git",
+    "directory": "packages/shared"
+  },
+  "bugs": {
+    "url": "https://github.com/dev-phantom/jetstart/issues"
+  },
+  "homepage": "https://github.com/dev-phantom/jetstart#readme",
   "devDependencies": {
     "@types/jest": "29.5.14",
     "@types/node": "^20.10.0",