diff --git a/modules/module/tpl/category_list.html b/modules/module/tpl/category_list.html
index 88b9aa9ad..d3f30f0c7 100644
--- a/modules/module/tpl/category_list.html
+++ b/modules/module/tpl/category_list.html
@@ -5,32 +5,32 @@
 
 <!-- 카테고리의 위/아래, 삭제와 관련된 form -->
 <form id="fo_category_info" action="./" method="get">
-<input type="hidden" name="module_category_srl" value="" />
-<input type="hidden" name="mode" value="" />
+    <input type="hidden" name="module_category_srl" value="" />
+    <input type="hidden" name="mode" value="" />
 </form>
 
 <div>
-  <table>
-  <tr>
-    <th>{$lang->category_title}</th>
-    <th>{$lang->regdate}</th>
-    <th>{$lang->cmd_modify}</th>
-    <th>{$lang->cmd_delete}</th>
-  </tr>
-  <!--@if(!count($category_list))-->
-  <tr>
-    <td colspan="4">{$lang->msg_category_is_null}</td>
-  </tr>
-  <!--@end-->
-  <!--@foreach($category_list as $key => $val)-->
-  <tr>
-    <td>{$val->title}</td>
-    <td>{zdate($val->regdate,"Y-m-d H:i:s")}</td>
-    <td><a href="{getUrl('module_category_srl',$val->module_category_srl)}">{$lang->cmd_modify}</a></td>
-    <td><a href="#" onclick="doUpdateCategory('{$val->module_category_srl}','delete','{$lang->confirm_delete}');return false;">{$lang->cmd_delete}</a></td>
-  </tr>
-  <!--@end-->
-  </table>
+    <table>
+    <tr>
+        <th>{$lang->category_title}</th>
+        <th>{$lang->regdate}</th>
+        <th>{$lang->cmd_modify}</th>
+        <th>{$lang->cmd_delete}</th>
+    </tr>
+    <!--@if(!count($category_list))-->
+    <tr>
+        <td colspan="4">{$lang->msg_category_is_null}</td>
+    </tr>
+    <!--@end-->
+    <!--@foreach($category_list as $key => $val)-->
+    <tr>
+        <td>{$val->title}</td>
+        <td>{zdate($val->regdate,"Y-m-d H:i:s")}</td>
+        <td><a href="{getUrl('module_category_srl',$val->module_category_srl)}">{$lang->cmd_modify}</a></td>
+        <td><a href="#" onclick="doUpdateCategory('{$val->module_category_srl}','delete','{$lang->confirm_delete}');return false;">{$lang->cmd_delete}</a></td>
+    </tr>
+    <!--@end-->
+    </table>
 </div>
 
 <!-- 카테고리 추가 -->
@@ -40,9 +40,9 @@
 <input type="hidden" name="module_category_srl" value="" />
 
 <div>
-  {$lang->category_title} :
-  <input type="text" name="title" />
-  <input type="submit" value="{$lang->cmd_registration}" accesskey="s" />
+    {$lang->category_title} :
+    <input type="text" name="title" />
+    <input type="submit" value="{$lang->cmd_registration}" accesskey="s" />
 </div>
 
 </form>
diff --git a/modules/module/tpl/category_update_form.html b/modules/module/tpl/category_update_form.html
index b2cb54930..455ef04f4 100644
--- a/modules/module/tpl/category_update_form.html
+++ b/modules/module/tpl/category_update_form.html
@@ -5,15 +5,15 @@
 <!-- 카테고리 수정 -->
 <!--@if($selected_category)-->
 <form action="./" method="post" onsubmit="return procFilter(this, update_category)" enctype="multipart/form-data">
-<input type="hidden" name="module_category_srl" value="{$selected_category->module_category_srl}" />
-<input type="hidden" name="mode" value="update" />
+    <input type="hidden" name="module_category_srl" value="{$selected_category->module_category_srl}" />
+    <input type="hidden" name="mode" value="update" />
 
