diff --git a/create.js b/create.js
index d9aa4d0..81de37e 100644
--- a/create.js
+++ b/create.js
@@ -15,7 +15,7 @@ const contextDir = `${argv._[0] ?? defaultContextDir}`;
 const appsDir = `${contextDir}/apps`;
 const uiDir = `${contextDir}/apps/${appName}-ui`;
 const restDir = `${contextDir}/apps/${appName}-rest`;
-const testDir = `${contextDir}/apps/${appName}-selenium`;
+const testDir = `${contextDir}/apps/${appName}-e2e`;
 
 // prepare structure folders
 if (!fs.existsSync(uiDir)) {
@@ -33,7 +33,7 @@ if (!fs.existsSync(uiDir)) {
 
 // copy folder content
 try {
-	fs.cpSync(`${rootDir}/source/__/`, contextDir, {
+	fs.cpSync(`${rootDir}/source/global/`, contextDir, {
 		force: true,
 		recursive: true,
 	});
@@ -45,7 +45,7 @@ try {
 		force: true,
 		recursive: true,
 	});
-	fs.cpSync(`${rootDir}/source/selenium/`, testDir, {
+	fs.cpSync(`${rootDir}/source/e2e/`, testDir, {
 		force: true,
 		recursive: true,
 	});
diff --git a/source/selenium/.eslintrc b/source/e2e/.eslintrc
similarity index 100%
rename from source/selenium/.eslintrc
rename to source/e2e/.eslintrc
diff --git a/source/selenium/.tsconfig.json b/source/e2e/.tsconfig.json
similarity index 100%
rename from source/selenium/.tsconfig.json
rename to source/e2e/.tsconfig.json
diff --git a/source/selenium/config/.ci.env b/source/e2e/config/.ci.env
similarity index 100%
rename from source/selenium/config/.ci.env
rename to source/e2e/config/.ci.env
diff --git a/source/selenium/config/.local.env b/source/e2e/config/.local.env
similarity index 100%
rename from source/selenium/config/.local.env
rename to source/e2e/config/.local.env
diff --git a/source/selenium/cucumber.js b/source/e2e/cucumber.js
similarity index 100%
rename from source/selenium/cucumber.js
rename to source/e2e/cucumber.js
diff --git a/source/selenium/global.d.ts b/source/e2e/global.d.ts
similarity index 100%
rename from source/selenium/global.d.ts
rename to source/e2e/global.d.ts
diff --git a/source/selenium/package.json b/source/e2e/package.json
similarity index 100%
rename from source/selenium/package.json
rename to source/e2e/package.json
diff --git a/source/selenium/src/.tsconfig.json b/source/e2e/src/.tsconfig.json
similarity index 100%
rename from source/selenium/src/.tsconfig.json
rename to source/e2e/src/.tsconfig.json
diff --git a/source/selenium/src/common/BasePage.ts b/source/e2e/src/common/BasePage.ts
similarity index 100%
rename from source/selenium/src/common/BasePage.ts
rename to source/e2e/src/common/BasePage.ts
diff --git a/source/selenium/src/common/BaseStep.ts b/source/e2e/src/common/BaseStep.ts
similarity index 100%
rename from source/selenium/src/common/BaseStep.ts
rename to source/e2e/src/common/BaseStep.ts
diff --git a/source/selenium/src/common/WebDriver.ts b/source/e2e/src/common/WebDriver.ts
similarity index 100%
rename from source/selenium/src/common/WebDriver.ts
rename to source/e2e/src/common/WebDriver.ts
diff --git a/source/selenium/src/features/home.feature b/source/e2e/src/features/home.feature
similarity index 100%
rename from source/selenium/src/features/home.feature
rename to source/e2e/src/features/home.feature
diff --git a/source/selenium/src/pages/HomePage.ts b/source/e2e/src/pages/HomePage.ts
similarity index 100%
rename from source/selenium/src/pages/HomePage.ts
rename to source/e2e/src/pages/HomePage.ts
diff --git a/source/selenium/src/pages/components/Navigation.ts b/source/e2e/src/pages/components/Navigation.ts
similarity index 100%
rename from source/selenium/src/pages/components/Navigation.ts
rename to source/e2e/src/pages/components/Navigation.ts
diff --git a/source/selenium/src/steps/common/page.steps.ts b/source/e2e/src/steps/common/page.steps.ts
similarity index 100%
rename from source/selenium/src/steps/common/page.steps.ts
rename to source/e2e/src/steps/common/page.steps.ts
diff --git a/source/selenium/src/steps/common/session.steps.ts b/source/e2e/src/steps/common/session.steps.ts
similarity index 100%
rename from source/selenium/src/steps/common/session.steps.ts
rename to source/e2e/src/steps/common/session.steps.ts
diff --git a/source/selenium/src/steps/home.steps.ts b/source/e2e/src/steps/home.steps.ts
similarity index 100%
rename from source/selenium/src/steps/home.steps.ts
rename to source/e2e/src/steps/home.steps.ts
diff --git a/source/__/.devcontainer/Dockerfile b/source/global/.devcontainer/Dockerfile
similarity index 100%
rename from source/__/.devcontainer/Dockerfile
rename to source/global/.devcontainer/Dockerfile
diff --git a/source/__/.devcontainer/devcontainer.json b/source/global/.devcontainer/devcontainer.json
similarity index 100%
rename from source/__/.devcontainer/devcontainer.json
rename to source/global/.devcontainer/devcontainer.json
diff --git a/source/__/.devcontainer/docker-compose.yml b/source/global/.devcontainer/docker-compose.yml
similarity index 100%
rename from source/__/.devcontainer/docker-compose.yml
rename to source/global/.devcontainer/docker-compose.yml
diff --git a/source/__/.editorconfig b/source/global/.editorconfig
similarity index 100%
rename from source/__/.editorconfig
rename to source/global/.editorconfig
diff --git a/source/__/.env b/source/global/.env
similarity index 100%
rename from source/__/.env
rename to source/global/.env
diff --git a/source/__/.tsconfig.json b/source/global/.tsconfig.json
similarity index 100%
rename from source/__/.tsconfig.json
rename to source/global/.tsconfig.json
diff --git a/source/__/Jenkinsfile b/source/global/Jenkinsfile
similarity index 100%
rename from source/__/Jenkinsfile
rename to source/global/Jenkinsfile
diff --git a/source/__/gitignore b/source/global/gitignore
similarity index 100%
rename from source/__/gitignore
rename to source/global/gitignore
diff --git a/source/__/npmrc b/source/global/npmrc
similarity index 100%
rename from source/__/npmrc
rename to source/global/npmrc
diff --git a/source/__/package.json b/source/global/package.json
similarity index 100%
rename from source/__/package.json
rename to source/global/package.json
diff --git a/source/__/pnpm-workspace.yaml b/source/global/pnpm-workspace.yaml
similarity index 100%
rename from source/__/pnpm-workspace.yaml
rename to source/global/pnpm-workspace.yaml
diff --git a/source/__/prettierrc b/source/global/prettierrc
similarity index 100%
rename from source/__/prettierrc
rename to source/global/prettierrc
diff --git a/source/__/sonar-project.properties b/source/global/sonar-project.properties
similarity index 100%
rename from source/__/sonar-project.properties
rename to source/global/sonar-project.properties