diff --git a/pom.xml b/pom.xml
index 3d5e251..46fdecb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -307,8 +307,7 @@
     </notifiers>
   </ciManagement>
   <build>
-    <testSourceDirectory>${basedir}/src/test</testSourceDirectory>
-    <resources>
+<!--    <resources>
       <resource>
         <targetPath>META-INF</targetPath>
         <directory>${basedir}</directory>
@@ -322,8 +321,8 @@
           <include>**/*.properties</include>
         </includes>
       </resource>
-    </resources>
-    <testResources>
+    </resources> -->
+<!--    <testResources>
       <testResource>
         <directory>src/test</directory>
         <includes>
@@ -337,7 +336,7 @@
           <include>**/*.html</include>
         </includes>
       </testResource>
-    </testResources>
+    </testResources> -->
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/org/apache/commons/jelly/parser/XMLParser.java b/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
index 847f694..d9cfd21 100644
--- a/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
+++ b/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
@@ -442,7 +442,7 @@
     	TagLibrary tagLibrary = null;
     	if (tagScript != null)
     		tagLibrary = tagScript.getTagLibrary();
-    	
+
     	// If the tagScript is a StaticTag, then go up the stack looking for a
     	//	tagScript that belongs to a real TagLibrary
     	if (tagLibrary == null && tagScript instanceof StaticTagScript)
@@ -469,7 +469,7 @@
     public void setExpressionFactory(ExpressionFactory expressionFactory) {
         this.expressionFactory = expressionFactory;
     }
