diff --git a/components/base/AppButton.vue b/components/base/button/CommonButton.vue
similarity index 100%
rename from components/base/AppButton.vue
rename to components/base/button/CommonButton.vue
diff --git a/components/base/PermissionButton.vue b/components/base/button/PermissionButton.vue
similarity index 100%
rename from components/base/PermissionButton.vue
rename to components/base/button/PermissionButton.vue
diff --git a/components/base/ToastGrid.vue b/components/base/grid/ToastGrid.vue
similarity index 96%
rename from components/base/ToastGrid.vue
rename to components/base/grid/ToastGrid.vue
index 11f3933..a91f621 100644
--- a/components/base/ToastGrid.vue
+++ b/components/base/grid/ToastGrid.vue
@@ -1,50 +1,50 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/components/PageDescription.vue b/components/base/info/PageDescription.vue
similarity index 100%
rename from components/PageDescription.vue
rename to components/base/info/PageDescription.vue
diff --git a/components/layout/GlobalLoading.vue b/components/base/loading/GlobalLoading.vue
similarity index 100%
rename from components/layout/GlobalLoading.vue
rename to components/base/loading/GlobalLoading.vue
diff --git a/components/base/customPopup.vue b/components/base/popup/CommonPopup.vue
similarity index 73%
rename from components/base/customPopup.vue
rename to components/base/popup/CommonPopup.vue
index 5d3f600..986f892 100644
--- a/components/base/customPopup.vue
+++ b/components/base/popup/CommonPopup.vue
@@ -1,28 +1,27 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/BatchGraph.vue b/components/domain/culture-graph/BatchGraph.vue
similarity index 100%
rename from components/BatchGraph.vue
rename to components/domain/culture-graph/BatchGraph.vue
diff --git a/components/BatchTabs.vue b/components/domain/culture-graph/BatchTabs.vue
similarity index 91%
rename from components/BatchTabs.vue
rename to components/domain/culture-graph/BatchTabs.vue
index daa43d0..6a328b3 100644
--- a/components/BatchTabs.vue
+++ b/components/domain/culture-graph/BatchTabs.vue
@@ -15,7 +15,7 @@
diff --git a/components/CustomContextMenu.vue b/components/domain/culture-graph/CustomContextMenu.vue
similarity index 100%
rename from components/CustomContextMenu.vue
rename to components/domain/culture-graph/CustomContextMenu.vue
diff --git a/components/layout/ContentsWrapper.vue b/components/layout/ContentsWrapper.vue
deleted file mode 100644
index 541727f..0000000
--- a/components/layout/ContentsWrapper.vue
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
-
-
-
-
-
{{ pageTitle }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/components/layout/AppHeader.vue b/components/layout/navigation/AppHeader.vue
similarity index 88%
rename from components/layout/AppHeader.vue
rename to components/layout/navigation/AppHeader.vue
index 5e34fe2..4db0aec 100644
--- a/components/layout/AppHeader.vue
+++ b/components/layout/navigation/AppHeader.vue
@@ -18,7 +18,7 @@