diff --git a/e2e-tests/cypress/tests/.eslintignore b/e2e-tests/cypress/.eslintignore
similarity index 100%
rename from e2e-tests/cypress/tests/.eslintignore
rename to e2e-tests/cypress/.eslintignore
diff --git a/e2e-tests/cypress/tests/.eslintrc.js b/e2e-tests/cypress/.eslintrc.js
similarity index 96%
rename from e2e-tests/cypress/tests/.eslintrc.js
rename to e2e-tests/cypress/.eslintrc.js
index 9bdd630c7..98f13d176 100644
--- a/e2e-tests/cypress/tests/.eslintrc.js
+++ b/e2e-tests/cypress/.eslintrc.js
@@ -2,6 +2,7 @@ module.exports = {
   root: true,
   env: {
     node: true,
+    cypress: true,
   },
   parser: '@typescript-eslint/parser',
   plugins: ['cypress', 'prettier', '@typescript-eslint' /*, 'jest' */],
diff --git a/e2e-tests/cypress/.gitignore b/e2e-tests/cypress/.gitignore
index 7dfc547b4..1261bffa8 100644
--- a/e2e-tests/cypress/.gitignore
+++ b/e2e-tests/cypress/.gitignore
@@ -1,4 +1,4 @@
-tests/node_modules/
-tests/cypress/screenshots/
-tests/cypress/videos/
-tests/cucumber-messages.ndjson
+node_modules/
+src/screenshots/
+src/videos/
+src/cucumber-messages.ndjson
diff --git a/e2e-tests/cypress/tests/.prettierrc.js b/e2e-tests/cypress/.prettierrc.js
similarity index 100%
rename from e2e-tests/cypress/tests/.prettierrc.js
rename to e2e-tests/cypress/.prettierrc.js
diff --git a/e2e-tests/cypress/Dockerfile b/e2e-tests/cypress/Dockerfile
index 8c8e00da8..7d036c613 100644
--- a/e2e-tests/cypress/Dockerfile
+++ b/e2e-tests/cypress/Dockerfile
@@ -11,7 +11,7 @@
 ###############################################################################
 FROM cypress/base:16.14.2-slim
 
-ARG DOCKER_WORKDIR=/tests/
+ARG DOCKER_WORKDIR"="/tests"
 WORKDIR $DOCKER_WORKDIR
 
 # install dependencies
diff --git a/e2e-tests/cypress/tests/cypress.config.ts b/e2e-tests/cypress/cypress.config.ts
similarity index 100%
rename from e2e-tests/cypress/tests/cypress.config.ts
rename to e2e-tests/cypress/cypress.config.ts
diff --git a/e2e-tests/cypress/tests/package.json b/e2e-tests/cypress/package.json
similarity index 100%
rename from e2e-tests/cypress/tests/package.json
rename to e2e-tests/cypress/package.json
diff --git a/e2e-tests/cypress/tests/cypress/e2e/User.Authentication.ResetPassword.feature b/e2e-tests/cypress/src/e2e/User.Authentication.ResetPassword.feature
similarity index 100%
rename from e2e-tests/cypress/tests/cypress/e2e/User.Authentication.ResetPassword.feature
rename to e2e-tests/cypress/src/e2e/User.Authentication.ResetPassword.feature
diff --git a/e2e-tests/cypress/tests/cypress/e2e/User.Authentication.feature b/e2e-tests/cypress/src/e2e/User.Authentication.feature
similarity index 100%
rename from e2e-tests/cypress/tests/cypress/e2e/User.Authentication.feature
rename to e2e-tests/cypress/src/e2e/User.Authentication.feature
diff --git a/e2e-tests/cypress/tests/cypress/e2e/User.Registration.feature b/e2e-tests/cypress/src/e2e/User.Registration.feature
similarity index 100%
rename from e2e-tests/cypress/tests/cypress/e2e/User.Registration.feature
rename to e2e-tests/cypress/src/e2e/User.Registration.feature
diff --git a/e2e-tests/cypress/tests/cypress/e2e/UserProfile.ChangePassword.feature b/e2e-tests/cypress/src/e2e/UserProfile.ChangePassword.feature
similarity index 100%
rename from e2e-tests/cypress/tests/cypress/e2e/UserProfile.ChangePassword.feature
rename to e2e-tests/cypress/src/e2e/UserProfile.ChangePassword.feature
diff --git a/e2e-tests/cypress/tests/cypress/e2e/models/ForgotPasswordPage.ts b/e2e-tests/cypress/src/e2e/models/ForgotPasswordPage.ts
similarity index 100%
rename from e2e-tests/cypress/tests/cypress/e2e/models/ForgotPasswordPage.ts
rename to e2e-tests/cypress/src/e2e/models/ForgotPasswordPage.ts
diff --git a/e2e-tests/cypress/tests/cypress/e2e/models/LoginPage.ts b/e2e-tests/cypress/src/e2e/models/LoginPage.ts
similarity index 100%
rename from e2e-tests/cypress/tests/cypress/e2e/models/LoginPage.ts
rename to e2e-tests/cypress/src/e2e/models/LoginPage.ts
diff --git a/e2e-tests/cypress/tests/cypress/e2e/models/OverviewPage.ts b/e2e-tests/cypress/src/e2e/models/OverviewPage.ts
similarity index 100%
rename from e2e-tests/cypress/tests/cypress/e2e/models/OverviewPage.ts
rename to e2e-tests/cypress/src/e2e/models/OverviewPage.ts
diff --git a/e2e-tests/cypress/tests/cypress/e2e/models/ProfilePage.ts b/e2e-tests/cypress/src/e2e/models/ProfilePage.ts
similarity index 100%
rename from e2e-tests/cypress/tests/cypress/e2e/models/ProfilePage.ts
rename to e2e-tests/cypress/src/e2e/models/ProfilePage.ts
diff --git a/e2e-tests/cypress/tests/cypress/e2e/models/RegistrationPage.ts b/e2e-tests/cypress/src/e2e/models/RegistrationPage.ts
similarity index 100%
rename from e2e-tests/cypress/tests/cypress/e2e/models/RegistrationPage.ts
rename to e2e-tests/cypress/src/e2e/models/RegistrationPage.ts
diff --git a/e2e-tests/cypress/tests/cypress/e2e/models/ResetPasswordPage.ts b/e2e-tests/cypress/src/e2e/models/ResetPasswordPage.ts
similarity index 100%
rename from e2e-tests/cypress/tests/cypress/e2e/models/ResetPasswordPage.ts
rename to e2e-tests/cypress/src/e2e/models/ResetPasswordPage.ts
diff --git a/e2e-tests/cypress/tests/cypress/e2e/models/SideNavMenu.ts b/e2e-tests/cypress/src/e2e/models/SideNavMenu.ts
similarity index 100%
rename from e2e-tests/cypress/tests/cypress/e2e/models/SideNavMenu.ts
rename to e2e-tests/cypress/src/e2e/models/SideNavMenu.ts
diff --git a/e2e-tests/cypress/tests/cypress/e2e/models/Toasts.ts b/e2e-tests/cypress/src/e2e/models/Toasts.ts
similarity index 100%
rename from e2e-tests/cypress/tests/cypress/e2e/models/Toasts.ts
rename to e2e-tests/cypress/src/e2e/models/Toasts.ts
diff --git a/e2e-tests/cypress/tests/cypress/e2e/models/UserEMailSite.ts b/e2e-tests/cypress/src/e2e/models/UserEMailSite.ts
similarity index 100%
rename from e2e-tests/cypress/tests/cypress/e2e/models/UserEMailSite.ts
rename to e2e-tests/cypress/src/e2e/models/UserEMailSite.ts
diff --git a/e2e-tests/cypress/tests/cypress/fixtures/users.json b/e2e-tests/cypress/src/fixtures/users.json
similarity index 100%
rename from e2e-tests/cypress/tests/cypress/fixtures/users.json
rename to e2e-tests/cypress/src/fixtures/users.json
diff --git a/e2e-tests/cypress/tests/cypress/support/e2e.ts b/e2e-tests/cypress/src/support/e2e.ts
similarity index 100%
rename from e2e-tests/cypress/tests/cypress/support/e2e.ts
rename to e2e-tests/cypress/src/support/e2e.ts
diff --git a/e2e-tests/cypress/tests/cypress/support/index.ts b/e2e-tests/cypress/src/support/index.ts
similarity index 100%
rename from e2e-tests/cypress/tests/cypress/support/index.ts
rename to e2e-tests/cypress/src/support/index.ts
diff --git a/e2e-tests/cypress/tests/cypress/support/step_definitions/common_steps.ts b/e2e-tests/cypress/src/support/step_definitions/common_steps.ts
similarity index 100%
rename from e2e-tests/cypress/tests/cypress/support/step_definitions/common_steps.ts
rename to e2e-tests/cypress/src/support/step_definitions/common_steps.ts
diff --git a/e2e-tests/cypress/tests/cypress/support/step_definitions/email_steps.ts b/e2e-tests/cypress/src/support/step_definitions/email_steps.ts
similarity index 90%
rename from e2e-tests/cypress/tests/cypress/support/step_definitions/email_steps.ts
rename to e2e-tests/cypress/src/support/step_definitions/email_steps.ts
index b313442f2..7d70e36bc 100644
--- a/e2e-tests/cypress/tests/cypress/support/step_definitions/email_steps.ts
+++ b/e2e-tests/cypress/src/support/step_definitions/email_steps.ts
@@ -1,6 +1,6 @@
 import { Then, When } from '@badeball/cypress-cucumber-preprocessor'
-import { ResetPasswordPage } from '../../e2e/models/ResetPasswordPage'
-import { UserEMailSite } from '../../e2e/models/UserEMailSite'
+import { ResetPasswordPage } from '@models/ResetPasswordPage'
+import { UserEMailSite } from '@models/UserEMailSite'
 
 const userEMailSite = new UserEMailSite()
 const resetPasswordPage = new ResetPasswordPage()
diff --git a/e2e-tests/cypress/tests/cypress/support/step_definitions/user_authentication_steps.ts b/e2e-tests/cypress/src/support/step_definitions/user_authentication_steps.ts
similarity index 100%
rename from e2e-tests/cypress/tests/cypress/support/step_definitions/user_authentication_steps.ts
rename to e2e-tests/cypress/src/support/step_definitions/user_authentication_steps.ts
diff --git a/e2e-tests/cypress/tests/cypress/support/step_definitions/user_profile_change_password_steps.ts b/e2e-tests/cypress/src/support/step_definitions/user_profile_change_password_steps.ts
similarity index 100%
rename from e2e-tests/cypress/tests/cypress/support/step_definitions/user_profile_change_password_steps.ts
rename to e2e-tests/cypress/src/support/step_definitions/user_profile_change_password_steps.ts
diff --git a/e2e-tests/cypress/tests/cypress/support/step_definitions/user_registration_steps.ts b/e2e-tests/cypress/src/support/step_definitions/user_registration_steps.ts
similarity index 91%
rename from e2e-tests/cypress/tests/cypress/support/step_definitions/user_registration_steps.ts
rename to e2e-tests/cypress/src/support/step_definitions/user_registration_steps.ts
index 8f12338b0..6f4034447 100644
--- a/e2e-tests/cypress/tests/cypress/support/step_definitions/user_registration_steps.ts
+++ b/e2e-tests/cypress/src/support/step_definitions/user_registration_steps.ts
@@ -1,5 +1,5 @@
 import { And, When } from '@badeball/cypress-cucumber-preprocessor'
-import { RegistrationPage } from '../../e2e/models/RegistrationPage'
+import { RegistrationPage } from '@models/RegistrationPage'
 
 const registrationPage = new RegistrationPage()
 
diff --git a/e2e-tests/cypress/tests/tsconfig.json b/e2e-tests/cypress/tests/tsconfig.json
deleted file mode 100644
index 287443d46..000000000
--- a/e2e-tests/cypress/tests/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es2016",
-    "lib": ["es6", "dom"],
-    "baseUrl": ".",
-    "types": ["cypress", "node"],
-    "strict": true
-  },
-  "include": ["**/*.ts"]
-}
diff --git a/e2e-tests/cypress/tsconfig.json b/e2e-tests/cypress/tsconfig.json
new file mode 100644
index 000000000..4d863857b
--- /dev/null
+++ b/e2e-tests/cypress/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "target": "es2016",
+    "lib": ["es6", "dom"],
+    "baseUrl": ".",
+    "types": ["cypress", "node"],
+    "strict": true,
+    "esModuleInterop": true,     
+    "moduleResolution": "node",
+    "paths": {
+      "@/*": ["src/*"],
+      "@models/*": ["src/e2e/models/*"],
+    }
+  },
+}
diff --git a/e2e-tests/cypress/tests/yarn.lock b/e2e-tests/cypress/yarn.lock
similarity index 100%
rename from e2e-tests/cypress/tests/yarn.lock
rename to e2e-tests/cypress/yarn.lock