-    
+
     /**
      * Called to create an instance of the ExpressionFactory (@see getExpressionFactory)
      * @return
@@ -480,7 +480,7 @@
 
     /**
      * Creates an expression, using the ExpressionFactory returned by getExpressionFactory();
-     * the default implementation defers to the TagLibrary to create the Expression 
+     * the default implementation defers to the TagLibrary to create the Expression
      * @param attributeName
      * @param value
      * @return
@@ -995,7 +995,7 @@
 
             InputStream in = null;
             URL url =
-                getClassLoader().getResource("org/apache/commons/jelly/jelly.properties");
+                getClassLoader().getResource("src/main/resources/org/apache/commons/jelly/jelly.properties");
             if (url != null) {
                 log.debug("Loading Jelly default tag libraries from: " + url);
                 try {
@@ -1158,7 +1158,7 @@
     protected void configureTagScript(TagLibrary tagLibrary,  TagScript aTagScript) {
         // Set the TagLibrary that created the script
         aTagScript.setTagLibrary(tagLibrary);
-        
+
         configureTagScript(aTagScript);
     }
 
@@ -1169,7 +1169,7 @@
     protected void configureTagScript(TagScript aTagScript) {
         // set parent relationship...
         aTagScript.setParent(this.tagScript);
-        
+
         // set the namespace Map
         if ( elementNamespaces != null ) {
             aTagScript.setTagNamespacesMap( elementNamespaces );
diff --git a/src/main/java/org/apache/commons/jelly/jelly.properties b/src/main/resources/org/apache/commons/jelly/jelly.properties
similarity index 100%
rename from src/main/java/org/apache/commons/jelly/jelly.properties
rename to src/main/resources/org/apache/commons/jelly/jelly.properties
diff --git a/src/main/java/org/apache/commons/jelly/tags/Resources.properties b/src/main/resources/org/apache/commons/jelly/tags/Resources.properties
similarity index 100%
rename from src/main/java/org/apache/commons/jelly/tags/Resources.properties
rename to src/main/resources/org/apache/commons/jelly/tags/Resources.properties
diff --git a/src/test/org/apache/commons/jelly/TJEcho.java b/src/test/java/org/apache/commons/jelly/TJEcho.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/TJEcho.java
rename to src/test/java/org/apache/commons/jelly/TJEcho.java
diff --git a/src/test/org/apache/commons/jelly/TJTagLibrary.java b/src/test/java/org/apache/commons/jelly/TJTagLibrary.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/TJTagLibrary.java
rename to src/test/java/org/apache/commons/jelly/TJTagLibrary.java
diff --git a/src/test/org/apache/commons/jelly/TJTest.java b/src/test/java/org/apache/commons/jelly/TJTest.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/TJTest.java
rename to src/test/java/org/apache/commons/jelly/TJTest.java
diff --git a/src/test/org/apache/commons/jelly/TestCoreTags.java b/src/test/java/org/apache/commons/jelly/TestCoreTags.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/TestCoreTags.java
rename to src/test/java/org/apache/commons/jelly/TestCoreTags.java
diff --git a/src/test/org/apache/commons/jelly/TestJelly.java b/src/test/java/org/apache/commons/jelly/TestJelly.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/TestJelly.java
rename to src/test/java/org/apache/commons/jelly/TestJelly.java
diff --git a/src/test/org/apache/commons/jelly/TestJellyContext.java b/src/test/java/org/apache/commons/jelly/TestJellyContext.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/TestJellyContext.java
rename to src/test/java/org/apache/commons/jelly/TestJellyContext.java
diff --git a/src/test/org/apache/commons/jelly/TestTrim.java b/src/test/java/org/apache/commons/jelly/TestTrim.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/TestTrim.java
rename to src/test/java/org/apache/commons/jelly/TestTrim.java
diff --git a/src/test/org/apache/commons/jelly/TestXMLOutput.java b/src/test/java/org/apache/commons/jelly/TestXMLOutput.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/TestXMLOutput.java
rename to src/test/java/org/apache/commons/jelly/TestXMLOutput.java
diff --git a/src/test/org/apache/commons/jelly/core/BaseMemoryLeakTest.java b/src/test/java/org/apache/commons/jelly/core/BaseMemoryLeakTest.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/BaseMemoryLeakTest.java
rename to src/test/java/org/apache/commons/jelly/core/BaseMemoryLeakTest.java
diff --git a/src/test/org/apache/commons/jelly/core/Customer.java b/src/test/java/org/apache/commons/jelly/core/Customer.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/Customer.java
rename to src/test/java/org/apache/commons/jelly/core/Customer.java
diff --git a/src/test/org/apache/commons/jelly/core/ExceptionBean.java b/src/test/java/org/apache/commons/jelly/core/ExceptionBean.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/ExceptionBean.java
rename to src/test/java/org/apache/commons/jelly/core/ExceptionBean.java
diff --git a/src/test/org/apache/commons/jelly/core/ModularExceptionBean.java b/src/test/java/org/apache/commons/jelly/core/ModularExceptionBean.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/ModularExceptionBean.java
rename to src/test/java/org/apache/commons/jelly/core/ModularExceptionBean.java
diff --git a/src/test/org/apache/commons/jelly/core/Order.java b/src/test/java/org/apache/commons/jelly/core/Order.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/Order.java
rename to src/test/java/org/apache/commons/jelly/core/Order.java
diff --git a/src/test/org/apache/commons/jelly/core/Product.java b/src/test/java/org/apache/commons/jelly/core/Product.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/Product.java
rename to src/test/java/org/apache/commons/jelly/core/Product.java
diff --git a/src/test/org/apache/commons/jelly/core/TestArgTag.java b/src/test/java/org/apache/commons/jelly/core/TestArgTag.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/TestArgTag.java
rename to src/test/java/org/apache/commons/jelly/core/TestArgTag.java
diff --git a/src/test/org/apache/commons/jelly/core/TestBreakTag.java b/src/test/java/org/apache/commons/jelly/core/TestBreakTag.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/TestBreakTag.java
rename to src/test/java/org/apache/commons/jelly/core/TestBreakTag.java
diff --git a/src/test/org/apache/commons/jelly/core/TestCatchTag.java b/src/test/java/org/apache/commons/jelly/core/TestCatchTag.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/TestCatchTag.java
rename to src/test/java/org/apache/commons/jelly/core/TestCatchTag.java
diff --git a/src/test/org/apache/commons/jelly/core/TestChooseTag.java b/src/test/java/org/apache/commons/jelly/core/TestChooseTag.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/TestChooseTag.java
rename to src/test/java/org/apache/commons/jelly/core/TestChooseTag.java
diff --git a/src/test/org/apache/commons/jelly/core/TestCoreMemoryLeak.java b/src/test/java/org/apache/commons/jelly/core/TestCoreMemoryLeak.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/TestCoreMemoryLeak.java
rename to src/test/java/org/apache/commons/jelly/core/TestCoreMemoryLeak.java
diff --git a/src/test/org/apache/commons/jelly/core/TestFileTag.java b/src/test/java/org/apache/commons/jelly/core/TestFileTag.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/TestFileTag.java
rename to src/test/java/org/apache/commons/jelly/core/TestFileTag.java
diff --git a/src/test/org/apache/commons/jelly/core/TestForEachTag.java b/src/test/java/org/apache/commons/jelly/core/TestForEachTag.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/TestForEachTag.java
rename to src/test/java/org/apache/commons/jelly/core/TestForEachTag.java
diff --git a/src/test/org/apache/commons/jelly/core/TestGetStaticTag.java b/src/test/java/org/apache/commons/jelly/core/TestGetStaticTag.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/TestGetStaticTag.java
rename to src/test/java/org/apache/commons/jelly/core/TestGetStaticTag.java
diff --git a/src/test/org/apache/commons/jelly/core/TestIncludeTag.java b/src/test/java/org/apache/commons/jelly/core/TestIncludeTag.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/TestIncludeTag.java
rename to src/test/java/org/apache/commons/jelly/core/TestIncludeTag.java
diff --git a/src/test/org/apache/commons/jelly/core/TestInvokeStaticTag.java b/src/test/java/org/apache/commons/jelly/core/TestInvokeStaticTag.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/TestInvokeStaticTag.java
rename to src/test/java/org/apache/commons/jelly/core/TestInvokeStaticTag.java
diff --git a/src/test/org/apache/commons/jelly/core/TestInvokeTag.java b/src/test/java/org/apache/commons/jelly/core/TestInvokeTag.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/TestInvokeTag.java
rename to src/test/java/org/apache/commons/jelly/core/TestInvokeTag.java
diff --git a/src/test/org/apache/commons/jelly/core/TestModularExceptionBean.java b/src/test/java/org/apache/commons/jelly/core/TestModularExceptionBean.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/TestModularExceptionBean.java
rename to src/test/java/org/apache/commons/jelly/core/TestModularExceptionBean.java
diff --git a/src/test/org/apache/commons/jelly/core/TestNamespacePrefixes.java b/src/test/java/org/apache/commons/jelly/core/TestNamespacePrefixes.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/TestNamespacePrefixes.java
rename to src/test/java/org/apache/commons/jelly/core/TestNamespacePrefixes.java
diff --git a/src/test/org/apache/commons/jelly/core/TestNestedExceptions.java b/src/test/java/org/apache/commons/jelly/core/TestNestedExceptions.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/TestNestedExceptions.java
rename to src/test/java/org/apache/commons/jelly/core/TestNestedExceptions.java
diff --git a/src/test/org/apache/commons/jelly/core/TestNewTag.java b/src/test/java/org/apache/commons/jelly/core/TestNewTag.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/TestNewTag.java
rename to src/test/java/org/apache/commons/jelly/core/TestNewTag.java
diff --git a/src/test/org/apache/commons/jelly/core/TestSwitchTag.java b/src/test/java/org/apache/commons/jelly/core/TestSwitchTag.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/TestSwitchTag.java
rename to src/test/java/org/apache/commons/jelly/core/TestSwitchTag.java
diff --git a/src/test/org/apache/commons/jelly/core/TestUnexpectedTagCaching.java b/src/test/java/org/apache/commons/jelly/core/TestUnexpectedTagCaching.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/TestUnexpectedTagCaching.java
rename to src/test/java/org/apache/commons/jelly/core/TestUnexpectedTagCaching.java
diff --git a/src/test/org/apache/commons/jelly/core/TestUnknownTags.java b/src/test/java/org/apache/commons/jelly/core/TestUnknownTags.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/TestUnknownTags.java
rename to src/test/java/org/apache/commons/jelly/core/TestUnknownTags.java
diff --git a/src/test/org/apache/commons/jelly/core/TestUseBeanTag.java b/src/test/java/org/apache/commons/jelly/core/TestUseBeanTag.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/TestUseBeanTag.java
rename to src/test/java/org/apache/commons/jelly/core/TestUseBeanTag.java
diff --git a/src/test/org/apache/commons/jelly/core/extension/CoreExtensionTagLibrary.java b/src/test/java/org/apache/commons/jelly/core/extension/CoreExtensionTagLibrary.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/extension/CoreExtensionTagLibrary.java
rename to src/test/java/org/apache/commons/jelly/core/extension/CoreExtensionTagLibrary.java
diff --git a/src/test/org/apache/commons/jelly/core/extension/UseBeanExtendedTag.java b/src/test/java/org/apache/commons/jelly/core/extension/UseBeanExtendedTag.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/extension/UseBeanExtendedTag.java
rename to src/test/java/org/apache/commons/jelly/core/extension/UseBeanExtendedTag.java
diff --git a/src/test/org/apache/commons/jelly/core/extension/UseBeanIgnoreBadProps.java b/src/test/java/org/apache/commons/jelly/core/extension/UseBeanIgnoreBadProps.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/extension/UseBeanIgnoreBadProps.java
rename to src/test/java/org/apache/commons/jelly/core/extension/UseBeanIgnoreBadProps.java
diff --git a/src/test/org/apache/commons/jelly/expression/TestCustomExpressionFactory.java b/src/test/java/org/apache/commons/jelly/expression/TestCustomExpressionFactory.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/expression/TestCustomExpressionFactory.java
rename to src/test/java/org/apache/commons/jelly/expression/TestCustomExpressionFactory.java
diff --git a/src/test/org/apache/commons/jelly/expression/TestDynaBeans.java b/src/test/java/org/apache/commons/jelly/expression/TestDynaBeans.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/expression/TestDynaBeans.java
rename to src/test/java/org/apache/commons/jelly/expression/TestDynaBeans.java
diff --git a/src/test/org/apache/commons/jelly/expression/TestExpressions.java b/src/test/java/org/apache/commons/jelly/expression/TestExpressions.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/expression/TestExpressions.java
rename to src/test/java/org/apache/commons/jelly/expression/TestExpressions.java
diff --git a/src/test/org/apache/commons/jelly/impl/TestTagLibraryResolver.java b/src/test/java/org/apache/commons/jelly/impl/TestTagLibraryResolver.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/impl/TestTagLibraryResolver.java
rename to src/test/java/org/apache/commons/jelly/impl/TestTagLibraryResolver.java
diff --git a/src/test/org/apache/commons/jelly/tags/junit/AssertEqualsTag.java b/src/test/java/org/apache/commons/jelly/tags/junit/AssertEqualsTag.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/tags/junit/AssertEqualsTag.java
rename to src/test/java/org/apache/commons/jelly/tags/junit/AssertEqualsTag.java
diff --git a/src/test/org/apache/commons/jelly/tags/junit/AssertTag.java b/src/test/java/org/apache/commons/jelly/tags/junit/AssertTag.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/tags/junit/AssertTag.java
rename to src/test/java/org/apache/commons/jelly/tags/junit/AssertTag.java
diff --git a/src/test/org/apache/commons/jelly/tags/junit/AssertTagSupport.java b/src/test/java/org/apache/commons/jelly/tags/junit/AssertTagSupport.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/tags/junit/AssertTagSupport.java
rename to src/test/java/org/apache/commons/jelly/tags/junit/AssertTagSupport.java
diff --git a/src/test/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java b/src/test/java/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java
rename to src/test/java/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java
diff --git a/src/test/org/apache/commons/jelly/tags/junit/CaseTag.java b/src/test/java/org/apache/commons/jelly/tags/junit/CaseTag.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/tags/junit/CaseTag.java
rename to src/test/java/org/apache/commons/jelly/tags/junit/CaseTag.java
diff --git a/src/test/org/apache/commons/jelly/tags/junit/FailTag.java b/src/test/java/org/apache/commons/jelly/tags/junit/FailTag.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/tags/junit/FailTag.java
rename to src/test/java/org/apache/commons/jelly/tags/junit/FailTag.java
diff --git a/src/test/org/apache/commons/jelly/tags/junit/JUnitTagLibrary.java b/src/test/java/org/apache/commons/jelly/tags/junit/JUnitTagLibrary.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/tags/junit/JUnitTagLibrary.java
rename to src/test/java/org/apache/commons/jelly/tags/junit/JUnitTagLibrary.java
diff --git a/src/test/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java b/src/test/java/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java
rename to src/test/java/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java
diff --git a/src/test/org/apache/commons/jelly/tags/junit/JellyTestSuite.java b/src/test/java/org/apache/commons/jelly/tags/junit/JellyTestSuite.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/tags/junit/JellyTestSuite.java
rename to src/test/java/org/apache/commons/jelly/tags/junit/JellyTestSuite.java
diff --git a/src/test/org/apache/commons/jelly/tags/junit/RunTag.java b/src/test/java/org/apache/commons/jelly/tags/junit/RunTag.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/tags/junit/RunTag.java
rename to src/test/java/org/apache/commons/jelly/tags/junit/RunTag.java
diff --git a/src/test/org/apache/commons/jelly/tags/junit/SuiteTag.java b/src/test/java/org/apache/commons/jelly/tags/junit/SuiteTag.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/tags/junit/SuiteTag.java
rename to src/test/java/org/apache/commons/jelly/tags/junit/SuiteTag.java
diff --git a/src/test/org/apache/commons/jelly/tags/junit/package.html b/src/test/java/org/apache/commons/jelly/tags/junit/package.html
similarity index 100%
rename from src/test/org/apache/commons/jelly/tags/junit/package.html
rename to src/test/java/org/apache/commons/jelly/tags/junit/package.html
diff --git a/src/test/org/apache/commons/jelly/test/impl/DummyTag.java b/src/test/java/org/apache/commons/jelly/test/impl/DummyTag.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/test/impl/DummyTag.java
rename to src/test/java/org/apache/commons/jelly/test/impl/DummyTag.java
diff --git a/src/test/org/apache/commons/jelly/test/impl/DummyTagLibrary.java b/src/test/java/org/apache/commons/jelly/test/impl/DummyTagLibrary.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/test/impl/DummyTagLibrary.java
rename to src/test/java/org/apache/commons/jelly/test/impl/DummyTagLibrary.java
diff --git a/src/test/org/apache/commons/jelly/test/impl/TestEmbedded.java b/src/test/java/org/apache/commons/jelly/test/impl/TestEmbedded.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/test/impl/TestEmbedded.java
rename to src/test/java/org/apache/commons/jelly/test/impl/TestEmbedded.java
diff --git a/src/test/org/apache/commons/jelly/test/xml/TestCData.java b/src/test/java/org/apache/commons/jelly/test/xml/TestCData.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/test/xml/TestCData.java
rename to src/test/java/org/apache/commons/jelly/test/xml/TestCData.java
diff --git a/src/test/org/apache/commons/jelly/test/xml/TestDefaultNamespaceFilter.java b/src/test/java/org/apache/commons/jelly/test/xml/TestDefaultNamespaceFilter.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/test/xml/TestDefaultNamespaceFilter.java
rename to src/test/java/org/apache/commons/jelly/test/xml/TestDefaultNamespaceFilter.java
diff --git a/src/test/org/apache/commons/jelly/test/xml/TestDummyXMLOutput.java b/src/test/java/org/apache/commons/jelly/test/xml/TestDummyXMLOutput.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/test/xml/TestDummyXMLOutput.java
rename to src/test/java/org/apache/commons/jelly/test/xml/TestDummyXMLOutput.java
diff --git a/src/test/org/apache/commons/jelly/test/xml/TestNonexistentTags.java b/src/test/java/org/apache/commons/jelly/test/xml/TestNonexistentTags.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/test/xml/TestNonexistentTags.java
rename to src/test/java/org/apache/commons/jelly/test/xml/TestNonexistentTags.java
diff --git a/src/test/org/apache/commons/jelly/test/xml/TestXMLParserCache.java b/src/test/java/org/apache/commons/jelly/test/xml/TestXMLParserCache.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/test/xml/TestXMLParserCache.java
rename to src/test/java/org/apache/commons/jelly/test/xml/TestXMLParserCache.java
diff --git a/src/test/org/apache/commons/jelly/test/xml/TestXMLValidation.java b/src/test/java/org/apache/commons/jelly/test/xml/TestXMLValidation.java
similarity index 100%
rename from src/test/org/apache/commons/jelly/test/xml/TestXMLValidation.java
rename to src/test/java/org/apache/commons/jelly/test/xml/TestXMLValidation.java
diff --git a/src/test/META-INF/services/jelly.test-library b/src/test/resources/META-INF/services/jelly.test-library
similarity index 100%
rename from src/test/META-INF/services/jelly.test-library
rename to src/test/resources/META-INF/services/jelly.test-library
diff --git a/src/test/org/apache/commons/jelly/benchmark/benchmark.jelly b/src/test/resources/org/apache/commons/jelly/benchmark/benchmark.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/benchmark/benchmark.jelly
rename to src/test/resources/org/apache/commons/jelly/benchmark/benchmark.jelly
diff --git a/src/test/org/apache/commons/jelly/benchmark/sample.jelly b/src/test/resources/org/apache/commons/jelly/benchmark/sample.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/benchmark/sample.jelly
rename to src/test/resources/org/apache/commons/jelly/benchmark/sample.jelly
diff --git a/src/test/org/apache/commons/jelly/core/a.jelly b/src/test/resources/org/apache/commons/jelly/core/a.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/a.jelly
rename to src/test/resources/org/apache/commons/jelly/core/a.jelly
diff --git a/src/test/org/apache/commons/jelly/core/b.jelly b/src/test/resources/org/apache/commons/jelly/core/b.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/b.jelly
rename to src/test/resources/org/apache/commons/jelly/core/b.jelly
diff --git a/src/test/org/apache/commons/jelly/core/c.jelly b/src/test/resources/org/apache/commons/jelly/core/c.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/c.jelly
rename to src/test/resources/org/apache/commons/jelly/core/c.jelly
diff --git a/src/test/org/apache/commons/jelly/core/testBreakTag.jelly b/src/test/resources/org/apache/commons/jelly/core/testBreakTag.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/testBreakTag.jelly
rename to src/test/resources/org/apache/commons/jelly/core/testBreakTag.jelly
diff --git a/src/test/org/apache/commons/jelly/core/testChooseTag.jelly b/src/test/resources/org/apache/commons/jelly/core/testChooseTag.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/testChooseTag.jelly
rename to src/test/resources/org/apache/commons/jelly/core/testChooseTag.jelly
diff --git a/src/test/org/apache/commons/jelly/core/testFileTag.jelly b/src/test/resources/org/apache/commons/jelly/core/testFileTag.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/testFileTag.jelly
rename to src/test/resources/org/apache/commons/jelly/core/testFileTag.jelly
diff --git a/src/test/org/apache/commons/jelly/core/testForEachTag.jelly b/src/test/resources/org/apache/commons/jelly/core/testForEachTag.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/testForEachTag.jelly
rename to src/test/resources/org/apache/commons/jelly/core/testForEachTag.jelly
diff --git a/src/test/org/apache/commons/jelly/core/testGetStaticTag.jelly b/src/test/resources/org/apache/commons/jelly/core/testGetStaticTag.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/testGetStaticTag.jelly
rename to src/test/resources/org/apache/commons/jelly/core/testGetStaticTag.jelly
diff --git a/src/test/org/apache/commons/jelly/core/testInvokeStaticTag.jelly b/src/test/resources/org/apache/commons/jelly/core/testInvokeStaticTag.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/testInvokeStaticTag.jelly
rename to src/test/resources/org/apache/commons/jelly/core/testInvokeStaticTag.jelly
diff --git a/src/test/org/apache/commons/jelly/core/testInvokeTag.jelly b/src/test/resources/org/apache/commons/jelly/core/testInvokeTag.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/testInvokeTag.jelly
rename to src/test/resources/org/apache/commons/jelly/core/testInvokeTag.jelly
diff --git a/src/test/org/apache/commons/jelly/core/testNamespacePrefixes.xml b/src/test/resources/org/apache/commons/jelly/core/testNamespacePrefixes.xml
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/testNamespacePrefixes.xml
rename to src/test/resources/org/apache/commons/jelly/core/testNamespacePrefixes.xml
diff --git a/src/test/org/apache/commons/jelly/core/testNestedExceptions.xml b/src/test/resources/org/apache/commons/jelly/core/testNestedExceptions.xml
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/testNestedExceptions.xml
rename to src/test/resources/org/apache/commons/jelly/core/testNestedExceptions.xml
diff --git a/src/test/org/apache/commons/jelly/core/testNewCatchTag.xml b/src/test/resources/org/apache/commons/jelly/core/testNewCatchTag.xml
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/testNewCatchTag.xml
rename to src/test/resources/org/apache/commons/jelly/core/testNewCatchTag.xml
diff --git a/src/test/org/apache/commons/jelly/core/testNewTag.jelly b/src/test/resources/org/apache/commons/jelly/core/testNewTag.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/testNewTag.jelly
rename to src/test/resources/org/apache/commons/jelly/core/testNewTag.jelly
diff --git a/src/test/org/apache/commons/jelly/core/testSeveralSwitchCall.jelly b/src/test/resources/org/apache/commons/jelly/core/testSeveralSwitchCall.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/testSeveralSwitchCall.jelly
rename to src/test/resources/org/apache/commons/jelly/core/testSeveralSwitchCall.jelly
diff --git a/src/test/org/apache/commons/jelly/core/testSwitchTag.jelly b/src/test/resources/org/apache/commons/jelly/core/testSwitchTag.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/testSwitchTag.jelly
rename to src/test/resources/org/apache/commons/jelly/core/testSwitchTag.jelly
diff --git a/src/test/org/apache/commons/jelly/core/testUnknownTags.xml b/src/test/resources/org/apache/commons/jelly/core/testUnknownTags.xml
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/testUnknownTags.xml
rename to src/test/resources/org/apache/commons/jelly/core/testUnknownTags.xml
diff --git a/src/test/org/apache/commons/jelly/core/testUseBeanTag.jelly b/src/test/resources/org/apache/commons/jelly/core/testUseBeanTag.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/core/testUseBeanTag.jelly
rename to src/test/resources/org/apache/commons/jelly/core/testUseBeanTag.jelly
diff --git a/src/test/org/apache/commons/jelly/dummy.xml b/src/test/resources/org/apache/commons/jelly/dummy.xml
similarity index 100%
rename from src/test/org/apache/commons/jelly/dummy.xml
rename to src/test/resources/org/apache/commons/jelly/dummy.xml
diff --git a/src/test/org/apache/commons/jelly/example3.jelly b/src/test/resources/org/apache/commons/jelly/example3.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/example3.jelly
rename to src/test/resources/org/apache/commons/jelly/example3.jelly
diff --git a/src/test/org/apache/commons/jelly/expression/jelly1.xml b/src/test/resources/org/apache/commons/jelly/expression/jelly1.xml
similarity index 100%
rename from src/test/org/apache/commons/jelly/expression/jelly1.xml
rename to src/test/resources/org/apache/commons/jelly/expression/jelly1.xml
diff --git a/src/test/org/apache/commons/jelly/hello_world.jelly b/src/test/resources/org/apache/commons/jelly/hello_world.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/hello_world.jelly
rename to src/test/resources/org/apache/commons/jelly/hello_world.jelly
diff --git a/src/test/org/apache/commons/jelly/import1.jelly b/src/test/resources/org/apache/commons/jelly/import1.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/import1.jelly
rename to src/test/resources/org/apache/commons/jelly/import1.jelly
diff --git a/src/test/org/apache/commons/jelly/outputBad.jelly b/src/test/resources/org/apache/commons/jelly/outputBad.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/outputBad.jelly
rename to src/test/resources/org/apache/commons/jelly/outputBad.jelly
diff --git a/src/test/org/apache/commons/jelly/outputData.jelly b/src/test/resources/org/apache/commons/jelly/outputData.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/outputData.jelly
rename to src/test/resources/org/apache/commons/jelly/outputData.jelly
diff --git a/src/test/org/apache/commons/jelly/outputGood.jelly b/src/test/resources/org/apache/commons/jelly/outputGood.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/outputGood.jelly
rename to src/test/resources/org/apache/commons/jelly/outputGood.jelly
diff --git a/src/test/org/apache/commons/jelly/run_all.jelly b/src/test/resources/org/apache/commons/jelly/run_all.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/run_all.jelly
rename to src/test/resources/org/apache/commons/jelly/run_all.jelly
diff --git a/src/test/org/apache/commons/jelly/show_args.jelly b/src/test/resources/org/apache/commons/jelly/show_args.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/show_args.jelly
rename to src/test/resources/org/apache/commons/jelly/show_args.jelly
diff --git a/src/test/org/apache/commons/jelly/show_properties.jelly b/src/test/resources/org/apache/commons/jelly/show_properties.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/show_properties.jelly
rename to src/test/resources/org/apache/commons/jelly/show_properties.jelly
diff --git a/src/test/org/apache/commons/jelly/suite.jelly b/src/test/resources/org/apache/commons/jelly/suite.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/suite.jelly
rename to src/test/resources/org/apache/commons/jelly/suite.jelly
diff --git a/src/test/org/apache/commons/jelly/test/xml/invalidScript1.jelly b/src/test/resources/org/apache/commons/jelly/test/xml/invalidScript1.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/test/xml/invalidScript1.jelly
rename to src/test/resources/org/apache/commons/jelly/test/xml/invalidScript1.jelly
diff --git a/src/test/org/apache/commons/jelly/test/xml/nonexistentTags1.jelly b/src/test/resources/org/apache/commons/jelly/test/xml/nonexistentTags1.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/test/xml/nonexistentTags1.jelly
rename to src/test/resources/org/apache/commons/jelly/test/xml/nonexistentTags1.jelly
diff --git a/src/test/org/apache/commons/jelly/test/xml/nsFilterTest.jelly b/src/test/resources/org/apache/commons/jelly/test/xml/nsFilterTest.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/test/xml/nsFilterTest.jelly
rename to src/test/resources/org/apache/commons/jelly/test/xml/nsFilterTest.jelly
diff --git a/src/test/org/apache/commons/jelly/test/xml/producesOutput.jelly b/src/test/resources/org/apache/commons/jelly/test/xml/producesOutput.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/test/xml/producesOutput.jelly
rename to src/test/resources/org/apache/commons/jelly/test/xml/producesOutput.jelly
diff --git a/src/test/org/apache/commons/jelly/test/xml/testCData.jelly b/src/test/resources/org/apache/commons/jelly/test/xml/testCData.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/test/xml/testCData.jelly
rename to src/test/resources/org/apache/commons/jelly/test/xml/testCData.jelly
diff --git a/src/test/org/apache/commons/jelly/test/xml/validScript1.jelly b/src/test/resources/org/apache/commons/jelly/test/xml/validScript1.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/test/xml/validScript1.jelly
rename to src/test/resources/org/apache/commons/jelly/test/xml/validScript1.jelly
diff --git a/src/test/org/apache/commons/jelly/testCmdLineOptions.jelly b/src/test/resources/org/apache/commons/jelly/testCmdLineOptions.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/testCmdLineOptions.jelly
rename to src/test/resources/org/apache/commons/jelly/testCmdLineOptions.jelly
diff --git a/src/test/org/apache/commons/jelly/testFindVariable.jelly b/src/test/resources/org/apache/commons/jelly/testFindVariable.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/testFindVariable.jelly
rename to src/test/resources/org/apache/commons/jelly/testFindVariable.jelly
diff --git a/src/test/org/apache/commons/jelly/testStatic.jelly b/src/test/resources/org/apache/commons/jelly/testStatic.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/testStatic.jelly
rename to src/test/resources/org/apache/commons/jelly/testStatic.jelly
diff --git a/src/test/org/apache/commons/jelly/testStaticNamespacedAttributes.jelly b/src/test/resources/org/apache/commons/jelly/testStaticNamespacedAttributes.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/testStaticNamespacedAttributes.jelly
rename to src/test/resources/org/apache/commons/jelly/testStaticNamespacedAttributes.jelly
diff --git a/src/test/org/apache/commons/jelly/test_args.jelly b/src/test/resources/org/apache/commons/jelly/test_args.jelly
similarity index 100%
rename from src/test/org/apache/commons/jelly/test_args.jelly
rename to src/test/resources/org/apache/commons/jelly/test_args.jelly