diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 0e57b3e7d..b6399deb1 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -5,7 +5,7 @@
     <parent>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-apps</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
+      <version>2.0.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-mailreader</artifactId>
diff --git a/apps/mailreader/src/main/resources/applicationContext.xml b/apps/mailreader/src/main/java/applicationContext.xml
similarity index 100%
rename from apps/mailreader/src/main/resources/applicationContext.xml
rename to apps/mailreader/src/main/java/applicationContext.xml
diff --git a/apps/mailreader/src/main/resources/mailreader-default.xml b/apps/mailreader/src/main/java/mailreader-default.xml
similarity index 100%
rename from apps/mailreader/src/main/resources/mailreader-default.xml
rename to apps/mailreader/src/main/java/mailreader-default.xml
diff --git a/apps/mailreader/src/main/resources/mailreader-support.xml b/apps/mailreader/src/main/java/mailreader-support.xml
similarity index 100%
rename from apps/mailreader/src/main/resources/mailreader-support.xml
rename to apps/mailreader/src/main/java/mailreader-support.xml
diff --git a/apps/mailreader/src/main/resources/mailreader2/MailreaderSupport.properties b/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.properties
similarity index 100%
rename from apps/mailreader/src/main/resources/mailreader2/MailreaderSupport.properties
rename to apps/mailreader/src/main/java/mailreader2/MailreaderSupport.properties
diff --git a/apps/mailreader/src/main/resources/mailreader2/MailreaderSupport_ja.properties b/apps/mailreader/src/main/java/mailreader2/MailreaderSupport_ja.properties
similarity index 100%
rename from apps/mailreader/src/main/resources/mailreader2/MailreaderSupport_ja.properties
rename to apps/mailreader/src/main/java/mailreader2/MailreaderSupport_ja.properties
diff --git a/apps/mailreader/src/main/resources/mailreader2/MailreaderSupport_ru.properties b/apps/mailreader/src/main/java/mailreader2/MailreaderSupport_ru.properties
similarity index 100%
rename from apps/mailreader/src/main/resources/mailreader2/MailreaderSupport_ru.properties
rename to apps/mailreader/src/main/java/mailreader2/MailreaderSupport_ru.properties
diff --git a/apps/mailreader/src/main/resources/struts.properties b/apps/mailreader/src/main/java/struts.properties
similarity index 100%
rename from apps/mailreader/src/main/resources/struts.properties
rename to apps/mailreader/src/main/java/struts.properties
diff --git a/apps/mailreader/src/main/resources/struts.xml b/apps/mailreader/src/main/java/struts.xml
similarity index 100%
rename from apps/mailreader/src/main/resources/struts.xml
rename to apps/mailreader/src/main/java/struts.xml
diff --git a/apps/mailreader/src/main/resources/database.xml b/apps/mailreader/src/main/resources/database.xml
index 0bc833dce..5710477aa 100644
--- a/apps/mailreader/src/main/resources/database.xml
+++ b/apps/mailreader/src/main/resources/database.xml
@@ -1,13 +1,13 @@
-<?xml version='1.0'?>
-<database>
-    <user username="user" fromAddress="John.User@somewhere.com"
-          fullName="John Q. User" password="pass">
-        <subscription host="mail.hotmail.com" autoConnect="false"
-                      password="bar" type="pop3" username="user1234">
-        </subscription>
-        <subscription host="mail.yahoo.com" autoConnect="false" password="foo"
-                      type="imap" username="jquser">
-        </subscription>
-    </user>
-</database>
+<?xml version='1.0'?>
+<database>
+    <user username="user" fromAddress="John.User@somewhere.com"
+          fullName="John Q. User" password="pass">
+        <subscription host="mail.hotmail.com" autoConnect="false"
+                      password="bar" type="pop3" username="user1234">
+        </subscription>
+        <subscription host="mail.yahoo.com" autoConnect="false" password="foo"
+                      type="imap" username="jquser">
+        </subscription>
+    </user>
+</database>
         
\ No newline at end of file