diff --git a/frontend/components/organisms/layout/FeatureCard.vue b/frontend/components/layout/FeatureCard.vue
similarity index 100%
rename from frontend/components/organisms/layout/FeatureCard.vue
rename to frontend/components/layout/FeatureCard.vue
diff --git a/frontend/components/organisms/layout/FeatureCards.vue b/frontend/components/layout/FeatureCards.vue
similarity index 95%
rename from frontend/components/organisms/layout/FeatureCards.vue
rename to frontend/components/layout/FeatureCards.vue
index 552a11ac..78471fa1 100644
--- a/frontend/components/organisms/layout/FeatureCards.vue
+++ b/frontend/components/layout/FeatureCards.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import FeatureCard from '@/components/organisms/layout/FeatureCard'
+import FeatureCard from './FeatureCard'
 
 export default {
   components: {
diff --git a/frontend/components/organisms/layout/LocaleMenu.vue b/frontend/components/layout/LocaleMenu.vue
similarity index 100%
rename from frontend/components/organisms/layout/LocaleMenu.vue
rename to frontend/components/layout/LocaleMenu.vue
diff --git a/frontend/components/organisms/layout/TheBottomBanner.vue b/frontend/components/layout/TheBottomBanner.vue
similarity index 100%
rename from frontend/components/organisms/layout/TheBottomBanner.vue
rename to frontend/components/layout/TheBottomBanner.vue
diff --git a/frontend/components/organisms/layout/TheColorModeSwitcher.vue b/frontend/components/layout/TheColorModeSwitcher.vue
similarity index 100%
rename from frontend/components/organisms/layout/TheColorModeSwitcher.vue
rename to frontend/components/layout/TheColorModeSwitcher.vue
diff --git a/frontend/components/organisms/layout/TheFooter.vue b/frontend/components/layout/TheFooter.vue
similarity index 100%
rename from frontend/components/organisms/layout/TheFooter.vue
rename to frontend/components/layout/TheFooter.vue
diff --git a/frontend/components/organisms/layout/TheHeader.vue b/frontend/components/layout/TheHeader.vue
similarity index 95%
rename from frontend/components/organisms/layout/TheHeader.vue
rename to frontend/components/layout/TheHeader.vue
index 35375379..436269bd 100644
--- a/frontend/components/organisms/layout/TheHeader.vue
+++ b/frontend/components/layout/TheHeader.vue
@@ -96,8 +96,8 @@
 
 <script>
 import { mapGetters, mapActions } from 'vuex'
-import TheColorModeSwitcher from '@/components/organisms/layout/TheColorModeSwitcher'
-import LocaleMenu from '@/components/organisms/layout/LocaleMenu'
+import TheColorModeSwitcher from './TheColorModeSwitcher'
+import LocaleMenu from './LocaleMenu'
 
 export default {
   components: {
diff --git a/frontend/components/organisms/layout/TheSideBar.vue b/frontend/components/layout/TheSideBar.vue
similarity index 100%
rename from frontend/components/organisms/layout/TheSideBar.vue
rename to frontend/components/layout/TheSideBar.vue
diff --git a/frontend/components/organisms/layout/TheTopBanner.vue b/frontend/components/layout/TheTopBanner.vue
similarity index 100%
rename from frontend/components/organisms/layout/TheTopBanner.vue
rename to frontend/components/layout/TheTopBanner.vue
diff --git a/frontend/layouts/annotation.vue b/frontend/layouts/annotation.vue
index 796e9e1a..7e362781 100644
--- a/frontend/layouts/annotation.vue
+++ b/frontend/layouts/annotation.vue
@@ -139,8 +139,8 @@ import FilterButton from '@/components/containers/annotation/FilterButton'
 import ApproveButton from '@/components/containers/annotation/ApproveButton'
 import FormCreateComment from '../components/comment/FormCRUD.vue'
 import Pagination from '~/components/containers/annotation/Pagination'
-import TheHeader from '~/components/organisms/layout/TheHeader'
-import TheSideBar from '~/components/organisms/layout/TheSideBar'
+import TheHeader from '~/components/layout/TheHeader'
+import TheSideBar from '~/components/layout/TheSideBar'
 import Settings from '~/components/containers/annotation/Settings.vue'
 
 export default {
diff --git a/frontend/layouts/default.vue b/frontend/layouts/default.vue
index 4dc95f41..dfab56ed 100644
--- a/frontend/layouts/default.vue
+++ b/frontend/layouts/default.vue
@@ -7,8 +7,8 @@
 </template>
 
 <script>
-import TheFooter from '@/components/organisms/layout/TheFooter'
-import TheHeader from '@/components/organisms/layout/TheHeader'
+import TheFooter from '@/components/layout/TheFooter'
+import TheHeader from '@/components/layout/TheHeader'
 
 export default {
   middleware: ['check-auth'],
diff --git a/frontend/layouts/demo.vue b/frontend/layouts/demo.vue
index 683af241..7307d812 100644
--- a/frontend/layouts/demo.vue
+++ b/frontend/layouts/demo.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import TheHeader from '~/components/organisms/layout/TheHeader'
+import TheHeader from '~/components/layout/TheHeader'
 
 export default {
   middleware: ['check-auth'],
diff --git a/frontend/layouts/project.vue b/frontend/layouts/project.vue
index 1e4850a8..b2e298d3 100644
--- a/frontend/layouts/project.vue
+++ b/frontend/layouts/project.vue
@@ -37,8 +37,8 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import TheSideBar from '~/components/organisms/layout/TheSideBar'
-import TheHeader from '~/components/organisms/layout/TheHeader'
+import TheSideBar from '~/components/layout/TheSideBar'
+import TheHeader from '~/components/layout/TheHeader'
 
 export default {
   middleware: ['check-auth', 'auth', 'check-admin'],
diff --git a/frontend/layouts/projects.vue b/frontend/layouts/projects.vue
index 6978a0dc..2987d50c 100644
--- a/frontend/layouts/projects.vue
+++ b/frontend/layouts/projects.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import TheHeader from '~/components/organisms/layout/TheHeader'
+import TheHeader from '~/components/layout/TheHeader'
 
 export default {
   components: {
diff --git a/frontend/pages/index.vue b/frontend/pages/index.vue
index c358e301..2c5ad616 100644
--- a/frontend/pages/index.vue
+++ b/frontend/pages/index.vue
@@ -7,9 +7,9 @@
 </template>
 
 <script>
-import FeatureCards from '@/components/organisms/layout/FeatureCards'
-import TheTopBanner from '@/components/organisms/layout/TheTopBanner'
-import TheBottomBanner from '@/components/organisms/layout/TheBottomBanner'
+import FeatureCards from '@/components/layout/FeatureCards'
+import TheTopBanner from '@/components/layout/TheTopBanner'
+import TheBottomBanner from '@/components/layout/TheBottomBanner'
 
 export default {
   components: {