diff --git a/modules/layout/conf/info.xml b/modules/layout/conf/info.xml
index 830bd046d..0a73ee1ee 100644
--- a/modules/layout/conf/info.xml
+++ b/modules/layout/conf/info.xml
@@ -1,11 +1,8 @@
- 레이아웃 관리
- layout management
-
- 제로
- zero
- 레이아웃 관리 모듈
- layout management
-
+ 레이아웃 관리
+
+ 제로
+ 레이아웃을 관리하는 모듈입니다.
+
diff --git a/modules/layout/conf/module.xml b/modules/layout/conf/module.xml
index 9cb787b0d..90f005f27 100644
--- a/modules/layout/conf/module.xml
+++ b/modules/layout/conf/module.xml
@@ -1,19 +1,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/layout/queries/deleteLayout.xml b/modules/layout/queries/deleteLayout.xml
index ed7b9bbd4..ef2274982 100644
--- a/modules/layout/queries/deleteLayout.xml
+++ b/modules/layout/queries/deleteLayout.xml
@@ -1,8 +1,8 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/modules/layout/queries/deleteLayoutMenu.xml b/modules/layout/queries/deleteLayoutMenu.xml
index d4f203deb..77a6c6fdb 100644
--- a/modules/layout/queries/deleteLayoutMenu.xml
+++ b/modules/layout/queries/deleteLayoutMenu.xml
@@ -1,8 +1,8 @@
diff --git a/modules/layout/queries/deleteLayoutMenus.xml b/modules/layout/queries/deleteLayoutMenus.xml
index 8494bc66e..5501567ce 100644
--- a/modules/layout/queries/deleteLayoutMenus.xml
+++ b/modules/layout/queries/deleteLayoutMenus.xml
@@ -1,8 +1,8 @@
diff --git a/modules/layout/queries/getChildMenuCount.xml b/modules/layout/queries/getChildMenuCount.xml
index dccb4b454..65262e538 100644
--- a/modules/layout/queries/getChildMenuCount.xml
+++ b/modules/layout/queries/getChildMenuCount.xml
@@ -1,11 +1,11 @@
diff --git a/modules/layout/queries/getLayout.xml b/modules/layout/queries/getLayout.xml
index 92dea89c0..9fd528605 100644
--- a/modules/layout/queries/getLayout.xml
+++ b/modules/layout/queries/getLayout.xml
@@ -1,11 +1,11 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/modules/layout/queries/getLayoutList.xml b/modules/layout/queries/getLayoutList.xml
index de23d6d67..d71c2db7d 100644
--- a/modules/layout/queries/getLayoutList.xml
+++ b/modules/layout/queries/getLayoutList.xml
@@ -1,11 +1,11 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/modules/layout/queries/getLayoutMenu.xml b/modules/layout/queries/getLayoutMenu.xml
index 75e4c3f90..959ce8714 100644
--- a/modules/layout/queries/getLayoutMenu.xml
+++ b/modules/layout/queries/getLayoutMenu.xml
@@ -1,14 +1,14 @@
diff --git a/modules/layout/queries/getLayoutMenuList.xml b/modules/layout/queries/getLayoutMenuList.xml
index 87b4fde4c..455f5d6da 100644
--- a/modules/layout/queries/getLayoutMenuList.xml
+++ b/modules/layout/queries/getLayoutMenuList.xml
@@ -1,15 +1,15 @@
diff --git a/modules/layout/queries/insertLayout.xml b/modules/layout/queries/insertLayout.xml
index 5e56198f6..a4a175b60 100644
--- a/modules/layout/queries/insertLayout.xml
+++ b/modules/layout/queries/insertLayout.xml
@@ -1,11 +1,11 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/modules/layout/queries/insertLayoutMenu.xml b/modules/layout/queries/insertLayoutMenu.xml
index 69280433c..47891e916 100644
--- a/modules/layout/queries/insertLayoutMenu.xml
+++ b/modules/layout/queries/insertLayoutMenu.xml
@@ -1,21 +1,21 @@
diff --git a/modules/layout/queries/updateLayout.xml b/modules/layout/queries/updateLayout.xml
index 6e33ffa27..722801b69 100644
--- a/modules/layout/queries/updateLayout.xml
+++ b/modules/layout/queries/updateLayout.xml
@@ -1,12 +1,12 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/layout/queries/updateLayoutMenu.xml b/modules/layout/queries/updateLayoutMenu.xml
index e24515a64..d90b8edaf 100644
--- a/modules/layout/queries/updateLayoutMenu.xml
+++ b/modules/layout/queries/updateLayoutMenu.xml
@@ -1,18 +1,18 @@
diff --git a/modules/layout/queries/updateLayoutMenuParent.xml b/modules/layout/queries/updateLayoutMenuParent.xml
index 4f1cf576c..67971c3fc 100644
--- a/modules/layout/queries/updateLayoutMenuParent.xml
+++ b/modules/layout/queries/updateLayoutMenuParent.xml
@@ -1,12 +1,12 @@
diff --git a/modules/layout/schemas/layout_menu.xml b/modules/layout/schemas/layout_menu.xml
index 36846a02e..170c98588 100644
--- a/modules/layout/schemas/layout_menu.xml
+++ b/modules/layout/schemas/layout_menu.xml
@@ -1,16 +1,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/layout/schemas/layouts.xml b/modules/layout/schemas/layouts.xml
index 94fd19326..ab8d89b2b 100644
--- a/modules/layout/schemas/layouts.xml
+++ b/modules/layout/schemas/layouts.xml
@@ -1,7 +1,7 @@
diff --git a/modules/layout/tpl.admin/downloaded_layout_list.html b/modules/layout/tpl/downloaded_layout_list.html
similarity index 100%
rename from modules/layout/tpl.admin/downloaded_layout_list.html
rename to modules/layout/tpl/downloaded_layout_list.html
diff --git a/modules/layout/tpl.admin/filter/delete_layout.xml b/modules/layout/tpl/filter/delete_layout.xml
similarity index 100%
rename from modules/layout/tpl.admin/filter/delete_layout.xml
rename to modules/layout/tpl/filter/delete_layout.xml
diff --git a/modules/layout/tpl.admin/filter/delete_layout_menu.xml b/modules/layout/tpl/filter/delete_layout_menu.xml
similarity index 100%
rename from modules/layout/tpl.admin/filter/delete_layout_menu.xml
rename to modules/layout/tpl/filter/delete_layout_menu.xml
diff --git a/modules/layout/tpl.admin/filter/insert_layout.xml b/modules/layout/tpl/filter/insert_layout.xml
similarity index 100%
rename from modules/layout/tpl.admin/filter/insert_layout.xml
rename to modules/layout/tpl/filter/insert_layout.xml
diff --git a/modules/layout/tpl.admin/filter/insert_layout_menu.xml b/modules/layout/tpl/filter/insert_layout_menu.xml
similarity index 100%
rename from modules/layout/tpl.admin/filter/insert_layout_menu.xml
rename to modules/layout/tpl/filter/insert_layout_menu.xml
diff --git a/modules/layout/tpl.admin/filter/move_layout_menu.xml b/modules/layout/tpl/filter/move_layout_menu.xml
similarity index 100%
rename from modules/layout/tpl.admin/filter/move_layout_menu.xml
rename to modules/layout/tpl/filter/move_layout_menu.xml
diff --git a/modules/layout/tpl.admin/filter/update_layout_info.xml b/modules/layout/tpl/filter/update_layout_info.xml
similarity index 100%
rename from modules/layout/tpl.admin/filter/update_layout_info.xml
rename to modules/layout/tpl/filter/update_layout_info.xml
diff --git a/modules/layout/tpl.admin/header.html b/modules/layout/tpl/header.html
similarity index 100%
rename from modules/layout/tpl.admin/header.html
rename to modules/layout/tpl/header.html
diff --git a/modules/layout/tpl.admin/index.html b/modules/layout/tpl/index.html
similarity index 100%
rename from modules/layout/tpl.admin/index.html
rename to modules/layout/tpl/index.html
diff --git a/modules/layout/tpl.admin/insert_layout.html b/modules/layout/tpl/insert_layout.html
similarity index 100%
rename from modules/layout/tpl.admin/insert_layout.html
rename to modules/layout/tpl/insert_layout.html
diff --git a/modules/layout/tpl.admin/js/admin.js b/modules/layout/tpl/js/admin.js
similarity index 100%
rename from modules/layout/tpl.admin/js/admin.js
rename to modules/layout/tpl/js/admin.js
diff --git a/modules/layout/tpl.admin/layout_detail_info.html b/modules/layout/tpl/layout_detail_info.html
similarity index 100%
rename from modules/layout/tpl.admin/layout_detail_info.html
rename to modules/layout/tpl/layout_detail_info.html
diff --git a/modules/layout/tpl.admin/layout_info.html b/modules/layout/tpl/layout_info.html
similarity index 100%
rename from modules/layout/tpl.admin/layout_info.html
rename to modules/layout/tpl/layout_info.html
diff --git a/modules/layout/tpl.admin/layout_menu_info.html b/modules/layout/tpl/layout_menu_info.html
similarity index 100%
rename from modules/layout/tpl.admin/layout_menu_info.html
rename to modules/layout/tpl/layout_menu_info.html