diff --git a/charts/openclaw/Chart.yaml b/helm/openclaw/Chart.yaml
similarity index 100%
rename from charts/openclaw/Chart.yaml
rename to helm/openclaw/Chart.yaml
diff --git a/charts/openclaw/README.md b/helm/openclaw/README.md
similarity index 100%
rename from charts/openclaw/README.md
rename to helm/openclaw/README.md
diff --git a/charts/openclaw/TROUBLESHOOTING.md b/helm/openclaw/TROUBLESHOOTING.md
similarity index 100%
rename from charts/openclaw/TROUBLESHOOTING.md
rename to helm/openclaw/TROUBLESHOOTING.md
diff --git a/charts/openclaw/templates/NOTES.txt b/helm/openclaw/templates/NOTES.txt
similarity index 100%
rename from charts/openclaw/templates/NOTES.txt
rename to helm/openclaw/templates/NOTES.txt
diff --git a/charts/openclaw/templates/_helpers.tpl b/helm/openclaw/templates/_helpers.tpl
similarity index 100%
rename from charts/openclaw/templates/_helpers.tpl
rename to helm/openclaw/templates/_helpers.tpl
diff --git a/charts/openclaw/templates/gateway-deployment.yaml b/helm/openclaw/templates/gateway-deployment.yaml
similarity index 100%
rename from charts/openclaw/templates/gateway-deployment.yaml
rename to helm/openclaw/templates/gateway-deployment.yaml
diff --git a/charts/openclaw/templates/gateway-ingress.yaml b/helm/openclaw/templates/gateway-ingress.yaml
similarity index 100%
rename from charts/openclaw/templates/gateway-ingress.yaml
rename to helm/openclaw/templates/gateway-ingress.yaml
diff --git a/charts/openclaw/templates/gateway-service.yaml b/helm/openclaw/templates/gateway-service.yaml
similarity index 100%
rename from charts/openclaw/templates/gateway-service.yaml
rename to helm/openclaw/templates/gateway-service.yaml
diff --git a/charts/openclaw/templates/hpa.yaml b/helm/openclaw/templates/hpa.yaml
similarity index 100%
rename from charts/openclaw/templates/hpa.yaml
rename to helm/openclaw/templates/hpa.yaml
diff --git a/charts/openclaw/templates/langfuse-deployment.yaml b/helm/openclaw/templates/langfuse-deployment.yaml
similarity index 100%
rename from charts/openclaw/templates/langfuse-deployment.yaml
rename to helm/openclaw/templates/langfuse-deployment.yaml
diff --git a/charts/openclaw/templates/langfuse-postgres-service.yaml b/helm/openclaw/templates/langfuse-postgres-service.yaml
similarity index 100%
rename from charts/openclaw/templates/langfuse-postgres-service.yaml
rename to helm/openclaw/templates/langfuse-postgres-service.yaml
diff --git a/charts/openclaw/templates/langfuse-postgres-statefulset.yaml b/helm/openclaw/templates/langfuse-postgres-statefulset.yaml
similarity index 100%
rename from charts/openclaw/templates/langfuse-postgres-statefulset.yaml
rename to helm/openclaw/templates/langfuse-postgres-statefulset.yaml
diff --git a/charts/openclaw/templates/langfuse-service.yaml b/helm/openclaw/templates/langfuse-service.yaml
similarity index 100%
rename from charts/openclaw/templates/langfuse-service.yaml
rename to helm/openclaw/templates/langfuse-service.yaml
diff --git a/charts/openclaw/templates/litellm-configmap.yaml b/helm/openclaw/templates/litellm-configmap.yaml
similarity index 100%
rename from charts/openclaw/templates/litellm-configmap.yaml
rename to helm/openclaw/templates/litellm-configmap.yaml
diff --git a/charts/openclaw/templates/litellm-deployment.yaml b/helm/openclaw/templates/litellm-deployment.yaml
similarity index 100%
rename from charts/openclaw/templates/litellm-deployment.yaml
rename to helm/openclaw/templates/litellm-deployment.yaml
diff --git a/charts/openclaw/templates/litellm-service.yaml b/helm/openclaw/templates/litellm-service.yaml
similarity index 100%
rename from charts/openclaw/templates/litellm-service.yaml
rename to helm/openclaw/templates/litellm-service.yaml
diff --git a/charts/openclaw/templates/neo4j-service.yaml b/helm/openclaw/templates/neo4j-service.yaml
similarity index 100%
rename from charts/openclaw/templates/neo4j-service.yaml
rename to helm/openclaw/templates/neo4j-service.yaml
diff --git a/charts/openclaw/templates/neo4j-statefulset.yaml b/helm/openclaw/templates/neo4j-statefulset.yaml
similarity index 100%
rename from charts/openclaw/templates/neo4j-statefulset.yaml
rename to helm/openclaw/templates/neo4j-statefulset.yaml
diff --git a/charts/openclaw/templates/networkpolicy.yaml b/helm/openclaw/templates/networkpolicy.yaml
similarity index 100%
rename from charts/openclaw/templates/networkpolicy.yaml
rename to helm/openclaw/templates/networkpolicy.yaml
diff --git a/charts/openclaw/templates/ollama-service.yaml b/helm/openclaw/templates/ollama-service.yaml
similarity index 100%
rename from charts/openclaw/templates/ollama-service.yaml
rename to helm/openclaw/templates/ollama-service.yaml
diff --git a/charts/openclaw/templates/ollama-statefulset.yaml b/helm/openclaw/templates/ollama-statefulset.yaml
similarity index 100%
rename from charts/openclaw/templates/ollama-statefulset.yaml
rename to helm/openclaw/templates/ollama-statefulset.yaml
diff --git a/charts/openclaw/templates/pdb.yaml b/helm/openclaw/templates/pdb.yaml
similarity index 100%
rename from charts/openclaw/templates/pdb.yaml
rename to helm/openclaw/templates/pdb.yaml
diff --git a/charts/openclaw/templates/postgresql-service.yaml b/helm/openclaw/templates/postgresql-service.yaml
similarity index 100%
rename from charts/openclaw/templates/postgresql-service.yaml
rename to helm/openclaw/templates/postgresql-service.yaml
diff --git a/charts/openclaw/templates/postgresql-statefulset.yaml b/helm/openclaw/templates/postgresql-statefulset.yaml
similarity index 100%
rename from charts/openclaw/templates/postgresql-statefulset.yaml
rename to helm/openclaw/templates/postgresql-statefulset.yaml
diff --git a/charts/openclaw/templates/redis-service.yaml b/helm/openclaw/templates/redis-service.yaml
similarity index 100%
rename from charts/openclaw/templates/redis-service.yaml
rename to helm/openclaw/templates/redis-service.yaml
diff --git a/charts/openclaw/templates/redis-statefulset.yaml b/helm/openclaw/templates/redis-statefulset.yaml
similarity index 100%
rename from charts/openclaw/templates/redis-statefulset.yaml
rename to helm/openclaw/templates/redis-statefulset.yaml
diff --git a/charts/openclaw/templates/secrets.yaml b/helm/openclaw/templates/secrets.yaml
similarity index 100%
rename from charts/openclaw/templates/secrets.yaml
rename to helm/openclaw/templates/secrets.yaml
diff --git a/charts/openclaw/templates/serviceaccount.yaml b/helm/openclaw/templates/serviceaccount.yaml
similarity index 100%
rename from charts/openclaw/templates/serviceaccount.yaml
rename to helm/openclaw/templates/serviceaccount.yaml
diff --git a/charts/openclaw/templates/servicemonitor.yaml b/helm/openclaw/templates/servicemonitor.yaml
similarity index 100%
rename from charts/openclaw/templates/servicemonitor.yaml
rename to helm/openclaw/templates/servicemonitor.yaml
diff --git a/charts/openclaw/values.yaml b/helm/openclaw/values.yaml
similarity index 100%
rename from charts/openclaw/values.yaml
rename to helm/openclaw/values.yaml
diff --git a/deploy/aws/README.md b/terraform/aws/README.md
similarity index 100%
rename from deploy/aws/README.md
rename to terraform/aws/README.md
diff --git a/deploy/aws/terraform/alb.tf b/terraform/aws/terraform/alb.tf
similarity index 100%
rename from deploy/aws/terraform/alb.tf
rename to terraform/aws/terraform/alb.tf
diff --git a/deploy/aws/terraform/ecr.tf b/terraform/aws/terraform/ecr.tf
similarity index 100%
rename from deploy/aws/terraform/ecr.tf
rename to terraform/aws/terraform/ecr.tf
diff --git a/deploy/aws/terraform/eks.tf b/terraform/aws/terraform/eks.tf
similarity index 100%
rename from deploy/aws/terraform/eks.tf
rename to terraform/aws/terraform/eks.tf
diff --git a/deploy/aws/terraform/elasticache.tf b/terraform/aws/terraform/elasticache.tf
similarity index 100%
rename from deploy/aws/terraform/elasticache.tf
rename to terraform/aws/terraform/elasticache.tf
diff --git a/deploy/aws/terraform/main.tf b/terraform/aws/terraform/main.tf
similarity index 100%
rename from deploy/aws/terraform/main.tf
rename to terraform/aws/terraform/main.tf
diff --git a/deploy/aws/terraform/outputs.tf b/terraform/aws/terraform/outputs.tf
similarity index 100%
rename from deploy/aws/terraform/outputs.tf
rename to terraform/aws/terraform/outputs.tf
diff --git a/deploy/aws/terraform/rds.tf b/terraform/aws/terraform/rds.tf
similarity index 100%
rename from deploy/aws/terraform/rds.tf
rename to terraform/aws/terraform/rds.tf
diff --git a/deploy/aws/terraform/variables.tf b/terraform/aws/terraform/variables.tf
similarity index 100%
rename from deploy/aws/terraform/variables.tf
rename to terraform/aws/terraform/variables.tf
diff --git a/deploy/aws/terraform/vpc.tf b/terraform/aws/terraform/vpc.tf
similarity index 100%
rename from deploy/aws/terraform/vpc.tf
rename to terraform/aws/terraform/vpc.tf
diff --git a/deploy/azure/README.md b/terraform/azure/README.md
similarity index 100%
rename from deploy/azure/README.md
rename to terraform/azure/README.md
diff --git a/deploy/azure/terraform/acr.tf b/terraform/azure/terraform/acr.tf
similarity index 100%
rename from deploy/azure/terraform/acr.tf
rename to terraform/azure/terraform/acr.tf
diff --git a/deploy/azure/terraform/aks.tf b/terraform/azure/terraform/aks.tf
similarity index 100%
rename from deploy/azure/terraform/aks.tf
rename to terraform/azure/terraform/aks.tf
diff --git a/deploy/azure/terraform/application-gateway.tf b/terraform/azure/terraform/application-gateway.tf
similarity index 100%
rename from deploy/azure/terraform/application-gateway.tf
rename to terraform/azure/terraform/application-gateway.tf
diff --git a/deploy/azure/terraform/main.tf b/terraform/azure/terraform/main.tf
similarity index 100%
rename from deploy/azure/terraform/main.tf
rename to terraform/azure/terraform/main.tf
diff --git a/deploy/azure/terraform/outputs.tf b/terraform/azure/terraform/outputs.tf
similarity index 100%
rename from deploy/azure/terraform/outputs.tf
rename to terraform/azure/terraform/outputs.tf
diff --git a/deploy/azure/terraform/postgresql.tf b/terraform/azure/terraform/postgresql.tf
similarity index 100%
rename from deploy/azure/terraform/postgresql.tf
rename to terraform/azure/terraform/postgresql.tf
diff --git a/deploy/azure/terraform/redis.tf b/terraform/azure/terraform/redis.tf
similarity index 100%
rename from deploy/azure/terraform/redis.tf
rename to terraform/azure/terraform/redis.tf
diff --git a/deploy/azure/terraform/variables.tf b/terraform/azure/terraform/variables.tf
similarity index 100%
rename from deploy/azure/terraform/variables.tf
rename to terraform/azure/terraform/variables.tf
diff --git a/deploy/azure/terraform/vnet.tf b/terraform/azure/terraform/vnet.tf
similarity index 100%
rename from deploy/azure/terraform/vnet.tf
rename to terraform/azure/terraform/vnet.tf
diff --git a/deploy/gcp/README.md b/terraform/gcp/README.md
similarity index 100%
rename from deploy/gcp/README.md
rename to terraform/gcp/README.md
diff --git a/deploy/gcp/terraform/artifact-registry.tf b/terraform/gcp/terraform/artifact-registry.tf
similarity index 100%
rename from deploy/gcp/terraform/artifact-registry.tf
rename to terraform/gcp/terraform/artifact-registry.tf
diff --git a/deploy/gcp/terraform/cloud-sql.tf b/terraform/gcp/terraform/cloud-sql.tf
similarity index 100%
rename from deploy/gcp/terraform/cloud-sql.tf
rename to terraform/gcp/terraform/cloud-sql.tf
diff --git a/deploy/gcp/terraform/gke.tf b/terraform/gcp/terraform/gke.tf
similarity index 100%
rename from deploy/gcp/terraform/gke.tf
rename to terraform/gcp/terraform/gke.tf
diff --git a/deploy/gcp/terraform/load-balancer.tf b/terraform/gcp/terraform/load-balancer.tf
similarity index 100%
rename from deploy/gcp/terraform/load-balancer.tf
rename to terraform/gcp/terraform/load-balancer.tf
diff --git a/deploy/gcp/terraform/main.tf b/terraform/gcp/terraform/main.tf
similarity index 100%
rename from deploy/gcp/terraform/main.tf
rename to terraform/gcp/terraform/main.tf
diff --git a/deploy/gcp/terraform/memorystore.tf b/terraform/gcp/terraform/memorystore.tf
similarity index 100%
rename from deploy/gcp/terraform/memorystore.tf
rename to terraform/gcp/terraform/memorystore.tf
diff --git a/deploy/gcp/terraform/outputs.tf b/terraform/gcp/terraform/outputs.tf
similarity index 100%
rename from deploy/gcp/terraform/outputs.tf
rename to terraform/gcp/terraform/outputs.tf
diff --git a/deploy/gcp/terraform/variables.tf b/terraform/gcp/terraform/variables.tf
similarity index 100%
rename from deploy/gcp/terraform/variables.tf
rename to terraform/gcp/terraform/variables.tf
diff --git a/deploy/gcp/terraform/vpc.tf b/terraform/gcp/terraform/vpc.tf
similarity index 100%
rename from deploy/gcp/terraform/vpc.tf
rename to terraform/gcp/terraform/vpc.tf
diff --git a/deploy/kubernetes/base/litellm-deployment.yaml b/terraform/kubernetes/base/litellm-deployment.yaml
similarity index 100%
rename from deploy/kubernetes/base/litellm-deployment.yaml
rename to terraform/kubernetes/base/litellm-deployment.yaml
diff --git a/deploy/kubernetes/base/litellm-service.yaml b/terraform/kubernetes/base/litellm-service.yaml
similarity index 100%
rename from deploy/kubernetes/base/litellm-service.yaml
rename to terraform/kubernetes/base/litellm-service.yaml
diff --git a/deploy/kubernetes/base/namespace.yaml b/terraform/kubernetes/base/namespace.yaml
similarity index 100%
rename from deploy/kubernetes/base/namespace.yaml
rename to terraform/kubernetes/base/namespace.yaml
diff --git a/deploy/kubernetes/base/openclaw-deployment.yaml b/terraform/kubernetes/base/openclaw-deployment.yaml
similarity index 100%
rename from deploy/kubernetes/base/openclaw-deployment.yaml
rename to terraform/kubernetes/base/openclaw-deployment.yaml
diff --git a/deploy/kubernetes/base/openclaw-service.yaml b/terraform/kubernetes/base/openclaw-service.yaml
similarity index 100%
rename from deploy/kubernetes/base/openclaw-service.yaml
rename to terraform/kubernetes/base/openclaw-service.yaml
diff --git a/deploy/kubernetes/base/postgresql-statefulset.yaml b/terraform/kubernetes/base/postgresql-statefulset.yaml
similarity index 100%
rename from deploy/kubernetes/base/postgresql-statefulset.yaml
rename to terraform/kubernetes/base/postgresql-statefulset.yaml
diff --git a/deploy/kubernetes/base/redis-statefulset.yaml b/terraform/kubernetes/base/redis-statefulset.yaml
similarity index 100%
rename from deploy/kubernetes/base/redis-statefulset.yaml
rename to terraform/kubernetes/base/redis-statefulset.yaml
diff --git a/deploy/kubernetes/overlays/dev/kustomization.yaml b/terraform/kubernetes/overlays/dev/kustomization.yaml
similarity index 100%
rename from deploy/kubernetes/overlays/dev/kustomization.yaml
rename to terraform/kubernetes/overlays/dev/kustomization.yaml
diff --git a/deploy/kubernetes/overlays/prod/kustomization.yaml b/terraform/kubernetes/overlays/prod/kustomization.yaml
similarity index 100%
rename from deploy/kubernetes/overlays/prod/kustomization.yaml
rename to terraform/kubernetes/overlays/prod/kustomization.yaml
diff --git a/deploy/kubernetes/overlays/staging/kustomization.yaml b/terraform/kubernetes/overlays/staging/kustomization.yaml
similarity index 100%
rename from deploy/kubernetes/overlays/staging/kustomization.yaml
rename to terraform/kubernetes/overlays/staging/kustomization.yaml
diff --git a/deploy/terraform/modules/litellm/main.tf b/terraform/terraform/modules/litellm/main.tf
similarity index 100%
rename from deploy/terraform/modules/litellm/main.tf
rename to terraform/terraform/modules/litellm/main.tf
diff --git a/deploy/terraform/modules/monitoring/main.tf b/terraform/terraform/modules/monitoring/main.tf
similarity index 100%
rename from deploy/terraform/modules/monitoring/main.tf
rename to terraform/terraform/modules/monitoring/main.tf
diff --git a/deploy/terraform/modules/openclaw/main.tf b/terraform/terraform/modules/openclaw/main.tf
similarity index 100%
rename from deploy/terraform/modules/openclaw/main.tf
rename to terraform/terraform/modules/openclaw/main.tf
diff --git a/deploy/terraform/modules/openclaw/outputs.tf b/terraform/terraform/modules/openclaw/outputs.tf
similarity index 100%
rename from deploy/terraform/modules/openclaw/outputs.tf
rename to terraform/terraform/modules/openclaw/outputs.tf
diff --git a/deploy/terraform/modules/openclaw/variables.tf b/terraform/terraform/modules/openclaw/variables.tf
similarity index 100%
rename from deploy/terraform/modules/openclaw/variables.tf
rename to terraform/terraform/modules/openclaw/variables.tf