diff --git a/client/cypress/integration/room-page.spec.js b/client/cypress/integration/rooms/room-page.spec.js
similarity index 100%
rename from client/cypress/integration/room-page.spec.js
rename to client/cypress/integration/rooms/room-page.spec.js
diff --git a/client/cypress/integration/rooms-page.spec.js b/client/cypress/integration/rooms/rooms-page.spec.js
similarity index 100%
rename from client/cypress/integration/rooms-page.spec.js
rename to client/cypress/integration/rooms/rooms-page.spec.js
diff --git a/client/cypress/integration/beta-login.spec.js b/client/cypress/integration/users/beta-login.spec.js
similarity index 100%
rename from client/cypress/integration/beta-login.spec.js
rename to client/cypress/integration/users/beta-login.spec.js
diff --git a/client/cypress/integration/coupon.spec.js b/client/cypress/integration/users/coupon.spec.js
similarity index 97%
rename from client/cypress/integration/coupon.spec.js
rename to client/cypress/integration/users/coupon.spec.js
index 595f503b..0c80bd5d 100644
--- a/client/cypress/integration/coupon.spec.js
+++ b/client/cypress/integration/users/coupon.spec.js
@@ -1,6 +1,6 @@
 import { GraphQLError } from 'graphql';
 
-const schema = require('../fixtures/schema.json');
+const schema = require('../../fixtures/schema.json');
 
 describe('Email Verifcation', () => {
   beforeEach(() => {
diff --git a/client/cypress/integration/login.spec.js b/client/cypress/integration/users/login.spec.js
similarity index 97%
rename from client/cypress/integration/login.spec.js
rename to client/cypress/integration/users/login.spec.js
index 3cb5d56b..f1defc6c 100644
--- a/client/cypress/integration/login.spec.js
+++ b/client/cypress/integration/users/login.spec.js
@@ -1,4 +1,4 @@
-const schema = require('../fixtures/schema_public.json');
+const schema = require('../../fixtures/schema_public.json');
 const isEmailAvailableUrl = '**/rest/deutsch/V1/customers/isEmailAvailable';
 const checkPasswordUrl = '**/rest/deutsch/V1/integration/customer/token';
 
diff --git a/client/src/components/modules/ModuleNavigation.vue b/client/src/components/modules/ModuleNavigation.vue
index e033a2e8..aedce220 100644
--- a/client/src/components/modules/ModuleNavigation.vue
+++ b/client/src/components/modules/ModuleNavigation.vue
@@ -45,6 +45,10 @@
       class="module-navigation__toggle-menu"
       v-if="canManageContent"
     >
+      <router-link
+        :to="{name: 'module-settings'}"
+        class="module-navigation__settings"
+        data-cy="module-settings-button">Einstellungen</router-link>
       <toggle-editing v-if="onModulePage"/>
       <toggle-solutions-for-module
         :slug="module.slug"
@@ -220,5 +224,9 @@
       display: flex;
       align-items: center;
     }
+
+    &__settings {
+      @include regular-text;
+    }
   }
 </style>
diff --git a/client/src/pages/module-base.vue b/client/src/pages/module/module-base.vue
similarity index 100%
rename from client/src/pages/module-base.vue
rename to client/src/pages/module/module-base.vue
diff --git a/client/src/pages/module.vue b/client/src/pages/module/module.vue
similarity index 100%
rename from client/src/pages/module.vue
rename to client/src/pages/module/module.vue
diff --git a/client/src/pages/moduleRoom.vue b/client/src/pages/module/moduleRoom.vue
similarity index 100%
rename from client/src/pages/moduleRoom.vue
rename to client/src/pages/module/moduleRoom.vue
diff --git a/client/src/pages/moduleSettings.vue b/client/src/pages/module/moduleSettings.vue
similarity index 100%
rename from client/src/pages/moduleSettings.vue
rename to client/src/pages/module/moduleSettings.vue
diff --git a/client/src/pages/moduleVisibility.vue b/client/src/pages/module/moduleVisibility.vue
similarity index 100%
rename from client/src/pages/moduleVisibility.vue
rename to client/src/pages/module/moduleVisibility.vue
diff --git a/client/src/router/index.js b/client/src/router/index.js
index 57e36b6d..b1c58d2a 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -17,7 +17,7 @@ import activity from '@/pages/activity';
 import Router from 'vue-router';
 import surveyPage from '@/pages/survey';
 import styleGuidePage from '@/pages/styleguide';
-import moduleRoom from '@/pages/moduleRoom';
+import moduleRoom from '@/pages/module/moduleRoom';
 import login from '@/pages/login';
 import betaLogin from '@/pages/beta-login';
 import hello from '@/pages/hello';
@@ -36,7 +36,6 @@ import onboardingStart from '@/pages/onboarding/start';
 import onboardingStep1 from '@/pages/onboarding/step1';
 import onboardingStep2 from '@/pages/onboarding/step2';
 import onboardingStep3 from '@/pages/onboarding/step3';
-import settingsPage from '@/pages/moduleSettings';
 
 import moduleRoutes from './module.routes';
 import portfolioRoutes from './portfolio.routes';
@@ -222,10 +221,6 @@ const routes = [
       },
     ],
   },