-<div style="margin-bottom:30px">
-  {$lang->category_title} :
-  <input type="text" name="title" value="{$selected_category->title}" />
-  <input type="submit" value="{$lang->cmd_modify}" />
-  <input type="button" value="{$lang->cmd_cancel}" onclick="location.href='{getUrl('category_srl','')}'" />
-</div>
+    <div style="margin-bottom:30px">
+        {$lang->category_title} :
+        <input type="text" name="title" value="{$selected_category->title}" />
+        <input type="submit" value="{$lang->cmd_modify}" />
+        <input type="button" value="{$lang->cmd_cancel}" onclick="location.href='{getUrl('category_srl','')}'" />
+    </div>
 
 </form>
 <!--@end-->
diff --git a/modules/module/tpl/config.html b/modules/module/tpl/config.html
index 34846c829..07082f5cc 100644
--- a/modules/module/tpl/config.html
+++ b/modules/module/tpl/config.html
@@ -1,19 +1,19 @@
 <!--#include("header.html")-->
 
 <form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
-  <table border="1">
-  <tr>
-    <th rowspan="2">{$lang->test}</th>
-    <td><input type="text" name="test" value="{$config->test}" /></td>
-  </tr>
-  <tr>
-    <td>{$lang->about_test}</td>
-  </tr>
-  <tr>
-    <td colspan="2">
-      <input type="button" value="{$lang->cmd_cancel}" onclick="location.href='{getUrl('act','')}'" />
-      <input type="submit" value="{$lang->cmd_registration}" accesskey="s" />
-    </td>
-  </tr>
-  </table>
+    <table border="1">
+    <tr>
+        <th rowspan="2">{$lang->test}</th>
+        <td><input type="text" name="test" value="{$config->test}" /></td>
+    </tr>
+    <tr>
+        <td>{$lang->about_test}</td>
+    </tr>
+    <tr>
+        <td colspan="2">
+            <input type="button" value="{$lang->cmd_cancel}" onclick="location.href='{getUrl('act','')}'" />
+            <input type="submit" value="{$lang->cmd_registration}" accesskey="s" />
+        </td>
+    </tr>
+    </table>
 </form>
diff --git a/modules/module/tpl/filter/insert_category.xml b/modules/module/tpl/filter/insert_category.xml
index cb8c6d879..6b7885450 100644
--- a/modules/module/tpl/filter/insert_category.xml
+++ b/modules/module/tpl/filter/insert_category.xml
@@ -1,10 +1,10 @@
-<filter name="insert_category" module="module" act="procInsertCategory" confirm_msg_code="confirm_submit">
-  <form>
-    <node target="title" required="true" />
-  </form>
-  <response callback_func="completeUpdateCategory">
-    <tag name="error" />
-    <tag name="message" />
-    <tag name="page" />
-  </response>
+<filter name="insert_category" module="module" act="procModuleAdminInsertCategory" confirm_msg_code="confirm_submit">
+    <form>
+        <node target="title" required="true" />
+    </form>
+    <response callback_func="completeUpdateCategory">
+        <tag name="error" />
+        <tag name="message" />
+        <tag name="page" />
+    </response>
 </filter>
diff --git a/modules/module/tpl/filter/insert_shortcut.xml b/modules/module/tpl/filter/insert_shortcut.xml
index 04a4c8885..9d8006f4e 100644
--- a/modules/module/tpl/filter/insert_shortcut.xml
+++ b/modules/module/tpl/filter/insert_shortcut.xml
@@ -1,9 +1,9 @@
-<filter name="insert_shortcut" module="admin" act="procInsertShortCut" confirm_msg_code="confirm_submit">
-  <form>
-    <node target="module" required="true" />
-  </form>
-  <response>
-    <tag name="error" />
-    <tag name="message" />
-  </response>
+<filter name="insert_shortcut" module="admin" act="procAdminInsertShortCut" confirm_msg_code="confirm_submit">
+    <form>
+        <node target="module" required="true" />
+    </form>
+    <response>
+        <tag name="error" />
+        <tag name="message" />
+    </response>
 </filter>
