diff --git a/samples/crew-django-redis-postgres/.devcontainer/Dockerfile b/samples/crewai/.devcontainer/Dockerfile
similarity index 100%
rename from samples/crew-django-redis-postgres/.devcontainer/Dockerfile
rename to samples/crewai/.devcontainer/Dockerfile
diff --git a/samples/crew-django-redis-postgres/.devcontainer/devcontainer.json b/samples/crewai/.devcontainer/devcontainer.json
similarity index 100%
rename from samples/crew-django-redis-postgres/.devcontainer/devcontainer.json
rename to samples/crewai/.devcontainer/devcontainer.json
diff --git a/samples/crew-django-redis-postgres/.github/workflows/deploy.yaml b/samples/crewai/.github/workflows/deploy.yaml
similarity index 100%
rename from samples/crew-django-redis-postgres/.github/workflows/deploy.yaml
rename to samples/crewai/.github/workflows/deploy.yaml
diff --git a/samples/crew-django-redis-postgres/.gitignore b/samples/crewai/.gitignore
similarity index 100%
rename from samples/crew-django-redis-postgres/.gitignore
rename to samples/crewai/.gitignore
diff --git a/samples/crew-django-redis-postgres/README.md b/samples/crewai/README.md
similarity index 100%
rename from samples/crew-django-redis-postgres/README.md
rename to samples/crewai/README.md
diff --git a/samples/crew-django-redis-postgres/app/.dockerignore b/samples/crewai/app/.dockerignore
similarity index 100%
rename from samples/crew-django-redis-postgres/app/.dockerignore
rename to samples/crewai/app/.dockerignore
diff --git a/samples/crew-django-redis-postgres/app/Dockerfile b/samples/crewai/app/Dockerfile
similarity index 100%
rename from samples/crew-django-redis-postgres/app/Dockerfile
rename to samples/crewai/app/Dockerfile
diff --git a/samples/crew-django-redis-postgres/app/config/__init__.py b/samples/crewai/app/config/__init__.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/config/__init__.py
rename to samples/crewai/app/config/__init__.py
diff --git a/samples/crew-django-redis-postgres/app/config/asgi.py b/samples/crewai/app/config/asgi.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/config/asgi.py
rename to samples/crewai/app/config/asgi.py
diff --git a/samples/crew-django-redis-postgres/app/config/celery.py b/samples/crewai/app/config/celery.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/config/celery.py
rename to samples/crewai/app/config/celery.py
diff --git a/samples/crew-django-redis-postgres/app/config/settings.py b/samples/crewai/app/config/settings.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/config/settings.py
rename to samples/crewai/app/config/settings.py
diff --git a/samples/crew-django-redis-postgres/app/config/urls.py b/samples/crewai/app/config/urls.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/config/urls.py
rename to samples/crewai/app/config/urls.py
diff --git a/samples/crew-django-redis-postgres/app/config/wsgi.py b/samples/crewai/app/config/wsgi.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/config/wsgi.py
rename to samples/crewai/app/config/wsgi.py
diff --git a/samples/crew-django-redis-postgres/app/core/__init__.py b/samples/crewai/app/core/__init__.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/core/__init__.py
rename to samples/crewai/app/core/__init__.py
diff --git a/samples/crew-django-redis-postgres/app/core/admin.py b/samples/crewai/app/core/admin.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/core/admin.py
rename to samples/crewai/app/core/admin.py
diff --git a/samples/crew-django-redis-postgres/app/core/ai_clients.py b/samples/crewai/app/core/ai_clients.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/core/ai_clients.py
rename to samples/crewai/app/core/ai_clients.py
diff --git a/samples/crew-django-redis-postgres/app/core/apps.py b/samples/crewai/app/core/apps.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/core/apps.py
rename to samples/crewai/app/core/apps.py
diff --git a/samples/crew-django-redis-postgres/app/core/consumers.py b/samples/crewai/app/core/consumers.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/core/consumers.py
rename to samples/crewai/app/core/consumers.py
diff --git a/samples/crew-django-redis-postgres/app/core/custom_llm.py b/samples/crewai/app/core/custom_llm.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/core/custom_llm.py
rename to samples/crewai/app/core/custom_llm.py
diff --git a/samples/crew-django-redis-postgres/app/core/management/__init__.py b/samples/crewai/app/core/management/__init__.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/core/management/__init__.py
rename to samples/crewai/app/core/management/__init__.py
diff --git a/samples/crew-django-redis-postgres/app/core/management/commands/__init__.py b/samples/crewai/app/core/management/commands/__init__.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/core/management/commands/__init__.py
rename to samples/crewai/app/core/management/commands/__init__.py
diff --git a/samples/crew-django-redis-postgres/app/core/management/commands/create_initial_superuser.py b/samples/crewai/app/core/management/commands/create_initial_superuser.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/core/management/commands/create_initial_superuser.py
rename to samples/crewai/app/core/management/commands/create_initial_superuser.py
diff --git a/samples/crew-django-redis-postgres/app/core/migrations/0001_enable_pgvector.py b/samples/crewai/app/core/migrations/0001_enable_pgvector.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/core/migrations/0001_enable_pgvector.py
rename to samples/crewai/app/core/migrations/0001_enable_pgvector.py
diff --git a/samples/crew-django-redis-postgres/app/core/migrations/0002_initial.py b/samples/crewai/app/core/migrations/0002_initial.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/core/migrations/0002_initial.py
rename to samples/crewai/app/core/migrations/0002_initial.py
diff --git a/samples/crew-django-redis-postgres/app/core/migrations/0003_rename_vector_summary_embedding.py b/samples/crewai/app/core/migrations/0003_rename_vector_summary_embedding.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/core/migrations/0003_rename_vector_summary_embedding.py
rename to samples/crewai/app/core/migrations/0003_rename_vector_summary_embedding.py
diff --git a/samples/crew-django-redis-postgres/app/core/migrations/__init__.py b/samples/crewai/app/core/migrations/__init__.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/core/migrations/__init__.py
rename to samples/crewai/app/core/migrations/__init__.py
diff --git a/samples/crew-django-redis-postgres/app/core/models.py b/samples/crewai/app/core/models.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/core/models.py
rename to samples/crewai/app/core/models.py
diff --git a/samples/crew-django-redis-postgres/app/core/routing.py b/samples/crewai/app/core/routing.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/core/routing.py
rename to samples/crewai/app/core/routing.py
diff --git a/samples/crew-django-redis-postgres/app/core/tasks.py b/samples/crewai/app/core/tasks.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/core/tasks.py
rename to samples/crewai/app/core/tasks.py
diff --git a/samples/crew-django-redis-postgres/app/core/templates/core/home.html b/samples/crewai/app/core/templates/core/home.html
similarity index 100%
rename from samples/crew-django-redis-postgres/app/core/templates/core/home.html
rename to samples/crewai/app/core/templates/core/home.html
diff --git a/samples/crew-django-redis-postgres/app/core/tests.py b/samples/crewai/app/core/tests.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/core/tests.py
rename to samples/crewai/app/core/tests.py
diff --git a/samples/crew-django-redis-postgres/app/core/views.py b/samples/crewai/app/core/views.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/core/views.py
rename to samples/crewai/app/core/views.py
diff --git a/samples/crew-django-redis-postgres/app/dev.sh b/samples/crewai/app/dev.sh
similarity index 100%
rename from samples/crew-django-redis-postgres/app/dev.sh
rename to samples/crewai/app/dev.sh
diff --git a/samples/crew-django-redis-postgres/app/manage.py b/samples/crewai/app/manage.py
similarity index 100%
rename from samples/crew-django-redis-postgres/app/manage.py
rename to samples/crewai/app/manage.py
diff --git a/samples/crew-django-redis-postgres/app/requirements.txt b/samples/crewai/app/requirements.txt
similarity index 100%
rename from samples/crew-django-redis-postgres/app/requirements.txt
rename to samples/crewai/app/requirements.txt
diff --git a/samples/crew-django-redis-postgres/app/run.sh b/samples/crewai/app/run.sh
similarity index 100%
rename from samples/crew-django-redis-postgres/app/run.sh
rename to samples/crewai/app/run.sh
diff --git a/samples/crew-django-redis-postgres/compose.local.yaml b/samples/crewai/compose.local.yaml
similarity index 100%
rename from samples/crew-django-redis-postgres/compose.local.yaml
rename to samples/crewai/compose.local.yaml
diff --git a/samples/crew-django-redis-postgres/compose.yaml b/samples/crewai/compose.yaml
similarity index 100%
rename from samples/crew-django-redis-postgres/compose.yaml
rename to samples/crewai/compose.yaml
diff --git a/samples/django-channels-redis-postgres/.claude/settings.local.json b/samples/django-redis-postgres/.claude/settings.local.json
similarity index 100%
rename from samples/django-channels-redis-postgres/.claude/settings.local.json
rename to samples/django-redis-postgres/.claude/settings.local.json
diff --git a/samples/django-channels-redis-postgres/.devcontainer/Dockerfile b/samples/django-redis-postgres/.devcontainer/Dockerfile
similarity index 100%
rename from samples/django-channels-redis-postgres/.devcontainer/Dockerfile
rename to samples/django-redis-postgres/.devcontainer/Dockerfile
diff --git a/samples/django-channels-redis-postgres/.devcontainer/devcontainer.json b/samples/django-redis-postgres/.devcontainer/devcontainer.json
similarity index 100%
rename from samples/django-channels-redis-postgres/.devcontainer/devcontainer.json
rename to samples/django-redis-postgres/.devcontainer/devcontainer.json
diff --git a/samples/django-channels-redis-postgres/.github/workflows/deploy.yaml b/samples/django-redis-postgres/.github/workflows/deploy.yaml
similarity index 100%
rename from samples/django-channels-redis-postgres/.github/workflows/deploy.yaml
rename to samples/django-redis-postgres/.github/workflows/deploy.yaml
diff --git a/samples/django-channels-redis-postgres/README.md b/samples/django-redis-postgres/README.md
similarity index 100%
rename from samples/django-channels-redis-postgres/README.md
rename to samples/django-redis-postgres/README.md
diff --git a/samples/django-channels-redis-postgres/app/.dockerignore b/samples/django-redis-postgres/app/.dockerignore
similarity index 100%
rename from samples/django-channels-redis-postgres/app/.dockerignore
rename to samples/django-redis-postgres/app/.dockerignore
diff --git a/samples/django-channels-redis-postgres/app/.gitignore b/samples/django-redis-postgres/app/.gitignore
similarity index 100%
rename from samples/django-channels-redis-postgres/app/.gitignore
rename to samples/django-redis-postgres/app/.gitignore
diff --git a/samples/django-channels-redis-postgres/app/Dockerfile b/samples/django-redis-postgres/app/Dockerfile
similarity index 100%
rename from samples/django-channels-redis-postgres/app/Dockerfile
rename to samples/django-redis-postgres/app/Dockerfile
diff --git a/samples/django-channels-redis-postgres/app/chat/__init__.py b/samples/django-redis-postgres/app/chat/__init__.py
similarity index 100%
rename from samples/django-channels-redis-postgres/app/chat/__init__.py
rename to samples/django-redis-postgres/app/chat/__init__.py
diff --git a/samples/django-channels-redis-postgres/app/chat/admin.py b/samples/django-redis-postgres/app/chat/admin.py
similarity index 100%
rename from samples/django-channels-redis-postgres/app/chat/admin.py
rename to samples/django-redis-postgres/app/chat/admin.py
diff --git a/samples/django-channels-redis-postgres/app/chat/apps.py b/samples/django-redis-postgres/app/chat/apps.py
similarity index 100%
rename from samples/django-channels-redis-postgres/app/chat/apps.py
rename to samples/django-redis-postgres/app/chat/apps.py
diff --git a/samples/django-channels-redis-postgres/app/chat/consumers.py b/samples/django-redis-postgres/app/chat/consumers.py
similarity index 100%
rename from samples/django-channels-redis-postgres/app/chat/consumers.py
rename to samples/django-redis-postgres/app/chat/consumers.py
diff --git a/samples/django-channels-redis-postgres/app/chat/migrations/0001_initial.py b/samples/django-redis-postgres/app/chat/migrations/0001_initial.py
similarity index 100%
rename from samples/django-channels-redis-postgres/app/chat/migrations/0001_initial.py
rename to samples/django-redis-postgres/app/chat/migrations/0001_initial.py
diff --git a/samples/django-channels-redis-postgres/app/chat/migrations/__init__.py b/samples/django-redis-postgres/app/chat/migrations/__init__.py
similarity index 100%
rename from samples/django-channels-redis-postgres/app/chat/migrations/__init__.py
rename to samples/django-redis-postgres/app/chat/migrations/__init__.py
diff --git a/samples/django-channels-redis-postgres/app/chat/models.py b/samples/django-redis-postgres/app/chat/models.py
similarity index 100%
rename from samples/django-channels-redis-postgres/app/chat/models.py
rename to samples/django-redis-postgres/app/chat/models.py
diff --git a/samples/django-channels-redis-postgres/app/chat/routing.py b/samples/django-redis-postgres/app/chat/routing.py
similarity index 100%
rename from samples/django-channels-redis-postgres/app/chat/routing.py
rename to samples/django-redis-postgres/app/chat/routing.py
diff --git a/samples/django-channels-redis-postgres/app/chat/static/chat/css/pico.min.css b/samples/django-redis-postgres/app/chat/static/chat/css/pico.min.css
similarity index 100%
rename from samples/django-channels-redis-postgres/app/chat/static/chat/css/pico.min.css
rename to samples/django-redis-postgres/app/chat/static/chat/css/pico.min.css
diff --git a/samples/django-channels-redis-postgres/app/chat/templates/chat/index.html b/samples/django-redis-postgres/app/chat/templates/chat/index.html
similarity index 100%
rename from samples/django-channels-redis-postgres/app/chat/templates/chat/index.html
rename to samples/django-redis-postgres/app/chat/templates/chat/index.html
diff --git a/samples/django-channels-redis-postgres/app/chat/templates/chat/layout.html b/samples/django-redis-postgres/app/chat/templates/chat/layout.html
similarity index 100%
rename from samples/django-channels-redis-postgres/app/chat/templates/chat/layout.html
rename to samples/django-redis-postgres/app/chat/templates/chat/layout.html
diff --git a/samples/django-channels-redis-postgres/app/chat/templates/chat/room.html b/samples/django-redis-postgres/app/chat/templates/chat/room.html
similarity index 100%
rename from samples/django-channels-redis-postgres/app/chat/templates/chat/room.html
rename to samples/django-redis-postgres/app/chat/templates/chat/room.html
diff --git a/samples/django-channels-redis-postgres/app/chat/tests.py b/samples/django-redis-postgres/app/chat/tests.py
similarity index 100%
rename from samples/django-channels-redis-postgres/app/chat/tests.py
rename to samples/django-redis-postgres/app/chat/tests.py
diff --git a/samples/django-channels-redis-postgres/app/chat/urls.py b/samples/django-redis-postgres/app/chat/urls.py
similarity index 100%
rename from samples/django-channels-redis-postgres/app/chat/urls.py
rename to samples/django-redis-postgres/app/chat/urls.py
diff --git a/samples/django-channels-redis-postgres/app/chat/views.py b/samples/django-redis-postgres/app/chat/views.py
similarity index 100%
rename from samples/django-channels-redis-postgres/app/chat/views.py
rename to samples/django-redis-postgres/app/chat/views.py
diff --git a/samples/django-channels-redis-postgres/app/django_defang/__init__.py b/samples/django-redis-postgres/app/django_defang/__init__.py
similarity index 100%
rename from samples/django-channels-redis-postgres/app/django_defang/__init__.py
rename to samples/django-redis-postgres/app/django_defang/__init__.py
diff --git a/samples/django-channels-redis-postgres/app/django_defang/asgi.py b/samples/django-redis-postgres/app/django_defang/asgi.py
similarity index 100%
rename from samples/django-channels-redis-postgres/app/django_defang/asgi.py
rename to samples/django-redis-postgres/app/django_defang/asgi.py
diff --git a/samples/django-channels-redis-postgres/app/django_defang/settings.py b/samples/django-redis-postgres/app/django_defang/settings.py
similarity index 100%
rename from samples/django-channels-redis-postgres/app/django_defang/settings.py
rename to samples/django-redis-postgres/app/django_defang/settings.py
diff --git a/samples/django-channels-redis-postgres/app/django_defang/urls.py b/samples/django-redis-postgres/app/django_defang/urls.py
similarity index 100%
rename from samples/django-channels-redis-postgres/app/django_defang/urls.py
rename to samples/django-redis-postgres/app/django_defang/urls.py
diff --git a/samples/django-channels-redis-postgres/app/django_defang/wsgi.py b/samples/django-redis-postgres/app/django_defang/wsgi.py
similarity index 100%
rename from samples/django-channels-redis-postgres/app/django_defang/wsgi.py
rename to samples/django-redis-postgres/app/django_defang/wsgi.py
diff --git a/samples/django-channels-redis-postgres/app/manage.py b/samples/django-redis-postgres/app/manage.py
similarity index 100%
rename from samples/django-channels-redis-postgres/app/manage.py
rename to samples/django-redis-postgres/app/manage.py
diff --git a/samples/django-channels-redis-postgres/app/requirements.txt b/samples/django-redis-postgres/app/requirements.txt
similarity index 100%
rename from samples/django-channels-redis-postgres/app/requirements.txt
rename to samples/django-redis-postgres/app/requirements.txt
diff --git a/samples/django-channels-redis-postgres/compose.dev.yaml b/samples/django-redis-postgres/compose.dev.yaml
similarity index 100%
rename from samples/django-channels-redis-postgres/compose.dev.yaml
rename to samples/django-redis-postgres/compose.dev.yaml
diff --git a/samples/django-channels-redis-postgres/compose.yaml b/samples/django-redis-postgres/compose.yaml
similarity index 100%
rename from samples/django-channels-redis-postgres/compose.yaml
rename to samples/django-redis-postgres/compose.yaml
diff --git a/samples/golang-http-form-railpack/.github/workflows/deploy.yaml b/samples/golang-railpack/.github/workflows/deploy.yaml
similarity index 100%
rename from samples/golang-http-form-railpack/.github/workflows/deploy.yaml
rename to samples/golang-railpack/.github/workflows/deploy.yaml
diff --git a/samples/golang-http-form-railpack/README.md b/samples/golang-railpack/README.md
similarity index 100%
rename from samples/golang-http-form-railpack/README.md
rename to samples/golang-railpack/README.md
diff --git a/samples/golang-http-form-railpack/app/go.mod b/samples/golang-railpack/app/go.mod
similarity index 100%
rename from samples/golang-http-form-railpack/app/go.mod
rename to samples/golang-railpack/app/go.mod
diff --git a/samples/golang-http-form-railpack/app/go.sum b/samples/golang-railpack/app/go.sum
similarity index 100%
rename from samples/golang-http-form-railpack/app/go.sum
rename to samples/golang-railpack/app/go.sum
diff --git a/samples/golang-http-form-railpack/app/main.go b/samples/golang-railpack/app/main.go
similarity index 100%
rename from samples/golang-http-form-railpack/app/main.go
rename to samples/golang-railpack/app/main.go
diff --git a/samples/golang-http-form-railpack/compose.yaml b/samples/golang-railpack/compose.yaml
similarity index 100%
rename from samples/golang-http-form-railpack/compose.yaml
rename to samples/golang-railpack/compose.yaml