diff --git a/packages/cli/templates/default-app/packages/backend/.eslintrc.js b/packages/create-app/templates/default-app/packages/backend/.eslintrc.js
similarity index 100%
rename from packages/cli/templates/default-app/packages/backend/.eslintrc.js
rename to packages/create-app/templates/default-app/packages/backend/.eslintrc.js
diff --git a/packages/cli/templates/default-app/packages/backend/Dockerfile b/packages/create-app/templates/default-app/packages/backend/Dockerfile
similarity index 100%
rename from packages/cli/templates/default-app/packages/backend/Dockerfile
rename to packages/create-app/templates/default-app/packages/backend/Dockerfile
diff --git a/packages/cli/templates/default-app/packages/backend/README.md b/packages/create-app/templates/default-app/packages/backend/README.md
similarity index 100%
rename from packages/cli/templates/default-app/packages/backend/README.md
rename to packages/create-app/templates/default-app/packages/backend/README.md
diff --git a/packages/cli/templates/default-app/packages/backend/package.json.hbs b/packages/create-app/templates/default-app/packages/backend/package.json.hbs
similarity index 100%
rename from packages/cli/templates/default-app/packages/backend/package.json.hbs
rename to packages/create-app/templates/default-app/packages/backend/package.json.hbs
diff --git a/packages/cli/templates/default-app/packages/backend/src/index.test.ts b/packages/create-app/templates/default-app/packages/backend/src/index.test.ts
similarity index 100%
rename from packages/cli/templates/default-app/packages/backend/src/index.test.ts
rename to packages/create-app/templates/default-app/packages/backend/src/index.test.ts
diff --git a/packages/cli/templates/default-app/packages/backend/src/index.ts.hbs b/packages/create-app/templates/default-app/packages/backend/src/index.ts.hbs
similarity index 100%
rename from packages/cli/templates/default-app/packages/backend/src/index.ts.hbs
rename to packages/create-app/templates/default-app/packages/backend/src/index.ts.hbs
diff --git a/packages/cli/templates/default-app/packages/backend/src/plugins/auth.ts b/packages/create-app/templates/default-app/packages/backend/src/plugins/auth.ts
similarity index 100%
rename from packages/cli/templates/default-app/packages/backend/src/plugins/auth.ts
rename to packages/create-app/templates/default-app/packages/backend/src/plugins/auth.ts
diff --git a/packages/cli/templates/default-app/packages/backend/src/plugins/catalog.ts b/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts
similarity index 100%
rename from packages/cli/templates/default-app/packages/backend/src/plugins/catalog.ts
rename to packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts
diff --git a/packages/cli/templates/default-app/packages/backend/src/plugins/identity.ts b/packages/create-app/templates/default-app/packages/backend/src/plugins/identity.ts
similarity index 100%
rename from packages/cli/templates/default-app/packages/backend/src/plugins/identity.ts
rename to packages/create-app/templates/default-app/packages/backend/src/plugins/identity.ts
diff --git a/packages/cli/templates/default-app/packages/backend/src/plugins/proxy.ts b/packages/create-app/templates/default-app/packages/backend/src/plugins/proxy.ts
similarity index 100%
rename from packages/cli/templates/default-app/packages/backend/src/plugins/proxy.ts
rename to packages/create-app/templates/default-app/packages/backend/src/plugins/proxy.ts
diff --git a/packages/cli/templates/default-app/packages/backend/src/plugins/scaffolder.ts b/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts
similarity index 100%
rename from packages/cli/templates/default-app/packages/backend/src/plugins/scaffolder.ts
rename to packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts
diff --git a/packages/cli/templates/default-app/packages/backend/src/plugins/techdocs.ts b/packages/create-app/templates/default-app/packages/backend/src/plugins/techdocs.ts
similarity index 100%
rename from packages/cli/templates/default-app/packages/backend/src/plugins/techdocs.ts
rename to packages/create-app/templates/default-app/packages/backend/src/plugins/techdocs.ts
diff --git a/packages/cli/templates/default-app/packages/backend/src/types.ts b/packages/create-app/templates/default-app/packages/backend/src/types.ts
similarity index 100%
rename from packages/cli/templates/default-app/packages/backend/src/types.ts
rename to packages/create-app/templates/default-app/packages/backend/src/types.ts