diff --git a/modules/module/tpl/filter/update_category.xml b/modules/module/tpl/filter/update_category.xml
index e42997946..5073021d0 100644
--- a/modules/module/tpl/filter/update_category.xml
+++ b/modules/module/tpl/filter/update_category.xml
@@ -1,10 +1,10 @@
-<filter name="update_category" module="module" act="procUpdateCategory">
-  <form>
-    <node target="module_category_srl" required="true" />
-    <node target="mode" required="true" />
-  </form>
-  <response callback_func="completeUpdateCategory">
-    <tag name="error" />
-    <tag name="message" />
-  </response>
+<filter name="update_category" module="module" act="procModuleAdminUpdateCategory">
+    <form>
+        <node target="module_category_srl" required="true" />
+        <node target="mode" required="true" />
+    </form>
+    <response callback_func="completeUpdateCategory">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
 </filter>
diff --git a/modules/module/tpl/header.html b/modules/module/tpl/header.html
index 01f00d307..43b2aa1bd 100644
--- a/modules/module/tpl/header.html
+++ b/modules/module/tpl/header.html
@@ -3,8 +3,8 @@
 <!--@if($mo=="module")-->
 
 <div style="margin-bottom:20px;">
-  <span <!--@if($act=='dispContent')-->style="font-weight:bold"<!--@end-->>[<a href="{getUrl('act','dispContent')}">{$lang->module_index}</a>]</span>
-  <span <!--@if($act=='dispCategory')-->style="font-weight:bold"<!--@end-->>[<a href="{getUrl('act','dispCategory')}">{$lang->module_category}</a>]</span>
+    <span <!--@if($act=='dispModuleAdminContent')-->style="font-weight:bold"<!--@end-->>[<a href="{getUrl('act','dispModuleAdminContent')}">{$lang->module_index}</a>]</span>
+    <span <!--@if($act=='dispModuleAdminCategory')-->style="font-weight:bold"<!--@end-->>[<a href="{getUrl('act','dispModuleAdminCategory')}">{$lang->module_category}</a>]</span>
 </div>
 
 <!--@end-->
diff --git a/modules/module/tpl/js/admin.js b/modules/module/tpl/js/admin.js
index 585e695ce..a59ac1cb7 100644
--- a/modules/module/tpl/js/admin.js
+++ b/modules/module/tpl/js/admin.js
@@ -1,33 +1,33 @@
 /**
- * @file   : modules/module/js/admin.js
- * @author : zero <zero@nzeo.com>
- * @desc   : module 모듈의 관리자용 javascript
+ * @file     modules/module/js/admin.js
+ * @author zero (zero@nzeo.com)
+ * @desc     module 모듈의 관리자용 javascript
  **/
 
 /* 카테고리 관련 작업들 */
 function doUpdateCategory(module_category_srl, mode, message) {
-  if(typeof(message)!='undefined'&&!confirm(message)) return;
+    if(typeof(message)!='undefined'&&!confirm(message)) return;
 
-  var fo_obj = xGetElementById('fo_category_info');
-  fo_obj.module_category_srl.value = module_category_srl;
-  fo_obj.mode.value = mode;
+    var fo_obj = xGetElementById('fo_category_info');
+    fo_obj.module_category_srl.value = module_category_srl;
+    fo_obj.mode.value = mode;
 
-  procFilter(fo_obj, update_category);
+    procFilter(fo_obj, update_category);
 }
 
 /* 카테고리 정보 수정 후 */
 function completeUpdateCategory(ret_obj) {
-  var error = ret_obj['error'];
-  var message = ret_obj['message'];
-  alert(message);
+    var error = ret_obj['error'];
+    var message = ret_obj['message'];
+    alert(message);
 
-  var url = "./?module=admin&mo=module&act=dispCategory";
-  location.href = url;
+    var url = "./?module=admin&mo=module&act=dispCategory";
+    location.href = url;
 }
 
 /* 선택된 모듈을 관리자 메뉴의 바로가기에 등록 */
 function doAddShortCut(module) {
-  var fo_obj = xGetElementById("fo_shortcut");
-  fo_obj.selected_module.value = module;
-  procFilter(fo_obj, insert_shortcut);
+    var fo_obj = xGetElementById("fo_shortcut");
+    fo_obj.selected_module.value = module;
+    procFilter(fo_obj, insert_shortcut);
 }
