diff --git a/lib/eml.jar b/lib/eml.jar
index ffac919d..5340caa3 100644
Binary files a/lib/eml.jar and b/lib/eml.jar differ
diff --git a/src/test/java/org/ecoinformatics/emltest/SaxValidateTest.java b/src/test/java/org/ecoinformatics/emltest/SaxValidateTest.java
index 96cec85d..7f6fcd86 100644
--- a/src/test/java/org/ecoinformatics/emltest/SaxValidateTest.java
+++ b/src/test/java/org/ecoinformatics/emltest/SaxValidateTest.java
@@ -50,6 +50,7 @@ public class SaxValidateTest extends TestCase
     private final static String
                 DEFAULT_PARSER = "org.apache.xerces.parsers.SAXParser";
     private final static String TEST_DIR = "./src/test/resources/";
+    private final static String MODULES_DIR = TEST_DIR + "/moduleEML/";
 
     /**
      * Constructor to build the test
@@ -91,8 +92,9 @@ public void testSchemaValid()
         SAXValidate test = new SAXValidate(true);
         assertTrue(test != null);
 
-        File testDir = new File(TEST_DIR);
-        Vector fileList = getXmlFiles(testDir);
+        Vector fileList = getXmlFiles(TEST_DIR);
+        Vector modsList = getXmlFiles(MODULES_DIR);
+        fileList.addAll(modsList);
 
         for (int i=0; i<fileList.size(); i++) {
             File testFile = (File)fileList.elementAt(i);
@@ -128,13 +130,14 @@ public static Test suite()
     }
 
     /**
-     * Get the list of files in a directory.
+     * Get the list of files in a directory with XML extensions.
      *
-     * @param directory the directory to list
+     * @param dirname the directory to list
      * @return a vector of File objects in the directory
      */
