diff --git a/webapp/components/notifications/NotificationPostCard.vue b/webapp/components/notifications/Notification/NotificationPostCard.vue
similarity index 100%
rename from webapp/components/notifications/NotificationPostCard.vue
rename to webapp/components/notifications/Notification/NotificationPostCard.vue
diff --git a/webapp/components/notifications/Notification.vue b/webapp/components/notifications/Notification/index.vue
similarity index 100%
rename from webapp/components/notifications/Notification.vue
rename to webapp/components/notifications/Notification/index.vue
diff --git a/webapp/components/notifications/NotificationList.vue b/webapp/components/notifications/NotificationList/index.vue
similarity index 92%
rename from webapp/components/notifications/NotificationList.vue
rename to webapp/components/notifications/NotificationList/index.vue
index 2d6cd3828..b8235f853 100644
--- a/webapp/components/notifications/NotificationList.vue
+++ b/webapp/components/notifications/NotificationList/index.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import Notification from './Notification'
+import Notification from '../Notification'
 
 export default {
   name: 'NotificationList',
diff --git a/webapp/components/notifications/NotificationList.spec.js b/webapp/components/notifications/NotificationList/spec.js
similarity index 96%
rename from webapp/components/notifications/NotificationList.spec.js
rename to webapp/components/notifications/NotificationList/spec.js
index d98a7ea31..49e7262df 100644
--- a/webapp/components/notifications/NotificationList.spec.js
+++ b/webapp/components/notifications/NotificationList/spec.js
@@ -5,8 +5,8 @@ import {
   createLocalVue,
   RouterLinkStub
 } from '@vue/test-utils'
-import NotificationList from './NotificationList.vue'
-import Notification from './Notification.vue'
+import NotificationList from '.'
+import Notification from '../Notification'
 import Vue from 'vue'
 import Vuex from 'vuex'
 
diff --git a/webapp/components/notifications/NotificationMenu.vue b/webapp/components/notifications/NotificationMenu/index.vue
similarity index 97%
rename from webapp/components/notifications/NotificationMenu.vue
rename to webapp/components/notifications/NotificationMenu/index.vue
index 4ec80657f..113b2be78 100644
--- a/webapp/components/notifications/NotificationMenu.vue
+++ b/webapp/components/notifications/NotificationMenu/index.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import NotificationList from './NotificationList'
+import NotificationList from '../NotificationList'
 import Dropdown from '~/components/Dropdown'
 import gql from 'graphql-tag'
 
diff --git a/webapp/components/notifications/NotificationMenu.spec.js b/webapp/components/notifications/NotificationMenu/spec.js
similarity index 97%
rename from webapp/components/notifications/NotificationMenu.spec.js
rename to webapp/components/notifications/NotificationMenu/spec.js
index e5d5539f8..a9f89f31f 100644
--- a/webapp/components/notifications/NotificationMenu.spec.js
+++ b/webapp/components/notifications/NotificationMenu/spec.js
@@ -1,5 +1,5 @@
 import { config, shallowMount, createLocalVue } from '@vue/test-utils'
-import NotificationMenu from './NotificationMenu.vue'
+import NotificationMenu from '.'
 
 import Styleguide from '@human-connection/styleguide'