diff --git a/modules/module/tpl/module_info.html b/modules/module/tpl/module_info.html
index 09a09af45..df2568c72 100644
--- a/modules/module/tpl/module_info.html
+++ b/modules/module/tpl/module_info.html
@@ -2,55 +2,55 @@
 <col width="100" />
 <col width="300" />
 <tr>
-  <th colspan="2">{$lang->module_maker}</th>
+    <th colspan="2">{$lang->module_maker}</th>
 </tr>
 <tr>
-  <th>{$lang->title}</th>
-  <td>{$module_info->title} ver {$module_info->version}</td>
+    <th>{$lang->title}</th>
+    <td>{$module_info->title} ver {$module_info->version}</td>
 </tr>
 <tr>
-  <th>{$lang->author}</th>
-  <td><a href="mailto:{$module_info->author->email_address}">{$module_info->author->name}</a></td>
+    <th>{$lang->author}</th>
+    <td><a href="mailto:{$module_info->author->email_address}">{$module_info->author->name}</a></td>
 </tr>
 <tr>
-  <th>{$lang->homepage}</th>
-  <td><a href="#" onclick="window.open('{$module_info->author->homepage}');return false;">{$module_info->author->homepage}</a></td>
+    <th>{$lang->homepage}</th>
+    <td><a href="#" onclick="window.open('{$module_info->author->homepage}');return false;">{$module_info->author->homepage}</a></td>
 </tr>
 <tr>
-  <th>{$lang->regdate}</th>
-  <td>{$module_info->author->date}</td>
+    <th>{$lang->regdate}</th>
+    <td>{$module_info->author->date}</td>
 </tr>
 <tr>
-  <th>{$lang->description}</th>
-  <td>{nl2br($module_info->author->description)}</td>
+    <th>{$lang->description}</th>
+    <td>{nl2br($module_info->author->description)}</td>
 </tr>
 
 <tr>
-  <th colspan="2">{$lang->module_history}</th>
+    <th colspan="2">{$lang->module_history}</th>
 </tr>
 <!--@foreach($module_info->history as $history)-->
 <!--@if($history->name)-->
 <tr>
-  <th>{$lang->name}</th>
-  <td><a href="mailto:{$history->email_address}">{$history->name}</a></td>
+    <th>{$lang->name}</th>
+    <td><a href="mailto:{$history->email_address}">{$history->name}</a></td>
 </tr>
 <tr>
-  <th>{$lang->homepage}</th>
-  <td><a href="#" onclick="window.open('{$history->homepage}');return false;">{$history->homepage}</a></td>
+    <th>{$lang->homepage}</th>
+    <td><a href="#" onclick="window.open('{$history->homepage}');return false;">{$history->homepage}</a></td>
 </tr>
 <tr>
-  <th>{$lang->regdate}</th>
-  <td>{$history->date}</td>
+    <th>{$lang->regdate}</th>
+    <td>{$history->date}</td>
 </tr>
 <tr>
-  <th>{$lang->description}</th>
-  <td>{nl2br($history->description)}</td>
+    <th>{$lang->description}</th>
+    <td>{nl2br($history->description)}</td>
 </tr>
 <!--@end-->
 <!--@end-->
 <tr>
-  <td colspan="2">
-    <a href="#" onclick="self.close()">{$lang->cmd_close}</a>
-  </td>
+    <td colspan="2">
+        <a href="#" onclick="self.close()">{$lang->cmd_close}</a>
+    </td>
 </tr>
 </table>