-    private Vector getXmlFiles(File directory)
+    private Vector getXmlFiles(String dirname)
     {
+        File directory = new File(dirname);
         String[] files = directory.list();
         Vector fileList = new Vector();
 
diff --git a/src/test/resources/eml-2.1.1-all-units.xml b/src/test/resources/moduleEML/eml-2.1.1-all-units.xml
similarity index 100%
rename from src/test/resources/eml-2.1.1-all-units.xml
rename to src/test/resources/moduleEML/eml-2.1.1-all-units.xml
diff --git a/src/test/resources/eml-access.xml b/src/test/resources/moduleEML/eml-access.xml
similarity index 100%
rename from src/test/resources/eml-access.xml
rename to src/test/resources/moduleEML/eml-access.xml
diff --git a/src/test/resources/eml-attribute.xml b/src/test/resources/moduleEML/eml-attribute.xml
similarity index 100%
rename from src/test/resources/eml-attribute.xml
rename to src/test/resources/moduleEML/eml-attribute.xml
diff --git a/src/test/resources/eml-dataTable.xml b/src/test/resources/moduleEML/eml-dataTable.xml
similarity index 100%
rename from src/test/resources/eml-dataTable.xml
rename to src/test/resources/moduleEML/eml-dataTable.xml
diff --git a/src/test/resources/eml-dataset.xml b/src/test/resources/moduleEML/eml-dataset.xml
similarity index 100%
rename from src/test/resources/eml-dataset.xml
rename to src/test/resources/moduleEML/eml-dataset.xml
diff --git a/src/test/resources/eml-entity.xml b/src/test/resources/moduleEML/eml-entity.xml
similarity index 100%
rename from src/test/resources/eml-entity.xml
rename to src/test/resources/moduleEML/eml-entity.xml
diff --git a/src/test/resources/eml-inline.xml b/src/test/resources/moduleEML/eml-inline.xml
similarity index 100%
rename from src/test/resources/eml-inline.xml
rename to src/test/resources/moduleEML/eml-inline.xml
diff --git a/src/test/resources/eml-literature.xml b/src/test/resources/moduleEML/eml-literature.xml
similarity index 100%
rename from src/test/resources/eml-literature.xml
rename to src/test/resources/moduleEML/eml-literature.xml
diff --git a/src/test/resources/eml-literatureInPress.xml b/src/test/resources/moduleEML/eml-literatureInPress.xml
similarity index 100%
rename from src/test/resources/eml-literatureInPress.xml
rename to src/test/resources/moduleEML/eml-literatureInPress.xml
diff --git a/src/test/resources/eml-method.xml b/src/test/resources/moduleEML/eml-method.xml
similarity index 100%
rename from src/test/resources/eml-method.xml
rename to src/test/resources/moduleEML/eml-method.xml
diff --git a/src/test/resources/eml-offline.xml b/src/test/resources/moduleEML/eml-offline.xml
similarity index 100%
rename from src/test/resources/eml-offline.xml
rename to src/test/resources/moduleEML/eml-offline.xml
diff --git a/src/test/resources/eml-party.xml b/src/test/resources/moduleEML/eml-party.xml
similarity index 100%
rename from src/test/resources/eml-party.xml
rename to src/test/resources/moduleEML/eml-party.xml
diff --git a/src/test/resources/eml-physical-inline-cdatasection.xml b/src/test/resources/moduleEML/eml-physical-inline-cdatasection.xml
similarity index 100%
rename from src/test/resources/eml-physical-inline-cdatasection.xml
rename to src/test/resources/moduleEML/eml-physical-inline-cdatasection.xml
diff --git a/src/test/resources/eml-physical-inline.xml b/src/test/resources/moduleEML/eml-physical-inline.xml
similarity index 100%
rename from src/test/resources/eml-physical-inline.xml
rename to src/test/resources/moduleEML/eml-physical-inline.xml
diff --git a/src/test/resources/eml-physical.xml b/src/test/resources/moduleEML/eml-physical.xml
similarity index 100%
rename from src/test/resources/eml-physical.xml
rename to src/test/resources/moduleEML/eml-physical.xml
diff --git a/src/test/resources/eml-project.xml b/src/test/resources/moduleEML/eml-project.xml
similarity index 100%
rename from src/test/resources/eml-project.xml
rename to src/test/resources/moduleEML/eml-project.xml
diff --git a/src/test/resources/eml-protocol.xml b/src/test/resources/moduleEML/eml-protocol.xml
similarity index 100%
rename from src/test/resources/eml-protocol.xml
rename to src/test/resources/moduleEML/eml-protocol.xml
diff --git a/src/test/resources/eml-semantics.xml b/src/test/resources/moduleEML/eml-semantics.xml
similarity index 100%
rename from src/test/resources/eml-semantics.xml
rename to src/test/resources/moduleEML/eml-semantics.xml
diff --git a/src/test/resources/eml-software.xml b/src/test/resources/moduleEML/eml-software.xml
similarity index 100%
rename from src/test/resources/eml-software.xml
rename to src/test/resources/moduleEML/eml-software.xml
diff --git a/src/test/resources/eml-spatialVector.xml b/src/test/resources/moduleEML/eml-spatialVector.xml
similarity index 100%
rename from src/test/resources/eml-spatialVector.xml
rename to src/test/resources/moduleEML/eml-spatialVector.xml
diff --git a/src/test/resources/eml-storedProcedure.xml b/src/test/resources/moduleEML/eml-storedProcedure.xml
similarity index 100%
rename from src/test/resources/eml-storedProcedure.xml
rename to src/test/resources/moduleEML/eml-storedProcedure.xml
diff --git a/src/test/resources/eml-text.xml b/src/test/resources/moduleEML/eml-text.xml
similarity index 100%
rename from src/test/resources/eml-text.xml
rename to src/test/resources/moduleEML/eml-text.xml
diff --git a/src/test/resources/eml-view.xml b/src/test/resources/moduleEML/eml-view.xml
similarity index 100%
rename from src/test/resources/eml-view.xml
rename to src/test/resources/moduleEML/eml-view.xml