diff --git a/webapp/components/Empty.vue b/webapp/components/Empty/Empty.vue
similarity index 100%
rename from webapp/components/Empty.vue
rename to webapp/components/Empty/Empty.vue
diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index 7a95ada76..a39e0a148 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -98,7 +98,7 @@ import { mapGetters, mapActions } from 'vuex'
 import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 import SearchInput from '~/components/SearchInput.vue'
 import Modal from '~/components/Modal'
-import NotificationMenu from '~/components/notifications/NotificationMenu/NotificationMenu'
+import NotificationMenu from '~/components/NotificationMenu/NotificationMenu'
 import seo from '~/mixins/seo'
 import FilterPosts from '~/components/FilterPosts/FilterPosts.vue'
 import CategoryQuery from '~/graphql/CategoryQuery.js'
diff --git a/webapp/pages/admin/notifications.vue b/webapp/pages/admin/notifications.vue
index 0d348633f..faad87a46 100644
--- a/webapp/pages/admin/notifications.vue
+++ b/webapp/pages/admin/notifications.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import HcEmpty from '~/components/Empty.vue'
+import HcEmpty from '~/components/Empty/Empty'
 
 export default {
   components: {
diff --git a/webapp/pages/admin/organizations.vue b/webapp/pages/admin/organizations.vue
index 1a08056ba..a80d03a3d 100644
--- a/webapp/pages/admin/organizations.vue
+++ b/webapp/pages/admin/organizations.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import HcEmpty from '~/components/Empty.vue'
+import HcEmpty from '~/components/Empty/Empty'
 
 export default {
   components: {
diff --git a/webapp/pages/admin/pages.vue b/webapp/pages/admin/pages.vue
index 5a77d4bca..5538dfd41 100644
--- a/webapp/pages/admin/pages.vue
+++ b/webapp/pages/admin/pages.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import HcEmpty from '~/components/Empty.vue'
+import HcEmpty from '~/components/Empty/Empty'
 
 export default {
   components: {
diff --git a/webapp/pages/admin/settings.vue b/webapp/pages/admin/settings.vue
index d1fa80b36..9ad3ecd10 100644
--- a/webapp/pages/admin/settings.vue
+++ b/webapp/pages/admin/settings.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import HcEmpty from '~/components/Empty.vue'
+import HcEmpty from '~/components/Empty/Empty'
 
 export default {
   components: {
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 91e2de55f..f15634ccc 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -58,7 +58,7 @@
 
 <script>
 import FilterMenu from '~/components/FilterMenu/FilterMenu.vue'
-import HcEmpty from '~/components/Empty'
+import HcEmpty from '~/components/Empty/Empty'
 import HcPostCard from '~/components/PostCard/PostCard.vue'
 import HcLoadMore from '~/components/LoadMore.vue'
 import MasonryGrid from '~/components/MasonryGrid/MasonryGrid.vue'
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index ab72c0588..f5dd06a57 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -130,7 +130,7 @@
 </template>
 
 <script>
-import HcEmpty from '~/components/Empty.vue'
+import HcEmpty from '~/components/Empty/Empty'
 import HcRelativeDateTime from '~/components/RelativeDateTime'
 import { reportListQuery } from '~/graphql/Moderation.js'
 
diff --git a/webapp/pages/post/_id/_slug/more-info.vue b/webapp/pages/post/_id/_slug/more-info.vue
index 07b4969d3..dae3021aa 100644
--- a/webapp/pages/post/_id/_slug/more-info.vue
+++ b/webapp/pages/post/_id/_slug/more-info.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import HcEmpty from '~/components/Empty.vue'
+import HcEmpty from '~/components/Empty/Empty'
 import HcPostCard from '~/components/PostCard/PostCard.vue'
 import HcCategory from '~/components/Category'
 import HcHashtag from '~/components/Hashtag/Hashtag'
diff --git a/webapp/pages/post/_id/_slug/take-action.vue b/webapp/pages/post/_id/_slug/take-action.vue
index 38a561fe5..a476894fd 100644
--- a/webapp/pages/post/_id/_slug/take-action.vue
+++ b/webapp/pages/post/_id/_slug/take-action.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import HcEmpty from '~/components/Empty.vue'
+import HcEmpty from '~/components/Empty/Empty'
 
 export default {
   components: {
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 96167b07d..b0d6a8d11 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -278,7 +278,7 @@ import HcFollowButton from '~/components/FollowButton.vue'
 import HcCountTo from '~/components/CountTo.vue'
 import HcBadges from '~/components/Badges.vue'
 import HcLoadMore from '~/components/LoadMore.vue'
-import HcEmpty from '~/components/Empty.vue'
+import HcEmpty from '~/components/Empty/Empty'
 import ContentMenu from '~/components/ContentMenu'
 import HcUpload from '~/components/Upload'
 import HcAvatar from '~/components/Avatar/Avatar.vue'
diff --git a/webapp/pages/registration/signup.vue b/webapp/pages/registration/signup.vue
index 721cb6268..1265cc013 100644
--- a/webapp/pages/registration/signup.vue
+++ b/webapp/pages/registration/signup.vue
@@ -12,7 +12,7 @@
 
 <script>
 import Signup from '~/components/Registration/Signup'
-import HcEmpty from '~/components/Empty.vue'
+import HcEmpty from '~/components/Empty/Empty'
 
 export default {
   layout: 'no-header',
diff --git a/webapp/pages/settings/data-download.vue b/webapp/pages/settings/data-download.vue
index e54821912..4a6f35997 100644
--- a/webapp/pages/settings/data-download.vue
+++ b/webapp/pages/settings/data-download.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import HcEmpty from '~/components/Empty.vue'
+import HcEmpty from '~/components/Empty/Empty'
 
 export default {
   components: {
diff --git a/webapp/pages/settings/invites.vue b/webapp/pages/settings/invites.vue
index 80996bc9e..c81d2fa90 100644
--- a/webapp/pages/settings/invites.vue
+++ b/webapp/pages/settings/invites.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import HcEmpty from '~/components/Empty.vue'
+import HcEmpty from '~/components/Empty/Empty'
 
 export default {
   components: {
diff --git a/webapp/pages/settings/languages.vue b/webapp/pages/settings/languages.vue
index a148dab92..e93b54363 100644
--- a/webapp/pages/settings/languages.vue
+++ b/webapp/pages/settings/languages.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import HcEmpty from '~/components/Empty.vue'
+import HcEmpty from '~/components/Empty/Empty'
 
 export default {
   components: {
diff --git a/webapp/pages/settings/my-organizations.vue b/webapp/pages/settings/my-organizations.vue
index e2a5f3373..aefd602b7 100644
--- a/webapp/pages/settings/my-organizations.vue
+++ b/webapp/pages/settings/my-organizations.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import HcEmpty from '~/components/Empty.vue'
+import HcEmpty from '~/components/Empty/Empty'
 
 export default {
   components: {