diff --git a/modules/module/tpl/module_list.html b/modules/module/tpl/module_list.html
index 1345afa21..5065ba359 100644
--- a/modules/module/tpl/module_list.html
+++ b/modules/module/tpl/module_list.html
@@ -5,54 +5,54 @@
 
 <!-- 관리자 메뉴 바로가기 추가를 위한 임시 form -->
 <form id="fo_shortcut" action="./" method="get">
-  <input type="hidden" name="selected_module" value="" />
+    <input type="hidden" name="selected_module" value="" />
 </form>
 
 <table border="1" width="100%">
 <tr>
-  <td>{$lang->module_name}</td>
-  <td>{$lang->version}</td>
-  <td>{$lang->author}</td>
-  <td>{$lang->date}</td>
-  <td>{$lang->table_count}</td>
-  <td>{$lang->installed_path}</td>
-  <td>{$lang->module_info}</td>
-  <td>{$lang->add_shortcut}</td>
+    <td>{$lang->module_name}</td>
+    <td>{$lang->version}</td>
+    <td>{$lang->author}</td>
+    <td>{$lang->date}</td>
+    <td>{$lang->table_count}</td>
+    <td>{$lang->installed_path}</td>
+    <td>{$lang->module_info}</td>
+    <td>{$lang->add_shortcut}</td>
 </tr>
 <!--@foreach($module_list as $key => $val)-->
 <tr>
-  <td rowspan="2">
-    <!--@if($val->admin_index_act)-->
-      <a href="#" onclick="location.href='{getUrl('mo',$val->module,'act',$val->admin_index_act)}'">{$val->title}</a> <br /> ({$val->module})
-    <!--@else-->
-      {$val->title} <br />
-      ({$val->module})
-    <!--@end-->
-  </td>
-  <td>{$val->version}</td>
-  <td><a href="#" onclick="window.open('{$val->author->homepage}')">{$val->author->name}</a></td>
-  <td>{$val->author->date}</td>
-  <td>
-    <!--@if($val->created_table_count != $val->table_count)-->
-      <span style="color:red">
-    <!--@else-->
-      <span>
-    <!--@end-->
-        {$val->created_table_count}/{$val->table_count}
-      </span>
-  </td>
-  <td>{$val->path}</td>
-  <td><a href="#" onclick="winopen('{getUrl('','module','module','act','dispModuleInfo','selected_module',$val->module)}','module_info','width=10,height=10,toolbars=no,scrollbars=yes,resizable=yes');return false">{$lang->cmd_view}</a></td>
-  <td rowspan="2">
-    <!--@if(!$shortcut_list[$val->module] && $val->admin_index_act )-->
-    <a href="#" onclick="doAddShortCut('{$val->module}');return false;">{$lang->cmd_add_shortcut}</a>
-    <!--@end-->
-  </td>
+    <td rowspan="2">
+        <!--@if($val->admin_index_act)-->
+            <a href="#" onclick="location.href='{getUrl('mo',$val->module,'act',$val->admin_index_act)}'">{$val->title}</a> <br /> ({$val->module})
+        <!--@else-->
+            {$val->title} <br />
+            ({$val->module})
+        <!--@end-->
+    </td>
+    <td>{$val->version}</td>
+    <td><a href="#" onclick="window.open('{$val->author->homepage}')">{$val->author->name}</a></td>
+    <td>{$val->author->date}</td>
+    <td>
+        <!--@if($val->created_table_count != $val->table_count)-->
+            <span style="color:red">
+        <!--@else-->
+            <span>
+        <!--@end-->
+                {$val->created_table_count}/{$val->table_count}
+            </span>
+    </td>
+    <td>{$val->path}</td>
+    <td><a href="#" onclick="winopen('{getUrl('','module','module','act','dispModuleAdminInfo','selected_module',$val->module)}','module_info','width=10,height=10,toolbars=no,scrollbars=yes,resizable=yes');return false">{$lang->cmd_view}</a></td>
+    <td rowspan="2">
+        <!--@if(!$shortcut_list[$val->module] && $val->admin_index_act )-->
+        <a href="#" onclick="doAddShortCut('{$val->module}');return false;">{$lang->cmd_add_shortcut}</a>
+        <!--@end-->
+    </td>
 </tr>
 <tr>
