diff --git a/.gitignore b/.gitignore
index 3396e7aab..230a468f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /src/main/webapp/WEB-INF/PwmConfiguration.xml
 /src/main/webapp/WEB-INF/backup
 /src/main/webapp/WEB-INF/LocalDB
+/bin/
diff --git a/pom.xml b/pom.xml
index 68ced0618..6eb15999e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,13 +17,6 @@
     </properties>
 
     <build>
-        <resources>
-            <resource>
-                <!-- Grab all non-java files under src/main/java. We need to do this until they are all moved underneath src/main/resources -->
-                <directory>src/main/java</directory>
-                <excludes><exclude>**/*.java</exclude></excludes>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -141,7 +134,7 @@
         <dependency>
             <groupId>org.graylog2</groupId>
             <artifactId>syslog4j</artifactId>
-            <version>0.9.53</version>
+            <version>0.9.48</version>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
@@ -156,7 +149,7 @@
         <dependency>
             <groupId>com.sleepycat</groupId>
             <artifactId>je</artifactId>
-            <version>5.0.73</version>
+            <version>6.4.9</version>
         </dependency>
         <dependency>
             <groupId>com.sun.jersey</groupId>
@@ -202,5 +195,11 @@
             <name>project</name>
             <url>file:///${project.basedir}/local-maven-repo</url>
         </repository>
+        <repository>
+            <id>oracleReleases</id>
+            <name>Oracle Released Java Packages</name>
+            <url>http://download.oracle.com/maven</url>
+            <layout>default</layout>
+        </repository>
     </repositories>
 </project>
diff --git a/src/main/java/password/pwm/AppProperty.properties b/src/main/resources/password/pwm/AppProperty.properties
similarity index 100%
rename from src/main/java/password/pwm/AppProperty.properties
rename to src/main/resources/password/pwm/AppProperty.properties
diff --git a/src/main/java/password/pwm/BuildInformation.properties b/src/main/resources/password/pwm/BuildInformation.properties
similarity index 100%
rename from src/main/java/password/pwm/BuildInformation.properties
rename to src/main/resources/password/pwm/BuildInformation.properties
diff --git a/src/main/java/password/pwm/PwmConstants.properties b/src/main/resources/password/pwm/PwmConstants.properties
similarity index 100%
rename from src/main/java/password/pwm/PwmConstants.properties
rename to src/main/resources/password/pwm/PwmConstants.properties
diff --git a/src/main/java/password/pwm/bean/package.html b/src/main/resources/password/pwm/bean/package.html
similarity index 100%
rename from src/main/java/password/pwm/bean/package.html
rename to src/main/resources/password/pwm/bean/package.html
diff --git a/src/main/java/password/pwm/config/PwmSetting.xml b/src/main/resources/password/pwm/config/PwmSetting.xml
similarity index 100%
rename from src/main/java/password/pwm/config/PwmSetting.xml
rename to src/main/resources/password/pwm/config/PwmSetting.xml
diff --git a/src/main/java/password/pwm/config/PwmSetting.xsd b/src/main/resources/password/pwm/config/PwmSetting.xsd
similarity index 100%
rename from src/main/java/password/pwm/config/PwmSetting.xsd
rename to src/main/resources/password/pwm/config/PwmSetting.xsd
diff --git a/src/main/java/password/pwm/config/StoredConfiguration.xsd b/src/main/resources/password/pwm/config/StoredConfiguration.xsd
similarity index 100%
rename from src/main/java/password/pwm/config/StoredConfiguration.xsd
rename to src/main/resources/password/pwm/config/StoredConfiguration.xsd
diff --git a/src/main/java/password/pwm/config/package.html b/src/main/resources/password/pwm/config/package.html
similarity index 100%
rename from src/main/java/password/pwm/config/package.html
rename to src/main/resources/password/pwm/config/package.html
diff --git a/src/main/java/password/pwm/http/servlet/package.html b/src/main/resources/password/pwm/http/servlet/package.html
similarity index 100%
rename from src/main/java/password/pwm/http/servlet/package.html
rename to src/main/resources/password/pwm/http/servlet/package.html
diff --git a/src/main/java/password/pwm/http/tag/package.html b/src/main/resources/password/pwm/http/tag/package.html
similarity index 100%
rename from src/main/java/password/pwm/http/tag/package.html
rename to src/main/resources/password/pwm/http/tag/package.html
diff --git a/src/main/java/password/pwm/i18n/Admin.properties b/src/main/resources/password/pwm/i18n/Admin.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Admin.properties
rename to src/main/resources/password/pwm/i18n/Admin.properties
diff --git a/src/main/java/password/pwm/i18n/Admin_nl.properties b/src/main/resources/password/pwm/i18n/Admin_nl.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Admin_nl.properties
rename to src/main/resources/password/pwm/i18n/Admin_nl.properties
diff --git a/src/main/java/password/pwm/i18n/Config.properties b/src/main/resources/password/pwm/i18n/Config.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Config.properties
rename to src/main/resources/password/pwm/i18n/Config.properties
diff --git a/src/main/java/password/pwm/i18n/ConfigEditor.properties b/src/main/resources/password/pwm/i18n/ConfigEditor.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/ConfigEditor.properties
rename to src/main/resources/password/pwm/i18n/ConfigEditor.properties
diff --git a/src/main/java/password/pwm/i18n/ConfigGuide.properties b/src/main/resources/password/pwm/i18n/ConfigGuide.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/ConfigGuide.properties
rename to src/main/resources/password/pwm/i18n/ConfigGuide.properties
diff --git a/src/main/java/password/pwm/i18n/Display.properties b/src/main/resources/password/pwm/i18n/Display.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display.properties
rename to src/main/resources/password/pwm/i18n/Display.properties
diff --git a/src/main/java/password/pwm/i18n/Display_cs.properties b/src/main/resources/password/pwm/i18n/Display_cs.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display_cs.properties
rename to src/main/resources/password/pwm/i18n/Display_cs.properties
diff --git a/src/main/java/password/pwm/i18n/Display_de.properties b/src/main/resources/password/pwm/i18n/Display_de.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display_de.properties
rename to src/main/resources/password/pwm/i18n/Display_de.properties
diff --git a/src/main/java/password/pwm/i18n/Display_el.properties b/src/main/resources/password/pwm/i18n/Display_el.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display_el.properties
rename to src/main/resources/password/pwm/i18n/Display_el.properties
diff --git a/src/main/java/password/pwm/i18n/Display_es.properties b/src/main/resources/password/pwm/i18n/Display_es.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display_es.properties
rename to src/main/resources/password/pwm/i18n/Display_es.properties
diff --git a/src/main/java/password/pwm/i18n/Display_fi.properties b/src/main/resources/password/pwm/i18n/Display_fi.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display_fi.properties
rename to src/main/resources/password/pwm/i18n/Display_fi.properties
diff --git a/src/main/java/password/pwm/i18n/Display_fr.properties b/src/main/resources/password/pwm/i18n/Display_fr.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display_fr.properties
rename to src/main/resources/password/pwm/i18n/Display_fr.properties
diff --git a/src/main/java/password/pwm/i18n/Display_hu.properties b/src/main/resources/password/pwm/i18n/Display_hu.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display_hu.properties
rename to src/main/resources/password/pwm/i18n/Display_hu.properties
diff --git a/src/main/java/password/pwm/i18n/Display_it.properties b/src/main/resources/password/pwm/i18n/Display_it.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display_it.properties
rename to src/main/resources/password/pwm/i18n/Display_it.properties
diff --git a/src/main/java/password/pwm/i18n/Display_iw.properties b/src/main/resources/password/pwm/i18n/Display_iw.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display_iw.properties
rename to src/main/resources/password/pwm/i18n/Display_iw.properties
diff --git a/src/main/java/password/pwm/i18n/Display_ja.properties b/src/main/resources/password/pwm/i18n/Display_ja.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display_ja.properties
rename to src/main/resources/password/pwm/i18n/Display_ja.properties
diff --git a/src/main/java/password/pwm/i18n/Display_ko.properties b/src/main/resources/password/pwm/i18n/Display_ko.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display_ko.properties
rename to src/main/resources/password/pwm/i18n/Display_ko.properties
diff --git a/src/main/java/password/pwm/i18n/Display_nl.properties b/src/main/resources/password/pwm/i18n/Display_nl.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display_nl.properties
rename to src/main/resources/password/pwm/i18n/Display_nl.properties
diff --git a/src/main/java/password/pwm/i18n/Display_nn.properties b/src/main/resources/password/pwm/i18n/Display_nn.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display_nn.properties
rename to src/main/resources/password/pwm/i18n/Display_nn.properties
diff --git a/src/main/java/password/pwm/i18n/Display_no.properties b/src/main/resources/password/pwm/i18n/Display_no.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display_no.properties
rename to src/main/resources/password/pwm/i18n/Display_no.properties
diff --git a/src/main/java/password/pwm/i18n/Display_pl.properties b/src/main/resources/password/pwm/i18n/Display_pl.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display_pl.properties
rename to src/main/resources/password/pwm/i18n/Display_pl.properties
diff --git a/src/main/java/password/pwm/i18n/Display_pt.properties b/src/main/resources/password/pwm/i18n/Display_pt.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display_pt.properties
rename to src/main/resources/password/pwm/i18n/Display_pt.properties
diff --git a/src/main/java/password/pwm/i18n/Display_pt_BR.properties b/src/main/resources/password/pwm/i18n/Display_pt_BR.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display_pt_BR.properties
rename to src/main/resources/password/pwm/i18n/Display_pt_BR.properties
diff --git a/src/main/java/password/pwm/i18n/Display_sk.properties b/src/main/resources/password/pwm/i18n/Display_sk.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display_sk.properties
rename to src/main/resources/password/pwm/i18n/Display_sk.properties
diff --git a/src/main/java/password/pwm/i18n/Display_sv.properties b/src/main/resources/password/pwm/i18n/Display_sv.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display_sv.properties
rename to src/main/resources/password/pwm/i18n/Display_sv.properties
diff --git a/src/main/java/password/pwm/i18n/Display_th.properties b/src/main/resources/password/pwm/i18n/Display_th.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display_th.properties
rename to src/main/resources/password/pwm/i18n/Display_th.properties
diff --git a/src/main/java/password/pwm/i18n/Display_tr.properties b/src/main/resources/password/pwm/i18n/Display_tr.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display_tr.properties
rename to src/main/resources/password/pwm/i18n/Display_tr.properties
diff --git a/src/main/java/password/pwm/i18n/Display_zh.properties b/src/main/resources/password/pwm/i18n/Display_zh.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display_zh.properties
rename to src/main/resources/password/pwm/i18n/Display_zh.properties
diff --git a/src/main/java/password/pwm/i18n/Display_zh_TW.properties b/src/main/resources/password/pwm/i18n/Display_zh_TW.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Display_zh_TW.properties
rename to src/main/resources/password/pwm/i18n/Display_zh_TW.properties
diff --git a/src/main/java/password/pwm/i18n/Error.properties b/src/main/resources/password/pwm/i18n/Error.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error.properties
rename to src/main/resources/password/pwm/i18n/Error.properties
diff --git a/src/main/java/password/pwm/i18n/Error_cs.properties b/src/main/resources/password/pwm/i18n/Error_cs.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error_cs.properties
rename to src/main/resources/password/pwm/i18n/Error_cs.properties
diff --git a/src/main/java/password/pwm/i18n/Error_de.properties b/src/main/resources/password/pwm/i18n/Error_de.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error_de.properties
rename to src/main/resources/password/pwm/i18n/Error_de.properties
diff --git a/src/main/java/password/pwm/i18n/Error_el.properties b/src/main/resources/password/pwm/i18n/Error_el.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error_el.properties
rename to src/main/resources/password/pwm/i18n/Error_el.properties
diff --git a/src/main/java/password/pwm/i18n/Error_es.properties b/src/main/resources/password/pwm/i18n/Error_es.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error_es.properties
rename to src/main/resources/password/pwm/i18n/Error_es.properties
diff --git a/src/main/java/password/pwm/i18n/Error_fi.properties b/src/main/resources/password/pwm/i18n/Error_fi.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error_fi.properties
rename to src/main/resources/password/pwm/i18n/Error_fi.properties
diff --git a/src/main/java/password/pwm/i18n/Error_fr.properties b/src/main/resources/password/pwm/i18n/Error_fr.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error_fr.properties
rename to src/main/resources/password/pwm/i18n/Error_fr.properties
diff --git a/src/main/java/password/pwm/i18n/Error_hu.properties b/src/main/resources/password/pwm/i18n/Error_hu.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error_hu.properties
rename to src/main/resources/password/pwm/i18n/Error_hu.properties
diff --git a/src/main/java/password/pwm/i18n/Error_it.properties b/src/main/resources/password/pwm/i18n/Error_it.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error_it.properties
rename to src/main/resources/password/pwm/i18n/Error_it.properties
diff --git a/src/main/java/password/pwm/i18n/Error_iw.properties b/src/main/resources/password/pwm/i18n/Error_iw.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error_iw.properties
rename to src/main/resources/password/pwm/i18n/Error_iw.properties
diff --git a/src/main/java/password/pwm/i18n/Error_ja.properties b/src/main/resources/password/pwm/i18n/Error_ja.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error_ja.properties
rename to src/main/resources/password/pwm/i18n/Error_ja.properties
diff --git a/src/main/java/password/pwm/i18n/Error_ko.properties b/src/main/resources/password/pwm/i18n/Error_ko.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error_ko.properties
rename to src/main/resources/password/pwm/i18n/Error_ko.properties
diff --git a/src/main/java/password/pwm/i18n/Error_nl.properties b/src/main/resources/password/pwm/i18n/Error_nl.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error_nl.properties
rename to src/main/resources/password/pwm/i18n/Error_nl.properties
diff --git a/src/main/java/password/pwm/i18n/Error_nn.properties b/src/main/resources/password/pwm/i18n/Error_nn.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error_nn.properties
rename to src/main/resources/password/pwm/i18n/Error_nn.properties
diff --git a/src/main/java/password/pwm/i18n/Error_no.properties b/src/main/resources/password/pwm/i18n/Error_no.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error_no.properties
rename to src/main/resources/password/pwm/i18n/Error_no.properties
diff --git a/src/main/java/password/pwm/i18n/Error_pl.properties b/src/main/resources/password/pwm/i18n/Error_pl.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error_pl.properties
rename to src/main/resources/password/pwm/i18n/Error_pl.properties
diff --git a/src/main/java/password/pwm/i18n/Error_pt.properties b/src/main/resources/password/pwm/i18n/Error_pt.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error_pt.properties
rename to src/main/resources/password/pwm/i18n/Error_pt.properties
diff --git a/src/main/java/password/pwm/i18n/Error_pt_BR.properties b/src/main/resources/password/pwm/i18n/Error_pt_BR.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error_pt_BR.properties
rename to src/main/resources/password/pwm/i18n/Error_pt_BR.properties
diff --git a/src/main/java/password/pwm/i18n/Error_sk.properties b/src/main/resources/password/pwm/i18n/Error_sk.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error_sk.properties
rename to src/main/resources/password/pwm/i18n/Error_sk.properties
diff --git a/src/main/java/password/pwm/i18n/Error_sv.properties b/src/main/resources/password/pwm/i18n/Error_sv.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error_sv.properties
rename to src/main/resources/password/pwm/i18n/Error_sv.properties
diff --git a/src/main/java/password/pwm/i18n/Error_th.properties b/src/main/resources/password/pwm/i18n/Error_th.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error_th.properties
rename to src/main/resources/password/pwm/i18n/Error_th.properties
diff --git a/src/main/java/password/pwm/i18n/Error_tr.properties b/src/main/resources/password/pwm/i18n/Error_tr.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error_tr.properties
rename to src/main/resources/password/pwm/i18n/Error_tr.properties
diff --git a/src/main/java/password/pwm/i18n/Error_zh.properties b/src/main/resources/password/pwm/i18n/Error_zh.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error_zh.properties
rename to src/main/resources/password/pwm/i18n/Error_zh.properties
diff --git a/src/main/java/password/pwm/i18n/Error_zh_TW.properties b/src/main/resources/password/pwm/i18n/Error_zh_TW.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Error_zh_TW.properties
rename to src/main/resources/password/pwm/i18n/Error_zh_TW.properties
diff --git a/src/main/java/password/pwm/i18n/Health.properties b/src/main/resources/password/pwm/i18n/Health.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Health.properties
rename to src/main/resources/password/pwm/i18n/Health.properties
diff --git a/src/main/java/password/pwm/i18n/Health_nl.properties b/src/main/resources/password/pwm/i18n/Health_nl.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Health_nl.properties
rename to src/main/resources/password/pwm/i18n/Health_nl.properties
diff --git a/src/main/java/password/pwm/i18n/Message.properties b/src/main/resources/password/pwm/i18n/Message.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message.properties
rename to src/main/resources/password/pwm/i18n/Message.properties
diff --git a/src/main/java/password/pwm/i18n/Message_cs.properties b/src/main/resources/password/pwm/i18n/Message_cs.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message_cs.properties
rename to src/main/resources/password/pwm/i18n/Message_cs.properties
diff --git a/src/main/java/password/pwm/i18n/Message_de.properties b/src/main/resources/password/pwm/i18n/Message_de.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message_de.properties
rename to src/main/resources/password/pwm/i18n/Message_de.properties
diff --git a/src/main/java/password/pwm/i18n/Message_el.properties b/src/main/resources/password/pwm/i18n/Message_el.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message_el.properties
rename to src/main/resources/password/pwm/i18n/Message_el.properties
diff --git a/src/main/java/password/pwm/i18n/Message_es.properties b/src/main/resources/password/pwm/i18n/Message_es.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message_es.properties
rename to src/main/resources/password/pwm/i18n/Message_es.properties
diff --git a/src/main/java/password/pwm/i18n/Message_fi.properties b/src/main/resources/password/pwm/i18n/Message_fi.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message_fi.properties
rename to src/main/resources/password/pwm/i18n/Message_fi.properties
diff --git a/src/main/java/password/pwm/i18n/Message_fr.properties b/src/main/resources/password/pwm/i18n/Message_fr.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message_fr.properties
rename to src/main/resources/password/pwm/i18n/Message_fr.properties
diff --git a/src/main/java/password/pwm/i18n/Message_hu.properties b/src/main/resources/password/pwm/i18n/Message_hu.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message_hu.properties
rename to src/main/resources/password/pwm/i18n/Message_hu.properties
diff --git a/src/main/java/password/pwm/i18n/Message_it.properties b/src/main/resources/password/pwm/i18n/Message_it.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message_it.properties
rename to src/main/resources/password/pwm/i18n/Message_it.properties
diff --git a/src/main/java/password/pwm/i18n/Message_iw.properties b/src/main/resources/password/pwm/i18n/Message_iw.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message_iw.properties
rename to src/main/resources/password/pwm/i18n/Message_iw.properties
diff --git a/src/main/java/password/pwm/i18n/Message_ja.properties b/src/main/resources/password/pwm/i18n/Message_ja.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message_ja.properties
rename to src/main/resources/password/pwm/i18n/Message_ja.properties
diff --git a/src/main/java/password/pwm/i18n/Message_ko.properties b/src/main/resources/password/pwm/i18n/Message_ko.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message_ko.properties
rename to src/main/resources/password/pwm/i18n/Message_ko.properties
diff --git a/src/main/java/password/pwm/i18n/Message_nl.properties b/src/main/resources/password/pwm/i18n/Message_nl.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message_nl.properties
rename to src/main/resources/password/pwm/i18n/Message_nl.properties
diff --git a/src/main/java/password/pwm/i18n/Message_nn.properties b/src/main/resources/password/pwm/i18n/Message_nn.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message_nn.properties
rename to src/main/resources/password/pwm/i18n/Message_nn.properties
diff --git a/src/main/java/password/pwm/i18n/Message_no.properties b/src/main/resources/password/pwm/i18n/Message_no.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message_no.properties
rename to src/main/resources/password/pwm/i18n/Message_no.properties
diff --git a/src/main/java/password/pwm/i18n/Message_pl.properties b/src/main/resources/password/pwm/i18n/Message_pl.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message_pl.properties
rename to src/main/resources/password/pwm/i18n/Message_pl.properties
diff --git a/src/main/java/password/pwm/i18n/Message_pt.properties b/src/main/resources/password/pwm/i18n/Message_pt.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message_pt.properties
rename to src/main/resources/password/pwm/i18n/Message_pt.properties
diff --git a/src/main/java/password/pwm/i18n/Message_pt_BR.properties b/src/main/resources/password/pwm/i18n/Message_pt_BR.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message_pt_BR.properties
rename to src/main/resources/password/pwm/i18n/Message_pt_BR.properties
diff --git a/src/main/java/password/pwm/i18n/Message_sk.properties b/src/main/resources/password/pwm/i18n/Message_sk.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message_sk.properties
rename to src/main/resources/password/pwm/i18n/Message_sk.properties
diff --git a/src/main/java/password/pwm/i18n/Message_sv.properties b/src/main/resources/password/pwm/i18n/Message_sv.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message_sv.properties
rename to src/main/resources/password/pwm/i18n/Message_sv.properties
diff --git a/src/main/java/password/pwm/i18n/Message_th.properties b/src/main/resources/password/pwm/i18n/Message_th.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message_th.properties
rename to src/main/resources/password/pwm/i18n/Message_th.properties
diff --git a/src/main/java/password/pwm/i18n/Message_tr.properties b/src/main/resources/password/pwm/i18n/Message_tr.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message_tr.properties
rename to src/main/resources/password/pwm/i18n/Message_tr.properties
diff --git a/src/main/java/password/pwm/i18n/Message_zh.properties b/src/main/resources/password/pwm/i18n/Message_zh.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message_zh.properties
rename to src/main/resources/password/pwm/i18n/Message_zh.properties
diff --git a/src/main/java/password/pwm/i18n/Message_zh_TW.properties b/src/main/resources/password/pwm/i18n/Message_zh_TW.properties
similarity index 100%
rename from src/main/java/password/pwm/i18n/Message_zh_TW.properties
rename to src/main/resources/password/pwm/i18n/Message_zh_TW.properties
diff --git a/src/main/java/password/pwm/ldap/schema/SchemaDefinition.properties b/src/main/resources/password/pwm/ldap/schema/SchemaDefinition.properties
similarity index 100%
rename from src/main/java/password/pwm/ldap/schema/SchemaDefinition.properties
rename to src/main/resources/password/pwm/ldap/schema/SchemaDefinition.properties
diff --git a/src/main/java/password/pwm/package.html b/src/main/resources/password/pwm/package.html
similarity index 100%
rename from src/main/java/password/pwm/package.html
rename to src/main/resources/password/pwm/package.html
diff --git a/src/main/java/password/pwm/util/package.html b/src/main/resources/password/pwm/util/package.html
similarity index 100%
rename from src/main/java/password/pwm/util/package.html
rename to src/main/resources/password/pwm/util/package.html
diff --git a/src/main/java/password/pwm/ws/client/novell/pwdmgt/service.wsdl b/src/main/resources/password/pwm/ws/client/novell/pwdmgt/service.wsdl
similarity index 100%
rename from src/main/java/password/pwm/ws/client/novell/pwdmgt/service.wsdl
rename to src/main/resources/password/pwm/ws/client/novell/pwdmgt/service.wsdl