diff --git a/examples/getstarted/src/admin/app.js b/examples/getstarted/src/admin/app.js
index bcd08f160f..d5f38eb6b4 100644
--- a/examples/getstarted/src/admin/app.js
+++ b/examples/getstarted/src/admin/app.js
@@ -1,4 +1,6 @@
 export default {
-  config: {},
+  config: {
+    locales: ['fr'],
+  },
   bootstrap() {},
 };
diff --git a/examples/kitchensink/config/database.js b/examples/kitchensink/config/database.js
index d78eb0ebc8..ac20ae7faa 100644
--- a/examples/kitchensink/config/database.js
+++ b/examples/kitchensink/config/database.js
@@ -1,39 +1,11 @@
-const sqlite = {
-  client: 'sqlite',
+const path = require('path');
+
+module.exports = ({ env }) => ({
   connection: {
-    filename: '.tmp/data.db',
+    client: 'sqlite',
+    connection: {
+      filename: path.join(__dirname, '..', env('DATABASE_FILENAME', '.tmp/data.db')),
+    },
+    useNullAsDefault: true,
   },
-  useNullAsDefault: true,
-};
-
-const postgres = {
-  client: 'postgres',
-  connection: {
-    database: 'strapi',
-    user: 'strapi',
-    password: 'strapi',
-    port: 5432,
-    host: 'localhost',
-  },
-};
-
-const mysql = {
-  client: 'mysql',
-  connection: {
-    database: 'strapi',
-    user: 'strapi',
-    password: 'strapi',
-    port: 3306,
-    host: 'localhost',
-  },
-};
-
-const db = {
-  mysql,
-  sqlite,
-  postgres,
-};
-
-module.exports = {
-  connection: process.env.DB ? db[process.env.DB] || db.sqlite : db.sqlite,
-};
+});
diff --git a/examples/kitchensink/config/server.js b/examples/kitchensink/config/server.js
index 609b2dbe22..2b4557d97c 100644
--- a/examples/kitchensink/config/server.js
+++ b/examples/kitchensink/config/server.js
@@ -3,7 +3,7 @@ module.exports = ({ env }) => ({
   port: env.int('PORT', 1337),
   admin: {
     auth: {
-      secret: env('ADMIN_JWT_SECRET', 'fb07d090b62789dce667b54ae419850e'),
+      secret: env('ADMIN_JWT_SECRET', '6f75e424d1a0307077c294fcc3c7d78d'),
     },
   },
 });
diff --git a/examples/kitchensink/package.json b/examples/kitchensink/package.json
index 8ecbbf3f09..fdb922e08e 100644
--- a/examples/kitchensink/package.json
+++ b/examples/kitchensink/package.json
@@ -1,40 +1,30 @@
 {
   "name": "kitchensink",
   "private": true,
-  "version": "3.6.8",
-  "description": "A Strapi application.",
+  "version": "0.1.0",
+  "description": "A Strapi application",
   "scripts": {
     "develop": "strapi develop",
-    "develop:ce": "STRAPI_DISABLE_EE=true strapi develop",
     "start": "strapi start",
     "build": "strapi build",
-    "build:ce": "STRAPI_DISABLE_EE=true strapi build",
     "strapi": "strapi"
   },
+  "devDependencies": {},
   "dependencies": {
-    "@strapi/admin": "3.6.8",
-    "@strapi/plugin-documentation": "3.6.8",
-    "@strapi/plugin-graphql": "3.6.8",
-    "@strapi/plugin-i18n": "3.6.8",
-    "@strapi/plugin-users-permissions": "3.6.8",
-    "@strapi/provider-email-mailgun": "3.6.8",
-    "@strapi/provider-upload-aws-s3": "3.6.8",
-    "@strapi/provider-upload-cloudinary": "3.6.8",
     "@strapi/strapi": "3.6.8",
-    "@strapi/utils": "3.6.8",
-    "lodash": "4.17.21",
-    "mysql": "2.18.1",
-    "passport-google-oauth2": "0.2.0",
-    "pg": "8.6.0",
-    "sqlite3": "5.0.2",
-    "strapi-middleware-views": "3.6.8"
+    "@strapi/plugin-users-permissions": "3.6.8",
+    "@strapi/plugin-i18n": "3.6.8",
+    "sqlite3": "5.0.2"
+  },
+  "author": {
+    "name": "A Strapi developer"
   },
   "strapi": {
-    "uuid": "getstarted"
+    "uuid": "379fa84f-f1a0-4101-a6e7-40ee09ed3927"
   },
   "engines": {
-    "node": ">=12.x.x <=16.x.x",
-    "npm": ">=6.0.0"
+    "node": ">=12.x.x <=14.x.x",
+    "npm": "^6.0.0"
   },
-  "license": "SEE LICENSE IN LICENSE"
+  "license": "MIT"
 }
diff --git a/examples/kitchensink/admin/app.js b/examples/kitchensink/src/admin/app.js
similarity index 100%
rename from examples/kitchensink/admin/app.js
rename to examples/kitchensink/src/admin/app.js
diff --git a/examples/kitchensink/admin/webpack.config.js b/examples/kitchensink/src/admin/webpack.config.js
similarity index 91%
rename from examples/kitchensink/admin/webpack.config.js
rename to examples/kitchensink/src/admin/webpack.config.js
index 1ca45c2166..a36d60ff39 100644
--- a/examples/kitchensink/admin/webpack.config.js
+++ b/examples/kitchensink/src/admin/webpack.config.js
@@ -5,5 +5,6 @@ module.exports = (config, webpack) => {
   // Note: we provide webpack above so you should not `require` it
   // Perform customizations to webpack config
   // Important: return the modified config
+  console.log('custom');
   return config;
 };
diff --git a/examples/kitchensink/api/.gitkeep b/examples/kitchensink/src/api/.gitkeep
similarity index 100%
rename from examples/kitchensink/api/.gitkeep
rename to examples/kitchensink/src/api/.gitkeep
diff --git a/examples/kitchensink/extensions/.gitkeep b/examples/kitchensink/src/extensions/.gitkeep
similarity index 100%
rename from examples/kitchensink/extensions/.gitkeep
rename to examples/kitchensink/src/extensions/.gitkeep
diff --git a/packages/core/admin/index.js b/packages/core/admin/index.js
index 74ddf13fdf..2b1a9a9ab6 100644
--- a/packages/core/admin/index.js
+++ b/packages/core/admin/index.js
@@ -12,7 +12,7 @@ const getWebpackConfig = require('./webpack.config');
 const getPkgPath = name => path.dirname(require.resolve(`${name}/package.json`));
 
 function getCustomWebpackConfig(dir, config) {
-  const adminConfigPath = path.join(dir, 'admin', 'webpack.config.js');
+  const adminConfigPath = path.join(dir, 'src', 'admin', 'webpack.config.js');
 
   let webpackConfig = getWebpackConfig(config);
 
@@ -162,7 +162,7 @@ async function createCacheDir({ dir, plugins }) {
   await copyAdmin(cacheDir);
 
   // Copy app.js
-  const customAdminConfigFilePath = path.join(dir, 'admin', 'app.js');
+  const customAdminConfigFilePath = path.join(dir, 'src', 'admin', 'app.js');
 
   if (fs.existsSync(customAdminConfigFilePath)) {
     await fs.copy(customAdminConfigFilePath, path.resolve(cacheDir, 'admin', 'src', 'app.js'));