diff --git a/webmagic-avalon/webmagic-admin/src/main/resources/spring/applicationContext-myBatis.xml b/webmagic-avalon/webmagic-admin/src/main/resources/spring/applicationContext-myBatis.xml
deleted file mode 100644
index 222df02..0000000
--- a/webmagic-avalon/webmagic-admin/src/main/resources/spring/applicationContext-myBatis.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/webmagic-avalon/webmagic-admin/src/main/resources/spring/applicationContext.xml b/webmagic-avalon/webmagic-admin/src/main/resources/spring/applicationContext.xml
deleted file mode 100644
index 7c19641..0000000
--- a/webmagic-avalon/webmagic-admin/src/main/resources/spring/applicationContext.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-
- web_messages
-
-
-
-
-
-
-
-
-
-
-
-
- text/html;charset=UTF-8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/webmagic-avalon/webmagic-admin/src/main/webapp/WEB-INF/web.xml b/webmagic-avalon/webmagic-admin/src/main/webapp/WEB-INF/web.xml
index eb253f3..4c255cd 100644
--- a/webmagic-avalon/webmagic-admin/src/main/webapp/WEB-INF/web.xml
+++ b/webmagic-avalon/webmagic-admin/src/main/webapp/WEB-INF/web.xml
@@ -7,7 +7,7 @@
contextConfigLocation
- classpath*:spring/applicationContext*.xml,
+ classpath*:/config/spring/applicationContext*.xml,
diff --git a/webmagic-avalon/webmagic-avalon-common/src/main/resources/freemarker.properties b/webmagic-avalon/webmagic-avalon-common/src/main/resources/config/freemarker.properties
similarity index 100%
rename from webmagic-avalon/webmagic-avalon-common/src/main/resources/freemarker.properties
rename to webmagic-avalon/webmagic-avalon-common/src/main/resources/config/freemarker.properties
diff --git a/webmagic-avalon/webmagic-avalon-common/src/main/resources/log/log4j.xml b/webmagic-avalon/webmagic-avalon-common/src/main/resources/config/log/log4j.xml
similarity index 100%
rename from webmagic-avalon/webmagic-avalon-common/src/main/resources/log/log4j.xml
rename to webmagic-avalon/webmagic-avalon-common/src/main/resources/config/log/log4j.xml
diff --git a/webmagic-avalon/webmagic-avalon-common/src/main/resources/mapper/DynamicClass.xml b/webmagic-avalon/webmagic-avalon-common/src/main/resources/config/mapper/DynamicClass.xml
similarity index 100%
rename from webmagic-avalon/webmagic-avalon-common/src/main/resources/mapper/DynamicClass.xml
rename to webmagic-avalon/webmagic-avalon-common/src/main/resources/config/mapper/DynamicClass.xml
diff --git a/webmagic-avalon/webmagic-avalon-common/src/main/resources/spring/applicationContext-component.xml b/webmagic-avalon/webmagic-avalon-common/src/main/resources/config/spring/applicationContext-component.xml
similarity index 100%
rename from webmagic-avalon/webmagic-avalon-common/src/main/resources/spring/applicationContext-component.xml
rename to webmagic-avalon/webmagic-avalon-common/src/main/resources/config/spring/applicationContext-component.xml
diff --git a/webmagic-avalon/webmagic-avalon-common/src/main/resources/spring/applicationContext-datasource.xml b/webmagic-avalon/webmagic-avalon-common/src/main/resources/config/spring/applicationContext-datasource.xml
similarity index 100%
rename from webmagic-avalon/webmagic-avalon-common/src/main/resources/spring/applicationContext-datasource.xml
rename to webmagic-avalon/webmagic-avalon-common/src/main/resources/config/spring/applicationContext-datasource.xml
diff --git a/webmagic-avalon/webmagic-admin/src/main/resources/spring/applicationContext-freemarker.xml b/webmagic-avalon/webmagic-avalon-common/src/main/resources/config/spring/applicationContext-freemarker.xml
similarity index 100%
rename from webmagic-avalon/webmagic-admin/src/main/resources/spring/applicationContext-freemarker.xml
rename to webmagic-avalon/webmagic-avalon-common/src/main/resources/config/spring/applicationContext-freemarker.xml
diff --git a/webmagic-avalon/webmagic-avalon-common/src/main/resources/spring/applicationContext-myBatis.xml b/webmagic-avalon/webmagic-avalon-common/src/main/resources/config/spring/applicationContext-myBatis.xml
similarity index 93%
rename from webmagic-avalon/webmagic-avalon-common/src/main/resources/spring/applicationContext-myBatis.xml
rename to webmagic-avalon/webmagic-avalon-common/src/main/resources/config/spring/applicationContext-myBatis.xml
index e8a8629..8601852 100644
--- a/webmagic-avalon/webmagic-avalon-common/src/main/resources/spring/applicationContext-myBatis.xml
+++ b/webmagic-avalon/webmagic-avalon-common/src/main/resources/config/spring/applicationContext-myBatis.xml
@@ -27,7 +27,7 @@
-
+
\ No newline at end of file
diff --git a/webmagic-avalon/webmagic-avalon-common/src/main/resources/spring/applicationContext-service.xml b/webmagic-avalon/webmagic-avalon-common/src/main/resources/config/spring/applicationContext-service.xml
similarity index 100%
rename from webmagic-avalon/webmagic-avalon-common/src/main/resources/spring/applicationContext-service.xml
rename to webmagic-avalon/webmagic-avalon-common/src/main/resources/config/spring/applicationContext-service.xml
diff --git a/webmagic-avalon/webmagic-avalon-common/src/main/resources/spring/applicationContext-tx.xml b/webmagic-avalon/webmagic-avalon-common/src/main/resources/config/spring/applicationContext-tx.xml
similarity index 100%
rename from webmagic-avalon/webmagic-avalon-common/src/main/resources/spring/applicationContext-tx.xml
rename to webmagic-avalon/webmagic-avalon-common/src/main/resources/config/spring/applicationContext-tx.xml
diff --git a/webmagic-avalon/webmagic-avalon-common/src/main/resources/spring/applicationContext-webmvc.xml b/webmagic-avalon/webmagic-avalon-common/src/main/resources/config/spring/applicationContext-webmvc.xml
similarity index 100%
rename from webmagic-avalon/webmagic-avalon-common/src/main/resources/spring/applicationContext-webmvc.xml
rename to webmagic-avalon/webmagic-avalon-common/src/main/resources/config/spring/applicationContext-webmvc.xml
diff --git a/webmagic-avalon/webmagic-avalon-common/src/main/resources/spring/applicationContext-freemarker.xml b/webmagic-avalon/webmagic-avalon-common/src/main/resources/spring/applicationContext-freemarker.xml
deleted file mode 100644
index e7b98aa..0000000
--- a/webmagic-avalon/webmagic-avalon-common/src/main/resources/spring/applicationContext-freemarker.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
- 0
- zh_CN
- yyyy-MM-dd HH:mm:ss
- yyyy-MM-dd
- #.##
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/webmagic-avalon/webmagic-avalon-common/src/test/java/us/codecraft/webmagic/AbstractTest.java b/webmagic-avalon/webmagic-avalon-common/src/test/java/us/codecraft/webmagic/AbstractTest.java
index dab122c..b259a6d 100644
--- a/webmagic-avalon/webmagic-avalon-common/src/test/java/us/codecraft/webmagic/AbstractTest.java
+++ b/webmagic-avalon/webmagic-avalon-common/src/test/java/us/codecraft/webmagic/AbstractTest.java
@@ -10,7 +10,7 @@ import org.springframework.transaction.annotation.Transactional;
* @author code4crafter@gmail.com
*/
@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath*:/spring/applicationContext*.xml"})
+@ContextConfiguration(locations = {"classpath*:/config/spring/applicationContext*.xml"})
@ActiveProfiles("test")
@Transactional
public abstract class AbstractTest {
diff --git a/webmagic-avalon/webmagic-worker/src/main/resources/spring/applicationContext-freemarker.xml b/webmagic-avalon/webmagic-worker/src/main/resources/spring/applicationContext-freemarker.xml
deleted file mode 100644
index e7b98aa..0000000
--- a/webmagic-avalon/webmagic-worker/src/main/resources/spring/applicationContext-freemarker.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
- 0
- zh_CN
- yyyy-MM-dd HH:mm:ss
- yyyy-MM-dd
- #.##
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/webmagic-avalon/webmagic-worker/src/main/resources/spring/applicationContext-myBatis.xml b/webmagic-avalon/webmagic-worker/src/main/resources/spring/applicationContext-myBatis.xml
deleted file mode 100644
index 222df02..0000000
--- a/webmagic-avalon/webmagic-worker/src/main/resources/spring/applicationContext-myBatis.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/webmagic-avalon/webmagic-worker/src/main/resources/spring/applicationContext.xml b/webmagic-avalon/webmagic-worker/src/main/resources/spring/applicationContext.xml
deleted file mode 100644
index 1a2ac66..0000000
--- a/webmagic-avalon/webmagic-worker/src/main/resources/spring/applicationContext.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
- web_messages
-
-
-
-
-
-
-
-
-
-
-
-
- text/html;charset=UTF-8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/webmagic-avalon/webmagic-worker/src/main/webapp/WEB-INF/web.xml b/webmagic-avalon/webmagic-worker/src/main/webapp/WEB-INF/web.xml
index eb253f3..4c255cd 100644
--- a/webmagic-avalon/webmagic-worker/src/main/webapp/WEB-INF/web.xml
+++ b/webmagic-avalon/webmagic-worker/src/main/webapp/WEB-INF/web.xml
@@ -7,7 +7,7 @@
contextConfigLocation
- classpath*:spring/applicationContext*.xml,
+ classpath*:/config/spring/applicationContext*.xml,