-  <td colspan="6">
-    {nl2br($val->author->description)}
-  </td>
+    <td colspan="6">
+        {nl2br($val->author->description)}
+    </td>
 </tr>
 <!--@end-->
 </table>
diff --git a/modules/pagemaker/conf/info.xml b/modules/pagemaker/conf/info.xml
index 244bbad3e..308d8a057 100644
--- a/modules/pagemaker/conf/info.xml
+++ b/modules/pagemaker/conf/info.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module version="0.1">
-  <title xml:lang="ko">페이지 제작</title>
-  <title xml:lang="en">page maker</title>
-  <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2007. 2. 28">
-    <name xml:lang="ko">제로</name>
-    <name xml:lang="en">zero</name>
-    <description xml:lang="ko">페이지를 만듬</description>
-    <description xml:lang="en">make page</description>
-  </author>
+    <title xml:lang="ko">페이지 제작</title>
+    <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2007. 2. 28">
+        <name xml:lang="ko">제로</name>
+        <description xml:lang="ko">페이지를 제작하여 컨텐츠로 연결할 수 있는 모듈</description>
+    </author>
 </module>
diff --git a/modules/pagemaker/tpl.admin/content.html b/modules/pagemaker/tpl/content.html
similarity index 100%
rename from modules/pagemaker/tpl.admin/content.html
rename to modules/pagemaker/tpl/content.html
diff --git a/modules/pagemaker/tpl.admin/filter/delete_page.xml b/modules/pagemaker/tpl/filter/delete_page.xml
similarity index 100%
rename from modules/pagemaker/tpl.admin/filter/delete_page.xml
rename to modules/pagemaker/tpl/filter/delete_page.xml
diff --git a/modules/pagemaker/tpl.admin/filter/insert_config.xml b/modules/pagemaker/tpl/filter/insert_config.xml
similarity index 100%
rename from modules/pagemaker/tpl.admin/filter/insert_config.xml
rename to modules/pagemaker/tpl/filter/insert_config.xml
diff --git a/modules/pagemaker/tpl.admin/filter/insert_page.xml b/modules/pagemaker/tpl/filter/insert_page.xml
similarity index 100%
rename from modules/pagemaker/tpl.admin/filter/insert_page.xml
rename to modules/pagemaker/tpl/filter/insert_page.xml
diff --git a/modules/pagemaker/tpl.admin/index.html b/modules/pagemaker/tpl/index.html
similarity index 100%
rename from modules/pagemaker/tpl.admin/index.html
rename to modules/pagemaker/tpl/index.html
diff --git a/modules/pagemaker/tpl.admin/js/admin.js b/modules/pagemaker/tpl/js/admin.js
similarity index 100%
rename from modules/pagemaker/tpl.admin/js/admin.js
rename to modules/pagemaker/tpl/js/admin.js
diff --git a/modules/pagemaker/tpl.admin/page_config.html b/modules/pagemaker/tpl/page_config.html
similarity index 100%
rename from modules/pagemaker/tpl.admin/page_config.html
rename to modules/pagemaker/tpl/page_config.html
diff --git a/modules/pagemaker/tpl.admin/page_delete.html b/modules/pagemaker/tpl/page_delete.html
similarity index 100%
rename from modules/pagemaker/tpl.admin/page_delete.html
rename to modules/pagemaker/tpl/page_delete.html
diff --git a/modules/pagemaker/tpl.admin/page_info.html b/modules/pagemaker/tpl/page_info.html
similarity index 100%
rename from modules/pagemaker/tpl.admin/page_info.html
rename to modules/pagemaker/tpl/page_info.html
diff --git a/modules/pagemaker/tpl.admin/page_insert.html b/modules/pagemaker/tpl/page_insert.html
similarity index 100%
rename from modules/pagemaker/tpl.admin/page_insert.html
rename to modules/pagemaker/tpl/page_insert.html