-  {
-    path: '/settings',
-    component: settingsPage,
-  },
   {path: '/styleguide', component: styleGuidePage},
   {
     path: '*',
diff --git a/client/src/router/module.names.js b/client/src/router/module.names.js
index ec35f516..793e0b65 100644
--- a/client/src/router/module.names.js
+++ b/client/src/router/module.names.js
@@ -1,3 +1,4 @@
 export const SUBMISSIONS_PAGE = 'submissions';
 export const MODULE_PAGE = 'module';
+export const MODULE_SETTINGS_PAGE = 'module-settings';
 export const VISIBILITY_PAGE = 'visibility';
diff --git a/client/src/router/module.routes.js b/client/src/router/module.routes.js
index 4eef3e0b..ba1d79f1 100644
--- a/client/src/router/module.routes.js
+++ b/client/src/router/module.routes.js
@@ -1,35 +1,41 @@
-import moduleBase from '@/pages/module-base';
-import module from '@/pages/module';
+import moduleBase from '@/pages/module/module-base';
+import module from '@/pages/module/module';
 import submissions from '@/pages/submissions';
-import moduleVisibility from '@/pages/moduleVisibility';
-import {MODULE_PAGE, SUBMISSIONS_PAGE, VISIBILITY_PAGE} from '@/router/module.names';
+import moduleVisibility from '@/pages/module/moduleVisibility';
+import {MODULE_PAGE, MODULE_SETTINGS_PAGE, SUBMISSIONS_PAGE, VISIBILITY_PAGE} from '@/router/module.names';
+import settingsPage from '@/pages/module/moduleSettings';
 
 export default [
-  {
-  path: '/module/:slug',
-  component: moduleBase,
-  children: [
     {
-      path: '',
-      name: MODULE_PAGE,
-      component: module,
-      meta: {filter: true},
+        path: '/module/:slug',
+        component: moduleBase,
+        children: [
+            {
+                path: '',
+                name: MODULE_PAGE,
+                component: module,
+                meta: {filter: true},
+            },
+            {
+                path: 'submissions/:id',
+                name: SUBMISSIONS_PAGE,
+                component: submissions,
+                meta: {filter: true},
+            },
+            {
+                path: 'settings',
+                name: MODULE_SETTINGS_PAGE,
+                component: settingsPage,
+            },
+            {
+                path: 'visibility',
+                name: VISIBILITY_PAGE,
+                component: moduleVisibility,
+                meta: {
+                    layout: 'simple',
+                    hideNavigation: true,
+                },
+            },
+        ],
     },
-    {
-      path: 'submissions/:id',
-      name: SUBMISSIONS_PAGE,
-      component: submissions,
-      meta: {filter: true},
-    },
-    {
-      path: 'visibility',
-      name: VISIBILITY_PAGE,
-      component: moduleVisibility,
-      meta: {
-        layout: 'simple',
-        hideNavigation: true
-      },
-    },
-  ],
-}
 ];