diff --git a/pom.xml b/pom.xml
index 4872d3e8..fe481fb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -761,7 +761,7 @@
 					<include>spring/service/cache/*.xml</include>
 					<include>sqlmapper/**/*</include>
 					<include>validator/**/*</include>
-					<include>templates/**/*</include>
+					<include>templates/thymeleaf/**/*</include>
 				</includes>
 				<filtering>true</filtering>
 			</resource>
diff --git a/src/main/java/kr/xit/framework/core/config/ThymeleafViewResolverConfig.java b/src/main/java/kr/xit/framework/core/config/ThymeleafViewResolverConfig.java
index c81d13ef..e2ba2aab 100644
--- a/src/main/java/kr/xit/framework/core/config/ThymeleafViewResolverConfig.java
+++ b/src/main/java/kr/xit/framework/core/config/ThymeleafViewResolverConfig.java
@@ -19,7 +19,7 @@ public class ThymeleafViewResolverConfig {
     public SpringResourceTemplateResolver templateResolver() {
         SpringResourceTemplateResolver templateResolver = new SpringResourceTemplateResolver();
         //templateResolver.setPrefix("classpath:/templates");
-        templateResolver.setPrefix("/WEB-INF/templates/");
+        templateResolver.setPrefix("/WEB-INF/templates/thymeleaf");
         templateResolver.setCharacterEncoding("UTF-8");
         templateResolver.setSuffix(".html");
         templateResolver.setTemplateMode("HTML5");
diff --git a/src/main/resources/spring/mvc/mvc-resolver.xml b/src/main/resources/spring/mvc/mvc-resolver.xml
index c25bfded..d84aef51 100644
--- a/src/main/resources/spring/mvc/mvc-resolver.xml
+++ b/src/main/resources/spring/mvc/mvc-resolver.xml
@@ -59,7 +59,7 @@
     <bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles3.TilesConfigurer">
         <property name="definitions">
             <list>
-                <value>/WEB-INF/tiles/layout-tiles-defs.xml</value>
+                <value>/WEB-INF/templates/tiles/layout-tiles-defs.xml</value>
 <!--                <value>/WEB-INF/freemaker/layout-freemaker-tiles-defs.xml</value>-->
             </list>
         </property>
diff --git a/src/main/webapp/WEB-INF/templates/base/error/error.html b/src/main/webapp/WEB-INF/templates/thymeleaf/base/error/error.html
similarity index 100%
rename from src/main/webapp/WEB-INF/templates/base/error/error.html
rename to src/main/webapp/WEB-INF/templates/thymeleaf/base/error/error.html
diff --git a/src/main/webapp/WEB-INF/templates/layout/cmm_body.html b/src/main/webapp/WEB-INF/templates/thymeleaf/layout/cmm_body.html
similarity index 100%
rename from src/main/webapp/WEB-INF/templates/layout/cmm_body.html
rename to src/main/webapp/WEB-INF/templates/thymeleaf/layout/cmm_body.html
diff --git a/src/main/webapp/WEB-INF/templates/layout/cmm_footer.html b/src/main/webapp/WEB-INF/templates/thymeleaf/layout/cmm_footer.html
similarity index 100%
rename from src/main/webapp/WEB-INF/templates/layout/cmm_footer.html
rename to src/main/webapp/WEB-INF/templates/thymeleaf/layout/cmm_footer.html
diff --git a/src/main/webapp/WEB-INF/templates/layout/cmm_head.html b/src/main/webapp/WEB-INF/templates/thymeleaf/layout/cmm_head.html
similarity index 100%
rename from src/main/webapp/WEB-INF/templates/layout/cmm_head.html
rename to src/main/webapp/WEB-INF/templates/thymeleaf/layout/cmm_head.html
diff --git a/src/main/webapp/WEB-INF/templates/layout/cmm_header.html b/src/main/webapp/WEB-INF/templates/thymeleaf/layout/cmm_header.html
similarity index 100%
rename from src/main/webapp/WEB-INF/templates/layout/cmm_header.html
rename to src/main/webapp/WEB-INF/templates/thymeleaf/layout/cmm_header.html
diff --git a/src/main/webapp/WEB-INF/templates/layout/cmm_script.html b/src/main/webapp/WEB-INF/templates/thymeleaf/layout/cmm_script.html
similarity index 100%
rename from src/main/webapp/WEB-INF/templates/layout/cmm_script.html
rename to src/main/webapp/WEB-INF/templates/thymeleaf/layout/cmm_script.html
diff --git a/src/main/webapp/WEB-INF/templates/layout/cmm_style.html b/src/main/webapp/WEB-INF/templates/thymeleaf/layout/cmm_style.html
similarity index 100%
rename from src/main/webapp/WEB-INF/templates/layout/cmm_style.html
rename to src/main/webapp/WEB-INF/templates/thymeleaf/layout/cmm_style.html
diff --git a/src/main/webapp/WEB-INF/templates/layout/cmm_style__.html b/src/main/webapp/WEB-INF/templates/thymeleaf/layout/cmm_style__.html
similarity index 100%
rename from src/main/webapp/WEB-INF/templates/layout/cmm_style__.html
rename to src/main/webapp/WEB-INF/templates/thymeleaf/layout/cmm_style__.html
diff --git a/src/main/webapp/WEB-INF/templates/layout/layout_biz.html b/src/main/webapp/WEB-INF/templates/thymeleaf/layout/layout_biz.html
similarity index 100%
rename from src/main/webapp/WEB-INF/templates/layout/layout_biz.html
rename to src/main/webapp/WEB-INF/templates/thymeleaf/layout/layout_biz.html
diff --git a/src/main/webapp/WEB-INF/templates/layout/layout_main.html b/src/main/webapp/WEB-INF/templates/thymeleaf/layout/layout_main.html
similarity index 100%
rename from src/main/webapp/WEB-INF/templates/layout/layout_main.html
rename to src/main/webapp/WEB-INF/templates/thymeleaf/layout/layout_main.html
diff --git a/src/main/webapp/WEB-INF/templates/list.html b/src/main/webapp/WEB-INF/templates/thymeleaf/list.html
similarity index 100%
rename from src/main/webapp/WEB-INF/templates/list.html
rename to src/main/webapp/WEB-INF/templates/thymeleaf/list.html
diff --git a/src/main/webapp/WEB-INF/tiles/layout-tiles-defs.xml b/src/main/webapp/WEB-INF/templates/tiles/layout-tiles-defs.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/tiles/layout-tiles-defs.xml
rename to src/main/webapp/WEB-INF/templates/tiles/layout-tiles-defs.xml