diff --git a/server/cmd/llamactl.go b/cmd/server/main.go
similarity index 100%
rename from server/cmd/llamactl.go
rename to cmd/server/main.go
diff --git a/server/docs/docs.go b/docs/docs.go
similarity index 100%
rename from server/docs/docs.go
rename to docs/docs.go
diff --git a/server/docs/swagger.json b/docs/swagger.json
similarity index 100%
rename from server/docs/swagger.json
rename to docs/swagger.json
diff --git a/server/docs/swagger.yaml b/docs/swagger.yaml
similarity index 100%
rename from server/docs/swagger.yaml
rename to docs/swagger.yaml
diff --git a/server/go.mod b/go.mod
similarity index 100%
rename from server/go.mod
rename to go.mod
diff --git a/server/go.sum b/go.sum
similarity index 100%
rename from server/go.sum
rename to go.sum
diff --git a/server/pkg/config.go b/pkg/config.go
similarity index 100%
rename from server/pkg/config.go
rename to pkg/config.go
diff --git a/server/pkg/handlers.go b/pkg/handlers.go
similarity index 100%
rename from server/pkg/handlers.go
rename to pkg/handlers.go
diff --git a/server/pkg/instance.go b/pkg/instance.go
similarity index 100%
rename from server/pkg/instance.go
rename to pkg/instance.go
diff --git a/server/pkg/lifecycle.go b/pkg/lifecycle.go
similarity index 100%
rename from server/pkg/lifecycle.go
rename to pkg/lifecycle.go
diff --git a/server/pkg/llama.go b/pkg/llama.go
similarity index 100%
rename from server/pkg/llama.go
rename to pkg/llama.go
diff --git a/server/pkg/logging.go b/pkg/logging.go
similarity index 100%
rename from server/pkg/logging.go
rename to pkg/logging.go
diff --git a/server/pkg/manager.go b/pkg/manager.go
similarity index 100%
rename from server/pkg/manager.go
rename to pkg/manager.go
diff --git a/server/pkg/routes.go b/pkg/routes.go
similarity index 100%
rename from server/pkg/routes.go
rename to pkg/routes.go
diff --git a/server/pkg/validation.go b/pkg/validation.go
similarity index 100%
rename from server/pkg/validation.go
rename to pkg/validation.go
diff --git a/ui/components.json b/webui/components.json
similarity index 100%
rename from ui/components.json
rename to webui/components.json
diff --git a/ui/index.html b/webui/index.html
similarity index 100%
rename from ui/index.html
rename to webui/index.html
diff --git a/ui/package-lock.json b/webui/package-lock.json
similarity index 100%
rename from ui/package-lock.json
rename to webui/package-lock.json
diff --git a/ui/package.json b/webui/package.json
similarity index 100%
rename from ui/package.json
rename to webui/package.json
diff --git a/ui/src/App.tsx b/webui/src/App.tsx
similarity index 100%
rename from ui/src/App.tsx
rename to webui/src/App.tsx
diff --git a/ui/src/components/Header.tsx b/webui/src/components/Header.tsx
similarity index 100%
rename from ui/src/components/Header.tsx
rename to webui/src/components/Header.tsx
diff --git a/ui/src/components/HealthBadge.tsx b/webui/src/components/HealthBadge.tsx
similarity index 100%
rename from ui/src/components/HealthBadge.tsx
rename to webui/src/components/HealthBadge.tsx
diff --git a/ui/src/components/InstanceCard.tsx b/webui/src/components/InstanceCard.tsx
similarity index 100%
rename from ui/src/components/InstanceCard.tsx
rename to webui/src/components/InstanceCard.tsx
diff --git a/ui/src/components/InstanceList.tsx b/webui/src/components/InstanceList.tsx
similarity index 100%
rename from ui/src/components/InstanceList.tsx
rename to webui/src/components/InstanceList.tsx
diff --git a/ui/src/components/InstanceModal.tsx b/webui/src/components/InstanceModal.tsx
similarity index 100%
rename from ui/src/components/InstanceModal.tsx
rename to webui/src/components/InstanceModal.tsx
diff --git a/ui/src/components/LogModal.tsx b/webui/src/components/LogModal.tsx
similarity index 100%
rename from ui/src/components/LogModal.tsx
rename to webui/src/components/LogModal.tsx
diff --git a/ui/src/components/SystemInfoModal.tsx b/webui/src/components/SystemInfoModal.tsx
similarity index 100%
rename from ui/src/components/SystemInfoModal.tsx
rename to webui/src/components/SystemInfoModal.tsx
diff --git a/ui/src/components/ZodFormField.tsx b/webui/src/components/ZodFormField.tsx
similarity index 100%
rename from ui/src/components/ZodFormField.tsx
rename to webui/src/components/ZodFormField.tsx
diff --git a/ui/src/components/ui/badge.tsx b/webui/src/components/ui/badge.tsx
similarity index 100%
rename from ui/src/components/ui/badge.tsx
rename to webui/src/components/ui/badge.tsx
diff --git a/ui/src/components/ui/button.tsx b/webui/src/components/ui/button.tsx
similarity index 100%
rename from ui/src/components/ui/button.tsx
rename to webui/src/components/ui/button.tsx
diff --git a/ui/src/components/ui/card.tsx b/webui/src/components/ui/card.tsx
similarity index 100%
rename from ui/src/components/ui/card.tsx
rename to webui/src/components/ui/card.tsx
diff --git a/ui/src/components/ui/checkbox.tsx b/webui/src/components/ui/checkbox.tsx
similarity index 100%
rename from ui/src/components/ui/checkbox.tsx
rename to webui/src/components/ui/checkbox.tsx
diff --git a/ui/src/components/ui/dialog.tsx b/webui/src/components/ui/dialog.tsx
similarity index 100%
rename from ui/src/components/ui/dialog.tsx
rename to webui/src/components/ui/dialog.tsx
diff --git a/ui/src/components/ui/input.tsx b/webui/src/components/ui/input.tsx
similarity index 100%
rename from ui/src/components/ui/input.tsx
rename to webui/src/components/ui/input.tsx
diff --git a/ui/src/components/ui/label.tsx b/webui/src/components/ui/label.tsx
similarity index 100%
rename from ui/src/components/ui/label.tsx
rename to webui/src/components/ui/label.tsx
diff --git a/ui/src/contexts/InstancesContext.tsx b/webui/src/contexts/InstancesContext.tsx
similarity index 100%
rename from ui/src/contexts/InstancesContext.tsx
rename to webui/src/contexts/InstancesContext.tsx
diff --git a/ui/src/hooks/useInstanceHealth.ts b/webui/src/hooks/useInstanceHealth.ts
similarity index 100%
rename from ui/src/hooks/useInstanceHealth.ts
rename to webui/src/hooks/useInstanceHealth.ts
diff --git a/ui/src/index.css b/webui/src/index.css
similarity index 100%
rename from ui/src/index.css
rename to webui/src/index.css
diff --git a/ui/src/lib/api.ts b/webui/src/lib/api.ts
similarity index 100%
rename from ui/src/lib/api.ts
rename to webui/src/lib/api.ts
diff --git a/ui/src/lib/healthService.ts b/webui/src/lib/healthService.ts
similarity index 100%
rename from ui/src/lib/healthService.ts
rename to webui/src/lib/healthService.ts
diff --git a/ui/src/lib/utils.ts b/webui/src/lib/utils.ts
similarity index 100%
rename from ui/src/lib/utils.ts
rename to webui/src/lib/utils.ts
diff --git a/ui/src/lib/zodFormUtils.ts b/webui/src/lib/zodFormUtils.ts
similarity index 100%
rename from ui/src/lib/zodFormUtils.ts
rename to webui/src/lib/zodFormUtils.ts
diff --git a/ui/src/main.tsx b/webui/src/main.tsx
similarity index 100%
rename from ui/src/main.tsx
rename to webui/src/main.tsx
diff --git a/ui/src/schemas/instanceOptions.ts b/webui/src/schemas/instanceOptions.ts
similarity index 100%
rename from ui/src/schemas/instanceOptions.ts
rename to webui/src/schemas/instanceOptions.ts
diff --git a/ui/src/types/instance.ts b/webui/src/types/instance.ts
similarity index 100%
rename from ui/src/types/instance.ts
rename to webui/src/types/instance.ts
diff --git a/ui/tsconfig.json b/webui/tsconfig.json
similarity index 100%
rename from ui/tsconfig.json
rename to webui/tsconfig.json
diff --git a/ui/tsconfig.node.json b/webui/tsconfig.node.json
similarity index 100%
rename from ui/tsconfig.node.json
rename to webui/tsconfig.node.json
diff --git a/ui/vite.config.ts b/webui/vite.config.ts
similarity index 100%
rename from ui/vite.config.ts
rename to webui/vite.config.ts