diff --git a/cdb10/1.0/ctl/cdb10-suite.ctl b/cdb10/1.0/ctl/cdb10-suite.ctl
index 13c7c2e..529200a 100644
--- a/cdb10/1.0/ctl/cdb10-suite.ctl
+++ b/cdb10/1.0/ctl/cdb10-suite.ctl
@@ -41,7 +41,8 @@
             <p>One conformance level is defined:</p>
             <ul>
               <li>CDB Structure</li>
-              <p>To define the mandatory criteria please click <a href="schema.jsp">here</a>.</p>
+              <p>To define the mandatory criteria please click <a href="schema.jsp">here</a>.
+              </p>
             </ul>
           </div>
           <fieldset style="background:#ccffff">
@@ -57,8 +58,8 @@
             </p>
             <p>
               <label for="level">Conformance class:</label>
-              <input id="level-1" type="radio" name="level" value="1"/>
-              <label class="form-lable" for="level-1">CDB Structure</label>
+              <input id="level-1" type="radio" name="level" value="1" checked="checked"/>
+              <label class="form-label" for="level-1">CDB Structure</label>
             </p>
           </fieldset>
           <p>
@@ -104,7 +105,7 @@
         <xsl:value-of select="saxon:transform(saxon:compile-stylesheet($summary-xsl), $test-results)"/>
         See detailed test report in the TE_BASE/users/
         <xsl:value-of
-            select="concat(substring-after($testRunDir, 'users/'), '/html/')"/>
+          select="concat(substring-after($testRunDir, 'users/'), '/html/')"/>
         directory.
       </ctl:message>
       <xsl:if test="xs:integer($test-results/testng-results/@failed) gt 0">
@@ -116,7 +117,8 @@
         </xsl:for-each>
         <ctl:fail/>
       </xsl:if>
-      <xsl:if test="xs:integer($test-results/testng-results/@skipped) eq xs:integer($test-results/testng-results/@total)">
+      <xsl:if
+        test="xs:integer($test-results/testng-results/@skipped) eq xs:integer($test-results/testng-results/@total)">
         <ctl:message>All tests were skipped. One or more preconditions were not satisfied.</ctl:message>
         <xsl:for-each select="$test-results//test-method[@status='FAIL' and @is-config='true']">
           <ctl:message>
diff --git a/cdb10/1.0/site/apidocs/allclasses-frame.html b/cdb10/1.0/site/apidocs/allclasses-frame.html
index c7ea973..52f0501 100644
--- a/cdb10/1.0/site/apidocs/allclasses-frame.html
+++ b/cdb10/1.0/site/apidocs/allclasses-frame.html
@@ -13,8 +13,8 @@
 <h1 class="bar">All&nbsp;Classes</h1>
 <div class="indexContainer">
 <ul>
-<li><a href="org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.CDBStructure" target="classFrame">Capability1Tests</a></li>
-<li><a href="org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.level2" target="classFrame">Capability2Tests</a></li>
+<li><a href="org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.cdbStructure" target="classFrame">Capability1Tests</a></li>
+<li><a href="org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.metadataAndVersioning" target="classFrame">Capability2Tests</a></li>
 <li><a href="org/opengis/cite/cdb10/util/ClientUtils.html" title="class in org.opengis.cite.cdb10.util" target="classFrame">ClientUtils</a></li>
 <li><a href="org/opengis/cite/cdb10/CommonFixture.html" title="class in org.opengis.cite.cdb10" target="classFrame">CommonFixture</a></li>
 <li><a href="org/opengis/cite/cdb10/ErrorMessage.html" title="class in org.opengis.cite.cdb10" target="classFrame">ErrorMessage</a></li>
diff --git a/cdb10/1.0/site/apidocs/allclasses-noframe.html b/cdb10/1.0/site/apidocs/allclasses-noframe.html
index c820226..306950d 100644
--- a/cdb10/1.0/site/apidocs/allclasses-noframe.html
+++ b/cdb10/1.0/site/apidocs/allclasses-noframe.html
@@ -13,8 +13,8 @@
 <h1 class="bar">All&nbsp;Classes</h1>
 <div class="indexContainer">
 <ul>
-<li><a href="org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.CDBStructure">Capability1Tests</a></li>
-<li><a href="org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.level2">Capability2Tests</a></li>
+<li><a href="org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.cdbStructure">Capability1Tests</a></li>
+<li><a href="org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.metadataAndVersioning">Capability2Tests</a></li>
 <li><a href="org/opengis/cite/cdb10/util/ClientUtils.html" title="class in org.opengis.cite.cdb10.util">ClientUtils</a></li>
 <li><a href="org/opengis/cite/cdb10/CommonFixture.html" title="class in org.opengis.cite.cdb10">CommonFixture</a></li>
 <li><a href="org/opengis/cite/cdb10/ErrorMessage.html" title="class in org.opengis.cite.cdb10">ErrorMessage</a></li>
diff --git a/cdb10/1.0/site/apidocs/index-all.html b/cdb10/1.0/site/apidocs/index-all.html
index 1a29bf9..7d1cedc 100644
--- a/cdb10/1.0/site/apidocs/index-all.html
+++ b/cdb10/1.0/site/apidocs/index-all.html
@@ -148,23 +148,23 @@ <h2 class="title">B</h2>
 </a>
 <h2 class="title">C</h2>
 <dl>
-<dt><a href="org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.CDBStructure"><span class="typeNameLink">Capability1Tests</span></a> - Class in <a href="org/opengis/cite/cdb10/CDBStructure/package-summary.html">org.opengis.cite.cdb10.CDBStructure</a></dt>
+<dt><a href="org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.cdbStructure"><span class="typeNameLink">Capability1Tests</span></a> - Class in <a href="org/opengis/cite/cdb10/CDBStructure/package-summary.html">org.opengis.cite.cdb10.cdbStructure</a></dt>
 <dd>
 <div class="block">Includes various tests of capability 1.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html#Capability1Tests--">Capability1Tests()</a></span> - Constructor for class org.opengis.cite.cdb10.CDBStructure.<a href="org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.CDBStructure">Capability1Tests</a></dt>
+<dt><span class="memberNameLink"><a href="org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html#Capability1Tests--">Capability1Tests()</a></span> - Constructor for class org.opengis.cite.cdb10.cdbStructure.<a href="org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.cdbStructure">Capability1Tests</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.level2"><span class="typeNameLink">Capability2Tests</span></a> - Class in <a href="org/opengis/cite/cdb10/level2/package-summary.html">org.opengis.cite.cdb10.level2</a></dt>
+<dt><a href="org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.metadataAndVersioning"><span class="typeNameLink">Capability2Tests</span></a> - Class in <a href="org/opengis/cite/cdb10/level2/package-summary.html">org.opengis.cite.cdb10.metadataAndVersioning</a></dt>
 <dd>
 <div class="block">Includes various tests of capability 2.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/opengis/cite/cdb10/level2/Capability2Tests.html#Capability2Tests--">Capability2Tests()</a></span> - Constructor for class org.opengis.cite.cdb10.level2.<a href="org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.level2">Capability2Tests</a></dt>
+<dt><span class="memberNameLink"><a href="org/opengis/cite/cdb10/level2/Capability2Tests.html#Capability2Tests--">Capability2Tests()</a></span> - Constructor for class org.opengis.cite.cdb10.metadataAndVersioning.<a href="org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.metadataAndVersioning">Capability2Tests</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/opengis/cite/cdb10/level2/Capability2Tests.html#checkLength--">checkLength()</a></span> - Method in class org.opengis.cite.cdb10.level2.<a href="org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.level2">Capability2Tests</a></dt>
+<dt><span class="memberNameLink"><a href="org/opengis/cite/cdb10/level2/Capability2Tests.html#checkLength--">checkLength()</a></span> - Method in class org.opengis.cite.cdb10.metadataAndVersioning.<a href="org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.metadataAndVersioning">Capability2Tests</a></dt>
 <dd>
 <div class="block">Checks the result of the length function.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/opengis/cite/cdb10/level2/Capability2Tests.html#checkPreconditions--">checkPreconditions()</a></span> - Method in class org.opengis.cite.cdb10.level2.<a href="org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.level2">Capability2Tests</a></dt>
+<dt><span class="memberNameLink"><a href="org/opengis/cite/cdb10/level2/Capability2Tests.html#checkPreconditions--">checkPreconditions()</a></span> - Method in class org.opengis.cite.cdb10.metadataAndVersioning.<a href="org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.metadataAndVersioning">Capability2Tests</a></dt>
 <dd>
 <div class="block">Run conformance level 2 tests only if the preconditions are satisfied.</div>
 </dd>
@@ -181,7 +181,7 @@ <h2 class="title">C</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="org/opengis/cite/cdb10/util/ClientUtils.html#ClientUtils--">ClientUtils()</a></span> - Constructor for class org.opengis.cite.cdb10.util.<a href="org/opengis/cite/cdb10/util/ClientUtils.html" title="class in org.opengis.cite.cdb10.util">ClientUtils</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/opengis/cite/cdb10/level2/Capability2Tests.html#codePoint--">codePoint()</a></span> - Method in class org.opengis.cite.cdb10.level2.<a href="org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.level2">Capability2Tests</a></dt>
+<dt><span class="memberNameLink"><a href="org/opengis/cite/cdb10/level2/Capability2Tests.html#codePoint--">codePoint()</a></span> - Method in class org.opengis.cite.cdb10.metadataAndVersioning.<a href="org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.metadataAndVersioning">Capability2Tests</a></dt>
 <dd>
 <div class="block">Checks the Unicode code point value of the first character.</div>
 </dd>
@@ -375,7 +375,7 @@ <h2 class="title">I</h2>
 <dd>
 <div class="block">Indicates if the logger is enabled at a given logging level.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html#isValidDirectory--">isValidDirectory()</a></span> - Method in class org.opengis.cite.cdb10.CDBStructure.<a href="org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.CDBStructure">Capability1Tests</a></dt>
+<dt><span class="memberNameLink"><a href="org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html#isValidDirectory--">isValidDirectory()</a></span> - Method in class org.opengis.cite.cdb10.cdbStructure.<a href="org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.cdbStructure">Capability1Tests</a></dt>
 <dd>
 <div class="block">Verifies the string is empty.</div>
 </dd>
@@ -443,7 +443,7 @@ <h2 class="title">N</h2>
 </a>
 <h2 class="title">O</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html#obtainTestSubject-org.testng.ITestContext-">obtainTestSubject(ITestContext)</a></span> - Method in class org.opengis.cite.cdb10.CDBStructure.<a href="org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.CDBStructure">Capability1Tests</a></dt>
+<dt><span class="memberNameLink"><a href="org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html#obtainTestSubject-org.testng.ITestContext-">obtainTestSubject(ITestContext)</a></span> - Method in class org.opengis.cite.cdb10.cdbStructure.<a href="org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.cdbStructure">Capability1Tests</a></dt>
 <dd>
 <div class="block">Obtains the test subject from the ISuite context.</div>
 </dd>
@@ -464,11 +464,11 @@ <h2 class="title">O</h2>
 <div class="block">The root package includes supporting classes of general utility such as the 
  main controller, listeners, and reporters.</div>
 </dd>
-<dt><a href="org/opengis/cite/cdb10/CDBStructure/package-summary.html">org.opengis.cite.cdb10.CDBStructure</a> - package org.opengis.cite.cdb10.CDBStructure</dt>
+<dt><a href="org/opengis/cite/cdb10/CDBStructure/package-summary.html">org.opengis.cite.cdb10.cdbStructure</a> - package org.opengis.cite.cdb10.cdbStructure</dt>
 <dd>
 <div class="block">Conformance Level 1 includes basic facilities.</div>
 </dd>
-<dt><a href="org/opengis/cite/cdb10/level2/package-summary.html">org.opengis.cite.cdb10.level2</a> - package org.opengis.cite.cdb10.level2</dt>
+<dt><a href="org/opengis/cite/cdb10/level2/package-summary.html">org.opengis.cite.cdb10.metadataAndVersioning</a> - package org.opengis.cite.cdb10.metadataAndVersioning</dt>
 <dd>
 <div class="block">Conformance Level 2 extends Level 1.</div>
 </dd>
diff --git a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html
index d720e0a..6377aad 100644
--- a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html
+++ b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html
@@ -93,7 +93,7 @@
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">org.opengis.cite.cdb10.CDBStructure</div>
+<div class="subTitle">org.opengis.cite.cdb10.cdbStructure</div>
 <h2 title="Class Capability1Tests" class="title">Class Capability1Tests</h2>
 </div>
 <div class="contentContainer">
@@ -104,7 +104,7 @@ <h2 title="Class Capability1Tests" class="title">Class Capability1Tests</h2>
 <li><a href="../../../../../org/opengis/cite/cdb10/CommonFixture.html" title="class in org.opengis.cite.cdb10">org.opengis.cite.cdb10.CommonFixture</a></li>
 <li>
 <ul class="inheritance">
-<li>org.opengis.cite.cdb10.CDBStructure.Capability1Tests</li>
+<li>org.opengis.cite.cdb10.cdbStructure.Capability1Tests</li>
 </ul>
 </li>
 </ul>
diff --git a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/class-use/Capability1Tests.html b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/class-use/Capability1Tests.html
index 872b3e6..60f8abe 100644
--- a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/class-use/Capability1Tests.html
+++ b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/class-use/Capability1Tests.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc (1.8.0_91) on Wed May 25 00:42:42 EDT 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.opengis.cite.cdb10.CDBStructure.Capability1Tests (Test suite: ets-cdb10 0.1-SNAPSHOT API)</title>
+<title>Uses of Class org.opengis.cite.cdb10.cdbStructure.Capability1Tests (Test suite: ets-cdb10 0.1-SNAPSHOT API)</title>
 <meta name="date" content="2016-05-25">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
@@ -13,13 +13,12 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.opengis.cite.cdb10.CDBStructure.Capability1Tests (Test suite: ets-cdb10 0.1-SNAPSHOT API)";
+            parent.document.title="Uses of Class org.opengis.cite.cdb10.cdbStructure.Capability1Tests (Test suite: ets-cdb10 0.1-SNAPSHOT API)";
         }
     }
     catch(err) {
     }
-//-->
-</script>
+//--></script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
@@ -34,7 +33,7 @@
 <ul class="navList" title="Navigation">
 <li><a href="../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.CDBStructure">Class</a></li>
+<li><a href="../../../../../../org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.cdbStructure">Class</a></li>
 <li class="navBarCell1Rev">Use</li>
 <li><a href="../package-tree.html">Tree</a></li>
 <li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
@@ -71,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class org.opengis.cite.cdb10.CDBStructure.Capability1Tests" class="title">Uses of Class<br>org.opengis.cite.cdb10.CDBStructure.Capability1Tests</h2>
+<h2 title="Uses of Class org.opengis.cite.cdb10.cdbStructure.Capability1Tests" class="title">Uses of Class<br>org.opengis.cite.cdb10.cdbStructure.Capability1Tests</h2>
 </div>
-<div class="classUseContainer">No usage of org.opengis.cite.cdb10.CDBStructure.Capability1Tests</div>
+<div class="classUseContainer">No usage of org.opengis.cite.cdb10.cdbStructure.Capability1Tests</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
@@ -85,7 +84,7 @@ <h2 title="Uses of Class org.opengis.cite.cdb10.CDBStructure.Capability1Tests" c
 <ul class="navList" title="Navigation">
 <li><a href="../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.CDBStructure">Class</a></li>
+<li><a href="../../../../../../org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.cdbStructure">Class</a></li>
 <li class="navBarCell1Rev">Use</li>
 <li><a href="../package-tree.html">Tree</a></li>
 <li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
diff --git a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/package-frame.html b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/package-frame.html
index c1eb02b..5015c3b 100644
--- a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/package-frame.html
+++ b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/package-frame.html
@@ -4,17 +4,17 @@
 <head>
 <!-- Generated by javadoc (1.8.0_91) on Wed May 25 00:42:42 EDT 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.opengis.cite.cdb10.CDBStructure (Test suite: ets-cdb10 0.1-SNAPSHOT API)</title>
+<title>org.opengis.cite.cdb10.cdbStructure (Test suite: ets-cdb10 0.1-SNAPSHOT API)</title>
 <meta name="date" content="2016-05-25">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
 <body>
-<h1 class="bar"><a href="../../../../../org/opengis/cite/cdb10/CDBStructure/package-summary.html" target="classFrame">org.opengis.cite.cdb10.CDBStructure</a></h1>
+<h1 class="bar"><a href="../../../../../org/opengis/cite/cdb10/CDBStructure/package-summary.html" target="classFrame">org.opengis.cite.cdb10.cdbStructure</a></h1>
 <div class="indexContainer">
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
-<li><a href="Capability1Tests.html" title="class in org.opengis.cite.cdb10.CDBStructure" target="classFrame">Capability1Tests</a></li>
+<li><a href="Capability1Tests.html" title="class in org.opengis.cite.cdb10.cdbStructure" target="classFrame">Capability1Tests</a></li>
 </ul>
 </div>
 </body>
diff --git a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/package-summary.html b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/package-summary.html
index 8dbaa4c..f5b657e 100644
--- a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/package-summary.html
+++ b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/package-summary.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc (1.8.0_91) on Wed May 25 00:42:42 EDT 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.opengis.cite.cdb10.CDBStructure (Test suite: ets-cdb10 0.1-SNAPSHOT API)</title>
+<title>org.opengis.cite.cdb10.cdbStructure (Test suite: ets-cdb10 0.1-SNAPSHOT API)</title>
 <meta name="date" content="2016-05-25">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -13,13 +13,12 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.opengis.cite.cdb10.CDBStructure (Test suite: ets-cdb10 0.1-SNAPSHOT API)";
+            parent.document.title="org.opengis.cite.cdb10.cdbStructure (Test suite: ets-cdb10 0.1-SNAPSHOT API)";
         }
     }
     catch(err) {
     }
-//-->
-</script>
+//--></script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
@@ -71,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 title="Package" class="title">Package&nbsp;org.opengis.cite.cdb10.CDBStructure</h1>
+<h1 title="Package" class="title">Package&nbsp;org.opengis.cite.cdb10.cdbStructure</h1>
 <div class="docSummary">
 <div class="block">Conformance Level 1 includes basic facilities.</div>
 </div>
@@ -88,7 +87,7 @@ <h1 title="Package" class="title">Package&nbsp;org.opengis.cite.cdb10.CDBStructu
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.CDBStructure">Capability1Tests</a></td>
+<td class="colFirst"><a href="../../../../../org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.cdbStructure">Capability1Tests</a></td>
 <td class="colLast">
 <div class="block">Includes various tests of capability 1.</div>
 </td>
@@ -100,7 +99,8 @@ <h1 title="Package" class="title">Package&nbsp;org.opengis.cite.cdb10.CDBStructu
 <a name="package.description">
 <!--   -->
 </a>
-<h2 title="Package org.opengis.cite.cdb10.CDBStructure Description">Package org.opengis.cite.cdb10.CDBStructure Description</h2>
+<h2 title="Package org.opengis.cite.cdb10.cdbStructure Description">Package org.opengis.cite.cdb10.cdbStructure
+    Description</h2>
 <div class="block">Conformance Level 1 includes basic facilities. The following capabilities
  must be supported: 
  <ul>
diff --git a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/package-tree.html b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/package-tree.html
index 0c72471..de5e4f5 100644
--- a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/package-tree.html
+++ b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/package-tree.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc (1.8.0_91) on Wed May 25 00:42:42 EDT 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.opengis.cite.cdb10.CDBStructure Class Hierarchy (Test suite: ets-cdb10 0.1-SNAPSHOT API)</title>
+<title>org.opengis.cite.cdb10.cdbStructure Class Hierarchy (Test suite: ets-cdb10 0.1-SNAPSHOT API)</title>
 <meta name="date" content="2016-05-25">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -13,13 +13,12 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.opengis.cite.cdb10.CDBStructure Class Hierarchy (Test suite: ets-cdb10 0.1-SNAPSHOT API)";
+            parent.document.title="org.opengis.cite.cdb10.cdbStructure Class Hierarchy (Test suite: ets-cdb10 0.1-SNAPSHOT API)";
         }
     }
     catch(err) {
     }
-//-->
-</script>
+//--></script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
@@ -71,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 class="title">Hierarchy For Package org.opengis.cite.cdb10.CDBStructure</h1>
+<h1 class="title">Hierarchy For Package org.opengis.cite.cdb10.cdbStructure</h1>
 <span class="packageHierarchyLabel">Package Hierarchies:</span>
 <ul class="horizontal">
 <li><a href="../../../../../overview-tree.html">All Packages</a></li>
@@ -84,7 +83,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li type="circle">org.opengis.cite.cdb10.<a href="../../../../../org/opengis/cite/cdb10/CommonFixture.html" title="class in org.opengis.cite.cdb10"><span class="typeNameLink">CommonFixture</span></a>
 <ul>
-<li type="circle">org.opengis.cite.cdb10.CDBStructure.<a href="../../../../../org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.CDBStructure"><span class="typeNameLink">Capability1Tests</span></a></li>
+<li type="circle">org.opengis.cite.cdb10.cdbStructure.<a href="../../../../../org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.cdbStructure"><span class="typeNameLink">Capability1Tests</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/package-use.html b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/package-use.html
index 89708d8..12fbc7c 100644
--- a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/package-use.html
+++ b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CDBStructure/package-use.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc (1.8.0_91) on Wed May 25 00:42:42 EDT 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Package org.opengis.cite.cdb10.CDBStructure (Test suite: ets-cdb10 0.1-SNAPSHOT API)</title>
+<title>Uses of Package org.opengis.cite.cdb10.cdbStructure (Test suite: ets-cdb10 0.1-SNAPSHOT API)</title>
 <meta name="date" content="2016-05-25">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -13,13 +13,12 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package org.opengis.cite.cdb10.CDBStructure (Test suite: ets-cdb10 0.1-SNAPSHOT API)";
+            parent.document.title="Uses of Package org.opengis.cite.cdb10.cdbStructure (Test suite: ets-cdb10 0.1-SNAPSHOT API)";
         }
     }
     catch(err) {
     }
-//-->
-</script>
+//--></script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
@@ -71,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 title="Uses of Package org.opengis.cite.cdb10.CDBStructure" class="title">Uses of Package<br>org.opengis.cite.cdb10.CDBStructure</h1>
+<h1 title="Uses of Package org.opengis.cite.cdb10.cdbStructure" class="title">Uses of Package<br>org.opengis.cite.cdb10.cdbStructure</h1>
 </div>
-<div class="contentContainer">No usage of org.opengis.cite.cdb10.CDBStructure</div>
+<div class="contentContainer">No usage of org.opengis.cite.cdb10.cdbStructure</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
diff --git a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CommonFixture.html b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CommonFixture.html
index ec79fb9..fb3bb6b 100644
--- a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CommonFixture.html
+++ b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/CommonFixture.html
@@ -110,7 +110,7 @@ <h2 title="Class CommonFixture" class="title">Class CommonFixture</h2>
 <li class="blockList">
 <dl>
 <dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.CDBStructure">Capability1Tests</a>, <a href="../../../../org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.level2">Capability2Tests</a></dd>
+<dd><a href="../../../../org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.cdbStructure">Capability1Tests</a>, <a href="../../../../org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.metadataAndVersioning">Capability2Tests</a></dd>
 </dl>
 <hr>
 <br>
diff --git a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/class-use/CommonFixture.html b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/class-use/CommonFixture.html
index 24ce097..e14c70e 100644
--- a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/class-use/CommonFixture.html
+++ b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/class-use/CommonFixture.html
@@ -84,13 +84,13 @@ <h2 title="Uses of Class org.opengis.cite.cdb10.CommonFixture" class="title">Use
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="#org.opengis.cite.cdb10.CDBStructure">org.opengis.cite.cdb10.CDBStructure</a></td>
+<td class="colFirst"><a href="#org.opengis.cite.cdb10.cdbStructure">org.opengis.cite.cdb10.cdbStructure</a></td>
 <td class="colLast">
 <div class="block">Conformance Level 1 includes basic facilities.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="#org.opengis.cite.cdb10.level2">org.opengis.cite.cdb10.level2</a></td>
+<td class="colFirst"><a href="#org.opengis.cite.cdb10.metadataAndVersioning">org.opengis.cite.cdb10.metadataAndVersioning</a></td>
 <td class="colLast">
 <div class="block">Conformance Level 2 extends Level 1.</div>
 </td>
@@ -100,12 +100,12 @@ <h2 title="Uses of Class org.opengis.cite.cdb10.CommonFixture" class="title">Use
 </li>
 <li class="blockList">
 <ul class="blockList">
-<li class="blockList"><a name="org.opengis.cite.cdb10.CDBStructure">
+<li class="blockList"><a name="org.opengis.cite.cdb10.cdbStructure">
 <!--   -->
 </a>
-<h3>Uses of <a href="../../../../../org/opengis/cite/cdb10/CommonFixture.html" title="class in org.opengis.cite.cdb10">CommonFixture</a> in <a href="../../../../../org/opengis/cite/cdb10/CDBStructure/package-summary.html">org.opengis.cite.cdb10.CDBStructure</a></h3>
+<h3>Uses of <a href="../../../../../org/opengis/cite/cdb10/CommonFixture.html" title="class in org.opengis.cite.cdb10">CommonFixture</a> in <a href="../../../../../org/opengis/cite/cdb10/CDBStructure/package-summary.html">org.opengis.cite.cdb10.cdbStructure</a></h3>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
-<caption><span>Subclasses of <a href="../../../../../org/opengis/cite/cdb10/CommonFixture.html" title="class in org.opengis.cite.cdb10">CommonFixture</a> in <a href="../../../../../org/opengis/cite/cdb10/CDBStructure/package-summary.html">org.opengis.cite.cdb10.CDBStructure</a></span><span class="tabEnd">&nbsp;</span></caption>
+<caption><span>Subclasses of <a href="../../../../../org/opengis/cite/cdb10/CommonFixture.html" title="class in org.opengis.cite.cdb10">CommonFixture</a> in <a href="../../../../../org/opengis/cite/cdb10/CDBStructure/package-summary.html">org.opengis.cite.cdb10.cdbStructure</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Class and Description</th>
@@ -113,19 +113,19 @@ <h3>Uses of <a href="../../../../../org/opengis/cite/cdb10/CommonFixture.html" t
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.CDBStructure">Capability1Tests</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.cdbStructure">Capability1Tests</a></span></code>
 <div class="block">Includes various tests of capability 1.</div>
 </td>
 </tr>
 </tbody>
 </table>
 </li>
-<li class="blockList"><a name="org.opengis.cite.cdb10.level2">
+<li class="blockList"><a name="org.opengis.cite.cdb10.metadataAndVersioning">
 <!--   -->
 </a>
-<h3>Uses of <a href="../../../../../org/opengis/cite/cdb10/CommonFixture.html" title="class in org.opengis.cite.cdb10">CommonFixture</a> in <a href="../../../../../org/opengis/cite/cdb10/level2/package-summary.html">org.opengis.cite.cdb10.level2</a></h3>
+<h3>Uses of <a href="../../../../../org/opengis/cite/cdb10/CommonFixture.html" title="class in org.opengis.cite.cdb10">CommonFixture</a> in <a href="../../../../../org/opengis/cite/cdb10/level2/package-summary.html">org.opengis.cite.cdb10.metadataAndVersioning</a></h3>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
-<caption><span>Subclasses of <a href="../../../../../org/opengis/cite/cdb10/CommonFixture.html" title="class in org.opengis.cite.cdb10">CommonFixture</a> in <a href="../../../../../org/opengis/cite/cdb10/level2/package-summary.html">org.opengis.cite.cdb10.level2</a></span><span class="tabEnd">&nbsp;</span></caption>
+<caption><span>Subclasses of <a href="../../../../../org/opengis/cite/cdb10/CommonFixture.html" title="class in org.opengis.cite.cdb10">CommonFixture</a> in <a href="../../../../../org/opengis/cite/cdb10/level2/package-summary.html">org.opengis.cite.cdb10.metadataAndVersioning</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Class and Description</th>
@@ -133,7 +133,7 @@ <h3>Uses of <a href="../../../../../org/opengis/cite/cdb10/CommonFixture.html" t
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.level2">Capability2Tests</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.metadataAndVersioning">Capability2Tests</a></span></code>
 <div class="block">Includes various tests of capability 2.</div>
 </td>
 </tr>
diff --git a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/Capability2Tests.html b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/Capability2Tests.html
index 286f725..e1eb0bf 100644
--- a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/Capability2Tests.html
+++ b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/Capability2Tests.html
@@ -93,7 +93,7 @@
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">org.opengis.cite.cdb10.level2</div>
+<div class="subTitle">org.opengis.cite.cdb10.MetadataAndVersioning</div>
 <h2 title="Class Capability2Tests" class="title">Class Capability2Tests</h2>
 </div>
 <div class="contentContainer">
@@ -104,7 +104,7 @@ <h2 title="Class Capability2Tests" class="title">Class Capability2Tests</h2>
 <li><a href="../../../../../org/opengis/cite/cdb10/CommonFixture.html" title="class in org.opengis.cite.cdb10">org.opengis.cite.cdb10.CommonFixture</a></li>
 <li>
 <ul class="inheritance">
-<li>org.opengis.cite.cdb10.level2.Capability2Tests</li>
+<li>org.opengis.cite.cdb10.MetadataAndVersioning.Capability2Tests</li>
 </ul>
 </li>
 </ul>
diff --git a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/class-use/Capability2Tests.html b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/class-use/Capability2Tests.html
index 0b32622..e7304a0 100644
--- a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/class-use/Capability2Tests.html
+++ b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/class-use/Capability2Tests.html
@@ -4,7 +4,8 @@
 <head>
 <!-- Generated by javadoc (1.8.0_91) on Wed May 25 00:42:42 EDT 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class org.opengis.cite.cdb10.level2.Capability2Tests (Test suite: ets-cdb10 0.1-SNAPSHOT API)</title>
+<title>Uses of Class org.opengis.cite.cdb10.metadataAndVersioning.Capability2Tests (Test suite: ets-cdb10 0.1-SNAPSHOT
+    API)</title>
 <meta name="date" content="2016-05-25">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
@@ -13,13 +14,12 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class org.opengis.cite.cdb10.level2.Capability2Tests (Test suite: ets-cdb10 0.1-SNAPSHOT API)";
+            parent.document.title="Uses of Class org.opengis.cite.cdb10.metadataAndVersioning.Capability2Tests (Test suite: ets-cdb10 0.1-SNAPSHOT API)";
         }
     }
     catch(err) {
     }
-//-->
-</script>
+//--></script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
@@ -34,7 +34,7 @@
 <ul class="navList" title="Navigation">
 <li><a href="../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.level2">Class</a></li>
+<li><a href="../../../../../../org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.metadataAndVersioning">Class</a></li>
 <li class="navBarCell1Rev">Use</li>
 <li><a href="../package-tree.html">Tree</a></li>
 <li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
@@ -71,9 +71,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class org.opengis.cite.cdb10.level2.Capability2Tests" class="title">Uses of Class<br>org.opengis.cite.cdb10.level2.Capability2Tests</h2>
+<h2 title="Uses of Class org.opengis.cite.cdb10.metadataAndVersioning.Capability2Tests" class="title">Uses of Class<br>org.opengis.cite.cdb10.metadataAndVersioning.Capability2Tests</h2>
 </div>
-<div class="classUseContainer">No usage of org.opengis.cite.cdb10.level2.Capability2Tests</div>
+<div class="classUseContainer">No usage of org.opengis.cite.cdb10.metadataAndVersioning.Capability2Tests</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
@@ -85,7 +85,7 @@ <h2 title="Uses of Class org.opengis.cite.cdb10.level2.Capability2Tests" class="
 <ul class="navList" title="Navigation">
 <li><a href="../../../../../../overview-summary.html">Overview</a></li>
 <li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../../../../../org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.level2">Class</a></li>
+<li><a href="../../../../../../org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.metadataAndVersioning">Class</a></li>
 <li class="navBarCell1Rev">Use</li>
 <li><a href="../package-tree.html">Tree</a></li>
 <li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
diff --git a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/package-frame.html b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/package-frame.html
index 8388aa5..d0f5991 100644
--- a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/package-frame.html
+++ b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/package-frame.html
@@ -4,17 +4,17 @@
 <head>
 <!-- Generated by javadoc (1.8.0_91) on Wed May 25 00:42:42 EDT 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.opengis.cite.cdb10.level2 (Test suite: ets-cdb10 0.1-SNAPSHOT API)</title>
+<title>org.opengis.cite.cdb10.metadataAndVersioning (Test suite: ets-cdb10 0.1-SNAPSHOT API)</title>
 <meta name="date" content="2016-05-25">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
 <body>
-<h1 class="bar"><a href="../../../../../org/opengis/cite/cdb10/level2/package-summary.html" target="classFrame">org.opengis.cite.cdb10.level2</a></h1>
+<h1 class="bar"><a href="../../../../../org/opengis/cite/cdb10/level2/package-summary.html" target="classFrame">org.opengis.cite.cdb10.metadataAndVersioning</a></h1>
 <div class="indexContainer">
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
-<li><a href="Capability2Tests.html" title="class in org.opengis.cite.cdb10.level2" target="classFrame">Capability2Tests</a></li>
+<li><a href="Capability2Tests.html" title="class in org.opengis.cite.cdb10.metadataAndVersioning" target="classFrame">Capability2Tests</a></li>
 </ul>
 </div>
 </body>
diff --git a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/package-summary.html b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/package-summary.html
index 25cf2dc..3d39ced 100644
--- a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/package-summary.html
+++ b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/package-summary.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc (1.8.0_91) on Wed May 25 00:42:42 EDT 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.opengis.cite.cdb10.level2 (Test suite: ets-cdb10 0.1-SNAPSHOT API)</title>
+<title>org.opengis.cite.cdb10.metadataAndVersioning (Test suite: ets-cdb10 0.1-SNAPSHOT API)</title>
 <meta name="date" content="2016-05-25">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -13,13 +13,12 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.opengis.cite.cdb10.level2 (Test suite: ets-cdb10 0.1-SNAPSHOT API)";
+            parent.document.title="org.opengis.cite.cdb10.metadataAndVersioning (Test suite: ets-cdb10 0.1-SNAPSHOT API)";
         }
     }
     catch(err) {
     }
-//-->
-</script>
+//--></script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
@@ -71,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 title="Package" class="title">Package&nbsp;org.opengis.cite.cdb10.level2</h1>
+<h1 title="Package" class="title">Package&nbsp;org.opengis.cite.cdb10.metadataAndVersioning</h1>
 <div class="docSummary">
 <div class="block">Conformance Level 2 extends Level 1.</div>
 </div>
@@ -88,7 +87,7 @@ <h1 title="Package" class="title">Package&nbsp;org.opengis.cite.cdb10.level2</h1
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.level2">Capability2Tests</a></td>
+<td class="colFirst"><a href="../../../../../org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.metadataAndVersioning">Capability2Tests</a></td>
 <td class="colLast">
 <div class="block">Includes various tests of capability 2.</div>
 </td>
@@ -100,7 +99,8 @@ <h1 title="Package" class="title">Package&nbsp;org.opengis.cite.cdb10.level2</h1
 <a name="package.description">
 <!--   -->
 </a>
-<h2 title="Package org.opengis.cite.cdb10.level2 Description">Package org.opengis.cite.cdb10.level2 Description</h2>
+<h2 title="Package org.opengis.cite.cdb10.metadataAndVersioning Description">Package
+    org.opengis.cite.cdb10.metadataAndVersioning Description</h2>
 <div class="block">Conformance Level 2 extends Level 1. The following additional capabilities
  are required: 
  <ul> 
diff --git a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/package-tree.html b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/package-tree.html
index 4fecb61..d77b416 100644
--- a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/package-tree.html
+++ b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/package-tree.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc (1.8.0_91) on Wed May 25 00:42:42 EDT 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>org.opengis.cite.cdb10.level2 Class Hierarchy (Test suite: ets-cdb10 0.1-SNAPSHOT API)</title>
+<title>org.opengis.cite.cdb10.metadataAndVersioning Class Hierarchy (Test suite: ets-cdb10 0.1-SNAPSHOT API)</title>
 <meta name="date" content="2016-05-25">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -13,13 +13,12 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.opengis.cite.cdb10.level2 Class Hierarchy (Test suite: ets-cdb10 0.1-SNAPSHOT API)";
+            parent.document.title="org.opengis.cite.cdb10.metadataAndVersioning Class Hierarchy (Test suite: ets-cdb10 0.1-SNAPSHOT API)";
         }
     }
     catch(err) {
     }
-//-->
-</script>
+//--></script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
@@ -71,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 class="title">Hierarchy For Package org.opengis.cite.cdb10.level2</h1>
+<h1 class="title">Hierarchy For Package org.opengis.cite.cdb10.metadataAndVersioning</h1>
 <span class="packageHierarchyLabel">Package Hierarchies:</span>
 <ul class="horizontal">
 <li><a href="../../../../../overview-tree.html">All Packages</a></li>
@@ -84,7 +83,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li type="circle">org.opengis.cite.cdb10.<a href="../../../../../org/opengis/cite/cdb10/CommonFixture.html" title="class in org.opengis.cite.cdb10"><span class="typeNameLink">CommonFixture</span></a>
 <ul>
-<li type="circle">org.opengis.cite.cdb10.level2.<a href="../../../../../org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.level2"><span class="typeNameLink">Capability2Tests</span></a></li>
+<li type="circle">org.opengis.cite.cdb10.metadataAndVersioning.<a href="../../../../../org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.metadataAndVersioning"><span class="typeNameLink">Capability2Tests</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/package-use.html b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/package-use.html
index 62f990c..1c463bd 100644
--- a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/package-use.html
+++ b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/level2/package-use.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc (1.8.0_91) on Wed May 25 00:42:42 EDT 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Package org.opengis.cite.cdb10.level2 (Test suite: ets-cdb10 0.1-SNAPSHOT API)</title>
+<title>Uses of Package org.opengis.cite.cdb10.metadataAndVersioning (Test suite: ets-cdb10 0.1-SNAPSHOT API)</title>
 <meta name="date" content="2016-05-25">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -13,13 +13,12 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package org.opengis.cite.cdb10.level2 (Test suite: ets-cdb10 0.1-SNAPSHOT API)";
+            parent.document.title="Uses of Package org.opengis.cite.cdb10.metadataAndVersioning (Test suite: ets-cdb10 0.1-SNAPSHOT API)";
         }
     }
     catch(err) {
     }
-//-->
-</script>
+//--></script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
@@ -71,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 title="Uses of Package org.opengis.cite.cdb10.level2" class="title">Uses of Package<br>org.opengis.cite.cdb10.level2</h1>
+<h1 title="Uses of Package org.opengis.cite.cdb10.metadataAndVersioning" class="title">Uses of Package<br>org.opengis.cite.cdb10.metadataAndVersioning</h1>
 </div>
-<div class="contentContainer">No usage of org.opengis.cite.cdb10.level2</div>
+<div class="contentContainer">No usage of org.opengis.cite.cdb10.metadataAndVersioning</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
diff --git a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/package-use.html b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/package-use.html
index 0656a00..e1ec569 100644
--- a/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/package-use.html
+++ b/cdb10/1.0/site/apidocs/org/opengis/cite/cdb10/package-use.html
@@ -91,13 +91,13 @@ <h1 title="Uses of Package org.opengis.cite.cdb10" class="title">Uses of Package
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="#org.opengis.cite.cdb10.CDBStructure">org.opengis.cite.cdb10.CDBStructure</a></td>
+<td class="colFirst"><a href="#org.opengis.cite.cdb10.cdbStructure">org.opengis.cite.cdb10.cdbStructure</a></td>
 <td class="colLast">
 <div class="block">Conformance Level 1 includes basic facilities.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="#org.opengis.cite.cdb10.level2">org.opengis.cite.cdb10.level2</a></td>
+<td class="colFirst"><a href="#org.opengis.cite.cdb10.metadataAndVersioning">org.opengis.cite.cdb10.metadataAndVersioning</a></td>
 <td class="colLast">
 <div class="block">Conformance Level 2 extends Level 1.</div>
 </td>
@@ -128,34 +128,34 @@ <h1 title="Uses of Package org.opengis.cite.cdb10" class="title">Uses of Package
 </tbody>
 </table>
 </li>
-<li class="blockList"><a name="org.opengis.cite.cdb10.CDBStructure">
+<li class="blockList"><a name="org.opengis.cite.cdb10.cdbStructure">
 <!--   -->
 </a>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../../../../org/opengis/cite/cdb10/package-summary.html">org.opengis.cite.cdb10</a> used by <a href="../../../../org/opengis/cite/cdb10/CDBStructure/package-summary.html">org.opengis.cite.cdb10.CDBStructure</a></span><span class="tabEnd">&nbsp;</span></caption>
+<caption><span>Classes in <a href="../../../../org/opengis/cite/cdb10/package-summary.html">org.opengis.cite.cdb10</a> used by <a href="../../../../org/opengis/cite/cdb10/CDBStructure/package-summary.html">org.opengis.cite.cdb10.cdbStructure</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Class and Description</th>
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colOne"><a href="../../../../org/opengis/cite/cdb10/class-use/CommonFixture.html#org.opengis.cite.cdb10.CDBStructure">CommonFixture</a>
+<td class="colOne"><a href="../../../../org/opengis/cite/cdb10/class-use/CommonFixture.html#org.opengis.cite.cdb10.cdbStructure">CommonFixture</a>
 <div class="block">A supporting base class that sets up a common test fixture.</div>
 </td>
 </tr>
 </tbody>
 </table>
 </li>
-<li class="blockList"><a name="org.opengis.cite.cdb10.level2">
+<li class="blockList"><a name="org.opengis.cite.cdb10.metadataAndVersioning">
 <!--   -->
 </a>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../../../../org/opengis/cite/cdb10/package-summary.html">org.opengis.cite.cdb10</a> used by <a href="../../../../org/opengis/cite/cdb10/level2/package-summary.html">org.opengis.cite.cdb10.level2</a></span><span class="tabEnd">&nbsp;</span></caption>
+<caption><span>Classes in <a href="../../../../org/opengis/cite/cdb10/package-summary.html">org.opengis.cite.cdb10</a> used by <a href="../../../../org/opengis/cite/cdb10/level2/package-summary.html">org.opengis.cite.cdb10.metadataAndVersioning</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colOne" scope="col">Class and Description</th>
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colOne"><a href="../../../../org/opengis/cite/cdb10/class-use/CommonFixture.html#org.opengis.cite.cdb10.level2">CommonFixture</a>
+<td class="colOne"><a href="../../../../org/opengis/cite/cdb10/class-use/CommonFixture.html#org.opengis.cite.cdb10.metadataAndVersioning">CommonFixture</a>
 <div class="block">A supporting base class that sets up a common test fixture.</div>
 </td>
 </tr>
diff --git a/cdb10/1.0/site/apidocs/overview-frame.html b/cdb10/1.0/site/apidocs/overview-frame.html
index b6f7a68..51d8f9c 100644
--- a/cdb10/1.0/site/apidocs/overview-frame.html
+++ b/cdb10/1.0/site/apidocs/overview-frame.html
@@ -15,8 +15,8 @@
 <h2 title="Packages">Packages</h2>
 <ul title="Packages">
 <li><a href="org/opengis/cite/cdb10/package-frame.html" target="packageFrame">org.opengis.cite.cdb10</a></li>
-<li><a href="org/opengis/cite/cdb10/CDBStructure/package-frame.html" target="packageFrame">org.opengis.cite.cdb10.CDBStructure</a></li>
-<li><a href="org/opengis/cite/cdb10/level2/package-frame.html" target="packageFrame">org.opengis.cite.cdb10.level2</a></li>
+<li><a href="org/opengis/cite/cdb10/CDBStructure/package-frame.html" target="packageFrame">org.opengis.cite.cdb10.cdbStructure</a></li>
+<li><a href="org/opengis/cite/cdb10/level2/package-frame.html" target="packageFrame">org.opengis.cite.cdb10.MetadataAndVersioning</a></li>
 <li><a href="org/opengis/cite/cdb10/util/package-frame.html" target="packageFrame">org.opengis.cite.cdb10.util</a></li>
 </ul>
 </div>
diff --git a/cdb10/1.0/site/apidocs/overview-summary.html b/cdb10/1.0/site/apidocs/overview-summary.html
index d25d99f..ce48e0b 100644
--- a/cdb10/1.0/site/apidocs/overview-summary.html
+++ b/cdb10/1.0/site/apidocs/overview-summary.html
@@ -95,13 +95,13 @@ <h1 class="title">Test suite: ets-cdb10 0.1-SNAPSHOT API</h1>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="org/opengis/cite/cdb10/CDBStructure/package-summary.html">org.opengis.cite.cdb10.CDBStructure</a></td>
+<td class="colFirst"><a href="org/opengis/cite/cdb10/CDBStructure/package-summary.html">org.opengis.cite.cdb10.cdbStructure</a></td>
 <td class="colLast">
 <div class="block">Conformance Level 1 includes basic facilities.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="org/opengis/cite/cdb10/level2/package-summary.html">org.opengis.cite.cdb10.level2</a></td>
+<td class="colFirst"><a href="org/opengis/cite/cdb10/level2/package-summary.html">org.opengis.cite.cdb10.MetadataAndVersioning</a></td>
 <td class="colLast">
 <div class="block">Conformance Level 2 extends Level 1.</div>
 </td>
diff --git a/cdb10/1.0/site/apidocs/overview-tree.html b/cdb10/1.0/site/apidocs/overview-tree.html
index 5db8ac0..394e273 100644
--- a/cdb10/1.0/site/apidocs/overview-tree.html
+++ b/cdb10/1.0/site/apidocs/overview-tree.html
@@ -75,8 +75,8 @@ <h1 class="title">Hierarchy For All Packages</h1>
 <span class="packageHierarchyLabel">Package Hierarchies:</span>
 <ul class="horizontal">
 <li><a href="org/opengis/cite/cdb10/package-tree.html">org.opengis.cite.cdb10</a>, </li>
-<li><a href="org/opengis/cite/cdb10/CDBStructure/package-tree.html">org.opengis.cite.cdb10.CDBStructure</a>, </li>
-<li><a href="org/opengis/cite/cdb10/level2/package-tree.html">org.opengis.cite.cdb10.level2</a>, </li>
+<li><a href="org/opengis/cite/cdb10/CDBStructure/package-tree.html">org.opengis.cite.cdb10.cdbStructure</a>, </li>
+<li><a href="org/opengis/cite/cdb10/level2/package-tree.html">org.opengis.cite.cdb10.metadataAndVersioning</a>, </li>
 <li><a href="org/opengis/cite/cdb10/util/package-tree.html">org.opengis.cite.cdb10.util</a></li>
 </ul>
 </div>
@@ -93,8 +93,8 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li type="circle">org.opengis.cite.cdb10.util.<a href="org/opengis/cite/cdb10/util/ClientUtils.html" title="class in org.opengis.cite.cdb10.util"><span class="typeNameLink">ClientUtils</span></a></li>
 <li type="circle">org.opengis.cite.cdb10.<a href="org/opengis/cite/cdb10/CommonFixture.html" title="class in org.opengis.cite.cdb10"><span class="typeNameLink">CommonFixture</span></a>
 <ul>
-<li type="circle">org.opengis.cite.cdb10.CDBStructure.<a href="org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.CDBStructure"><span class="typeNameLink">Capability1Tests</span></a></li>
-<li type="circle">org.opengis.cite.cdb10.level2.<a href="org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.level2"><span class="typeNameLink">Capability2Tests</span></a></li>
+<li type="circle">org.opengis.cite.cdb10.cdbStructure.<a href="org/opengis/cite/cdb10/CDBStructure/Capability1Tests.html" title="class in org.opengis.cite.cdb10.cdbStructure"><span class="typeNameLink">Capability1Tests</span></a></li>
+<li type="circle">org.opengis.cite.cdb10.metadataAndVersioning.<a href="org/opengis/cite/cdb10/level2/Capability2Tests.html" title="class in org.opengis.cite.cdb10.metadataAndVersioning"><span class="typeNameLink">Capability2Tests</span></a></li>
 </ul>
 </li>
 <li type="circle">org.opengis.cite.cdb10.<a href="org/opengis/cite/cdb10/ErrorMessage.html" title="class in org.opengis.cite.cdb10"><span class="typeNameLink">ErrorMessage</span></a></li>
diff --git a/cdb10/1.0/site/apidocs/package-list b/cdb10/1.0/site/apidocs/package-list
index ee34b3d..90fd02f 100644
--- a/cdb10/1.0/site/apidocs/package-list
+++ b/cdb10/1.0/site/apidocs/package-list
@@ -1,4 +1,4 @@
 org.opengis.cite.cdb10
-org.opengis.cite.cdb10.CDBStructure
-org.opengis.cite.cdb10.level2
+org.opengis.cite.cdb10.cdbStructure
+org.opengis.cite.cdb10.metadataAndVersioning
 org.opengis.cite.cdb10.util
diff --git a/src/main/java/org/opengis/cite/cdb10/CDBStructure/XmlUtilities.java b/src/main/java/org/opengis/cite/cdb10/CDBStructure/XmlUtilities.java
deleted file mode 100644
index 0be9226..0000000
--- a/src/main/java/org/opengis/cite/cdb10/CDBStructure/XmlUtilities.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.opengis.cite.cdb10.CDBStructure;
-
-import org.opengis.cite.cdb10.util.SchemaValidatorErrorHandler;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-import javax.xml.validation.Validator;
-import javax.xml.xpath.*;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Path;
-
-/**
- * Created by martin on 2016-09-06.
- */
-public class XmlUtilities {
-    public static SchemaValidatorErrorHandler validateXmlFileIsValid(File xmlFile, File xsdFile) throws SAXException, IOException {
-        SchemaValidatorErrorHandler errorHandler = new SchemaValidatorErrorHandler();
-        SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-        Schema schema = schemaFactory.newSchema(xsdFile);
-
-        Validator validator = schema.newValidator();
-        validator.setErrorHandler(errorHandler);
-
-        validator.validate(new StreamSource(xmlFile));
-
-        return errorHandler;
-    }
-
-    public static NodeList getNodeList(String xpathQuery, Path xmlFile) {
-        try {
-            Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(String.valueOf(xmlFile));
-            XPath xPath = XPathFactory.newInstance().newXPath();
-            XPathExpression exp = xPath.compile(xpathQuery);
-            return (NodeList) exp.evaluate(doc, XPathConstants.NODESET);
-        } catch (ParserConfigurationException | SAXException | IOException | XPathExpressionException ex) {
-            return null;
-        }
-    }
-}
diff --git a/src/main/java/org/opengis/cite/cdb10/CDBStructure/Capability1Tests.java b/src/main/java/org/opengis/cite/cdb10/cdbStructure/Capability1Tests.java
similarity index 99%
rename from src/main/java/org/opengis/cite/cdb10/CDBStructure/Capability1Tests.java
rename to src/main/java/org/opengis/cite/cdb10/cdbStructure/Capability1Tests.java
index 3cc92c8..475e021 100644
--- a/src/main/java/org/opengis/cite/cdb10/CDBStructure/Capability1Tests.java
+++ b/src/main/java/org/opengis/cite/cdb10/cdbStructure/Capability1Tests.java
@@ -1,4 +1,4 @@
-package org.opengis.cite.cdb10.CDBStructure;
+package org.opengis.cite.cdb10.cdbStructure;
 
 import org.opengis.cite.cdb10.CommonFixture;
 import org.testng.Assert;
diff --git a/src/main/java/org/opengis/cite/cdb10/CDBStructure/UploadServlet.java b/src/main/java/org/opengis/cite/cdb10/cdbStructure/UploadServlet.java
similarity index 100%
rename from src/main/java/org/opengis/cite/cdb10/CDBStructure/UploadServlet.java
rename to src/main/java/org/opengis/cite/cdb10/cdbStructure/UploadServlet.java
diff --git a/src/main/java/org/opengis/cite/cdb10/CDBStructure/package-info.java b/src/main/java/org/opengis/cite/cdb10/cdbStructure/package-info.java
similarity index 88%
rename from src/main/java/org/opengis/cite/cdb10/CDBStructure/package-info.java
rename to src/main/java/org/opengis/cite/cdb10/cdbStructure/package-info.java
index 28b1bea..d4575f4 100644
--- a/src/main/java/org/opengis/cite/cdb10/CDBStructure/package-info.java
+++ b/src/main/java/org/opengis/cite/cdb10/cdbStructure/package-info.java
@@ -11,4 +11,4 @@
  * href="http://www.w3.org/TR/html5/infrastructure.html#conformance-classes">HTML5
  * - Conformance classes</a>
  */
-package org.opengis.cite.cdb10.CDBStructure;
+package org.opengis.cite.cdb10.cdbStructure;
diff --git a/src/main/java/org/opengis/cite/cdb10/CDBStructure/CDBAttributesXmlStructureTests.java b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/CDBAttributesXmlStructureTests.java
similarity index 84%
rename from src/main/java/org/opengis/cite/cdb10/CDBStructure/CDBAttributesXmlStructureTests.java
rename to src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/CDBAttributesXmlStructureTests.java
index d2feda9..9904a9a 100644
--- a/src/main/java/org/opengis/cite/cdb10/CDBStructure/CDBAttributesXmlStructureTests.java
+++ b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/CDBAttributesXmlStructureTests.java
@@ -1,7 +1,8 @@
-package org.opengis.cite.cdb10.CDBStructure;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.opengis.cite.cdb10.CommonFixture;
 import org.opengis.cite.cdb10.util.SchemaValidatorErrorHandler;
+import org.opengis.cite.cdb10.util.XMLUtils;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.w3c.dom.Node;
@@ -33,7 +34,7 @@ public void verifyCDBAttributesXmlAgainstSchema() throws IOException, SAXExcepti
         File xmlFile = Paths.get(path, "Metadata", "CDB_Attributes.xml").toFile();
         File xsdFile = Paths.get(path, "Metadata", "Schema", "Vector_Attributes.xsd").toFile();
 
-        SchemaValidatorErrorHandler errorHandler = XmlUtilities.validateXmlFileIsValid(xmlFile, xsdFile);
+        SchemaValidatorErrorHandler errorHandler = XMLUtils.validateXmlFileIsValid(xmlFile, xsdFile);
 
         if (!errorHandler.noErrors()) {
             Assert.fail(xmlFile.getName() + " does not contain valid XML. Errors: " + errorHandler.getMessages());
@@ -42,7 +43,7 @@ public void verifyCDBAttributesXmlAgainstSchema() throws IOException, SAXExcepti
 
     @Test
     public void verifyCodeIsAnInteger() {
-        NodeList nodeList = XmlUtilities.getNodeList("//Attribute", Paths.get(path, "Metadata", "CDB_Attributes.xml"));
+        NodeList nodeList = XMLUtils.getNodeList("//Attribute", Paths.get(path, "Metadata", "CDB_Attributes.xml"));
 
         ArrayList<String> values = new ArrayList<>();
 
@@ -59,7 +60,7 @@ public void verifyCodeIsAnInteger() {
 
     @Test
     public void verifySymbolIsUnique() {
-        NodeList nodeList = XmlUtilities.getNodeList("//Attribute", Paths.get(path, "Metadata", "CDB_Attributes.xml"));
+        NodeList nodeList = XMLUtils.getNodeList("//Attribute", Paths.get(path, "Metadata", "CDB_Attributes.xml"));
 
         ArrayList<String> symbols = new ArrayList<>();
 
@@ -76,7 +77,7 @@ public void verifySymbolIsUnique() {
 
     @Test
     public void verifyValueHasAValidType() {
-        NodeList nodeList = XmlUtilities.getNodeList("//Value/Type", Paths.get(path, "Metadata", "CDB_Attributes.xml"));
+        NodeList nodeList = XMLUtils.getNodeList("//Value/Type", Paths.get(path, "Metadata", "CDB_Attributes.xml"));
 
         ArrayList<String> types = new ArrayList<>();
         List<String> VALID_TYPES = Arrays.asList("Text", "Numeric", "Boolean");
@@ -95,7 +96,7 @@ public void verifyValueHasAValidType() {
 
     @Test
     public void verifyScalerCodeIsValid() {
-        NodeList nodeList = XmlUtilities.getNodeList("//Scalers/Scaler", Paths.get(path, "Metadata", "CDB_Attributes.xml"));
+        NodeList nodeList = XMLUtils.getNodeList("//Scalers/Scaler", Paths.get(path, "Metadata", "CDB_Attributes.xml"));
 
         ArrayList<String> values = new ArrayList<>();
 
@@ -111,7 +112,7 @@ public void verifyScalerCodeIsValid() {
     }
 
     public void verifyUnitCodeIsValid() {
-        NodeList nodeList = XmlUtilities.getNodeList("//Units/Unit", Paths.get(path, "Metadata", "CDB_Attributes.xml"));
+        NodeList nodeList = XMLUtils.getNodeList("//Units/Unit", Paths.get(path, "Metadata", "CDB_Attributes.xml"));
 
         ArrayList<String> values = new ArrayList<>();
 
diff --git a/src/main/java/org/opengis/cite/cdb10/level2/Capability2Tests.java b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/Capability2Tests.java
similarity index 94%
rename from src/main/java/org/opengis/cite/cdb10/level2/Capability2Tests.java
rename to src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/Capability2Tests.java
index 1d70577..0743d38 100644
--- a/src/main/java/org/opengis/cite/cdb10/level2/Capability2Tests.java
+++ b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/Capability2Tests.java
@@ -1,4 +1,4 @@
-package org.opengis.cite.cdb10.level2;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.opengis.cite.cdb10.CommonFixture;
 import org.testng.Assert;
diff --git a/src/main/java/org/opengis/cite/cdb10/CDBStructure/ConfigurationXmlStructureTests.java b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/ConfigurationXmlStructureTests.java
similarity index 84%
rename from src/main/java/org/opengis/cite/cdb10/CDBStructure/ConfigurationXmlStructureTests.java
rename to src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/ConfigurationXmlStructureTests.java
index c9ce3e9..56e446b 100644
--- a/src/main/java/org/opengis/cite/cdb10/CDBStructure/ConfigurationXmlStructureTests.java
+++ b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/ConfigurationXmlStructureTests.java
@@ -1,7 +1,8 @@
-package org.opengis.cite.cdb10.CDBStructure;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.opengis.cite.cdb10.CommonFixture;
 import org.opengis.cite.cdb10.util.SchemaValidatorErrorHandler;
+import org.opengis.cite.cdb10.util.XMLUtils;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
@@ -27,7 +28,7 @@ public void verifyConfigurationXmlAgainstSchema() throws IOException, SAXExcepti
         File xmlFile = Paths.get(path, "Metadata", "Configuration.xml").toFile();
         File xsdFile = Paths.get(path, "Metadata", "Schema", "Configuration.xsd").toFile();
 
-        SchemaValidatorErrorHandler errorHandler = XmlUtilities.validateXmlFileIsValid(xmlFile, xsdFile);
+        SchemaValidatorErrorHandler errorHandler = XMLUtils.validateXmlFileIsValid(xmlFile, xsdFile);
 
         if (!errorHandler.noErrors()) {
             Assert.fail(xmlFile.getName() + " does not contain valid XML. Errors: " + errorHandler.getMessages());
diff --git a/src/main/java/org/opengis/cite/cdb10/CDBStructure/DefaultsXmlStructureTests.java b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/DefaultsXmlStructureTests.java
similarity index 84%
rename from src/main/java/org/opengis/cite/cdb10/CDBStructure/DefaultsXmlStructureTests.java
rename to src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/DefaultsXmlStructureTests.java
index 1f9c311..e3fb0db 100644
--- a/src/main/java/org/opengis/cite/cdb10/CDBStructure/DefaultsXmlStructureTests.java
+++ b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/DefaultsXmlStructureTests.java
@@ -1,7 +1,7 @@
-package org.opengis.cite.cdb10.CDBStructure;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.opengis.cite.cdb10.CommonFixture;
-import org.opengis.cite.cdb10.util.SchemaValidatorErrorHandler;
+import org.opengis.cite.cdb10.util.*;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.w3c.dom.Node;
@@ -29,7 +29,7 @@ public void verifyDefaultsXmlAgainstSchema() throws IOException, SAXException {
         File xmlFile = Paths.get(path, "Metadata", "Defaults.xml").toFile();
         File xsdFile = Paths.get(path, "Metadata", "Schema", "Defaults.xsd").toFile();
 
-        SchemaValidatorErrorHandler errorHandler = XmlUtilities.validateXmlFileIsValid(xmlFile, xsdFile);
+        SchemaValidatorErrorHandler errorHandler = XMLUtils.validateXmlFileIsValid(xmlFile, xsdFile);
 
         if (!errorHandler.noErrors()) {
             Assert.fail(xmlFile.getName() + " does not contain valid XML. Errors: " + errorHandler.getMessages());
@@ -38,7 +38,7 @@ public void verifyDefaultsXmlAgainstSchema() throws IOException, SAXException {
 
     @Test
     public void verifyDefaultsXmlElementR_W_TypeHasValidValues() {
-        NodeList nodeList = XmlUtilities.getNodeList("//R_W_Type", Paths.get(path, "Metadata", "Defaults.xml"));
+        NodeList nodeList = XMLUtils.getNodeList("//R_W_Type", Paths.get(path, "Metadata", "Defaults.xml"));
 
         ArrayList<String> values = new ArrayList<>();
         List<String> VALID_VALUES = Arrays.asList("W", "R");
@@ -63,7 +63,7 @@ public void verifyDefaultsXmlNameIsUniqueForEachDataset() {
 
     @Test
     public void verifyDefaultsXmlElementTypeHasValidValue() {
-        NodeList nodeList = XmlUtilities.getNodeList("//Type", Paths.get(path, "Metadata", "Defaults.xml"));
+        NodeList nodeList = XMLUtils.getNodeList("//Type", Paths.get(path, "Metadata", "Defaults.xml"));
 
         ArrayList<String> values = new ArrayList<>();
         List<String> VALID_VALUES = Arrays.asList("string", "integer", "float");
@@ -81,7 +81,7 @@ public void verifyDefaultsXmlElementTypeHasValidValue() {
     }
 
     private HashSet<String> getDatasetValues() {
-        NodeList datasetNodes = XmlUtilities.getNodeList("//Dataset", Paths.get(path, "Metadata", "Defaults.xml"));
+        NodeList datasetNodes = XMLUtils.getNodeList("//Dataset", Paths.get(path, "Metadata", "Defaults.xml"));
 
         HashSet<String> datasetValues = new HashSet<>();
 
@@ -93,7 +93,7 @@ private HashSet<String> getDatasetValues() {
     }
 
     private ArrayList<String> collectNameNodesWithDatasetValue(String datasetValue) {
-        NodeList nameNodes = XmlUtilities.getNodeList("//Default_Value[Dataset/text() = \"" + datasetValue + "\"]/Name", Paths.get(path, "Metadata", "Defaults.xml"));
+        NodeList nameNodes = XMLUtils.getNodeList("//Default_Value[Dataset/text() = \"" + datasetValue + "\"]/Name", Paths.get(path, "Metadata", "Defaults.xml"));
 
         ArrayList<String> names = new ArrayList<>();
         for (int i = 0; i < nameNodes.getLength(); i++) {
diff --git a/src/main/java/org/opengis/cite/cdb10/CDBStructure/GeomaticsAttributesXmlStructureTests.java b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/GeomaticsAttributesXmlStructureTests.java
similarity index 89%
rename from src/main/java/org/opengis/cite/cdb10/CDBStructure/GeomaticsAttributesXmlStructureTests.java
rename to src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/GeomaticsAttributesXmlStructureTests.java
index 0ff5a88..040b502 100644
--- a/src/main/java/org/opengis/cite/cdb10/CDBStructure/GeomaticsAttributesXmlStructureTests.java
+++ b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/GeomaticsAttributesXmlStructureTests.java
@@ -1,7 +1,8 @@
-package org.opengis.cite.cdb10.CDBStructure;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.opengis.cite.cdb10.CommonFixture;
 import org.opengis.cite.cdb10.util.SchemaValidatorErrorHandler;
+import org.opengis.cite.cdb10.util.XMLUtils;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
@@ -30,7 +31,7 @@ public void verifyGeomaticsAttributesXmlAgainstSchema() throws IOException, SAXE
             File xmlFile = Paths.get(path, "Metadata", "Geomatics_Attributes.xml").toFile();
             File xsdFile = Paths.get(path, "Metadata", "Schema", "Geomatics_Attributes.xsd").toFile();
 
-            SchemaValidatorErrorHandler errorHandler = XmlUtilities.validateXmlFileIsValid(xmlFile, xsdFile);
+            SchemaValidatorErrorHandler errorHandler = XMLUtils.validateXmlFileIsValid(xmlFile, xsdFile);
 
             if (!errorHandler.noErrors()) {
                 Assert.fail(xmlFile.getName() + " does not contain valid XML. Errors: " + errorHandler.getMessages());
diff --git a/src/main/java/org/opengis/cite/cdb10/CDBStructure/LightsXmlStructureTests.java b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/LightsXmlStructureTests.java
similarity index 84%
rename from src/main/java/org/opengis/cite/cdb10/CDBStructure/LightsXmlStructureTests.java
rename to src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/LightsXmlStructureTests.java
index 108cd7c..4ab1694 100644
--- a/src/main/java/org/opengis/cite/cdb10/CDBStructure/LightsXmlStructureTests.java
+++ b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/LightsXmlStructureTests.java
@@ -1,7 +1,8 @@
-package org.opengis.cite.cdb10.CDBStructure;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.opengis.cite.cdb10.CommonFixture;
 import org.opengis.cite.cdb10.util.SchemaValidatorErrorHandler;
+import org.opengis.cite.cdb10.util.XMLUtils;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.w3c.dom.Node;
@@ -30,7 +31,7 @@ public void verifyLightsXmlFileAgainstSchema() throws IOException, SAXException
         File xmlFile = Paths.get(path, "Metadata", "Lights.xml").toFile();
         File xsdFile = Paths.get(path, "Metadata", "Schema", "Lights.xsd").toFile();
 
-        SchemaValidatorErrorHandler errorHandler = XmlUtilities.validateXmlFileIsValid(xmlFile, xsdFile);
+        SchemaValidatorErrorHandler errorHandler = XMLUtils.validateXmlFileIsValid(xmlFile, xsdFile);
 
         if (!errorHandler.noErrors()) {
             Assert.fail(xmlFile.getName() + " does not contain valid XML. Errors: " + errorHandler.getMessages());
@@ -39,7 +40,7 @@ public void verifyLightsXmlFileAgainstSchema() throws IOException, SAXException
 
     @Test
     public void verifyLightsXmlHasUniqueCodes() {
-        NodeList nodeList = XmlUtilities.getNodeList("//Light", Paths.get(path, "Metadata", "Lights.xml"));
+        NodeList nodeList = XMLUtils.getNodeList("//Light", Paths.get(path, "Metadata", "Lights.xml"));
 
         ArrayList<String> codes = new ArrayList<>();
 
@@ -56,7 +57,7 @@ public void verifyLightsXmlHasUniqueCodes() {
 
     @Test
     public void verifyLightsXmlCodesAreWithinRange() {
-        NodeList nodeList = XmlUtilities.getNodeList("//Light", Paths.get(path, "Metadata", "Lights.xml"));
+        NodeList nodeList = XMLUtils.getNodeList("//Light", Paths.get(path, "Metadata", "Lights.xml"));
 
         for (int i = 0; i < nodeList.getLength(); i++) {
             Node currentItem = nodeList.item(i);
diff --git a/src/main/java/org/opengis/cite/cdb10/CDBStructure/LightsXxxXmlStructureTests.java b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/LightsXxxXmlStructureTests.java
similarity index 92%
rename from src/main/java/org/opengis/cite/cdb10/CDBStructure/LightsXxxXmlStructureTests.java
rename to src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/LightsXxxXmlStructureTests.java
index 5433cc5..01b65de 100644
--- a/src/main/java/org/opengis/cite/cdb10/CDBStructure/LightsXxxXmlStructureTests.java
+++ b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/LightsXxxXmlStructureTests.java
@@ -1,7 +1,8 @@
-package org.opengis.cite.cdb10.CDBStructure;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.opengis.cite.cdb10.CommonFixture;
 import org.opengis.cite.cdb10.util.SchemaValidatorErrorHandler;
+import org.opengis.cite.cdb10.util.XMLUtils;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.w3c.dom.Node;
@@ -25,7 +26,7 @@ public class LightsXxxXmlStructureTests extends CommonFixture {
     @Test
     public void verifyLights_XxxXmlFileExists() {
         for (File xmlFile : getCustomLightsXmlFiles()) {
-            Assert.assertTrue(Files.exists(Paths.get(path, "Metadata", "Schema", xmlFile.getName())), "Optional file.");
+            Assert.assertTrue(Files.exists(Paths.get(path, "Metadata", xmlFile.getName())), "Optional file.");
         }
     }
 
@@ -59,7 +60,7 @@ public void verifyLightsXxxXmlAgainstSchema() throws IOException, SAXException {
         for (File xmlFile : getCustomLightsXmlFiles()) {
             File xsdFile = Paths.get(path, "Metadata", "Schema", "Lights_Tuning.xsd").toFile();
 
-            SchemaValidatorErrorHandler errorHandler = XmlUtilities.validateXmlFileIsValid(xmlFile, xsdFile);
+            SchemaValidatorErrorHandler errorHandler = XMLUtils.validateXmlFileIsValid(xmlFile, xsdFile);
 
             if (!errorHandler.noErrors()) {
                 Assert.fail(xmlFile.getName() + " does not contain valid XML. Errors: " + errorHandler.getMessages());
@@ -162,7 +163,7 @@ private boolean valueIsOutOfRange(Float value) {
     }
 
     private ArrayList<String> getDirectionalityValues(File xmlFile) {
-        NodeList nodeList = XmlUtilities.getNodeList("//Directionality", Paths.get(path, "Metadata", xmlFile.getName()));
+        NodeList nodeList = XMLUtils.getNodeList("//Directionality", Paths.get(path, "Metadata", xmlFile.getName()));
 
         ArrayList<String> directionalityValues = new ArrayList<>();
 
@@ -174,7 +175,7 @@ private ArrayList<String> getDirectionalityValues(File xmlFile) {
     }
 
     private ArrayList<String> getInvalidColorValues(File xmlFile) {
-        NodeList frequencyNodes = XmlUtilities.getNodeList("//Color", Paths.get(path, "Metadata", xmlFile.getName()));
+        NodeList frequencyNodes = XMLUtils.getNodeList("//Color", Paths.get(path, "Metadata", xmlFile.getName()));
 
         ArrayList<String> invalidColorValues = new ArrayList<>();
 
@@ -193,7 +194,7 @@ private ArrayList<String> getInvalidColorValues(File xmlFile) {
     }
 
     private ArrayList<String> getInvalidPercentageValues(File xmlFile, String nodeToSearchFor) {
-        NodeList nodes = XmlUtilities.getNodeList(nodeToSearchFor, Paths.get(path, "Metadata", xmlFile.getName()));
+        NodeList nodes = XMLUtils.getNodeList(nodeToSearchFor, Paths.get(path, "Metadata", xmlFile.getName()));
 
         ArrayList<String> invalidValues = new ArrayList<>();
 
@@ -209,7 +210,7 @@ private ArrayList<String> getInvalidPercentageValues(File xmlFile, String nodeTo
     }
 
     private ArrayList<String> getInvalidFrequencyValues(File xmlFile) {
-        NodeList frequencyNodes = XmlUtilities.getNodeList("//Frequency", Paths.get(path, "Metadata", xmlFile.getName()));
+        NodeList frequencyNodes = XMLUtils.getNodeList("//Frequency", Paths.get(path, "Metadata", xmlFile.getName()));
 
         ArrayList<String> invalidFrequencyValues = new ArrayList<>();
 
diff --git a/src/main/java/org/opengis/cite/cdb10/CDBStructure/MaterialsXmlStructureTests.java b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/MaterialsXmlStructureTests.java
similarity index 85%
rename from src/main/java/org/opengis/cite/cdb10/CDBStructure/MaterialsXmlStructureTests.java
rename to src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/MaterialsXmlStructureTests.java
index 1d836a8..beeb488 100644
--- a/src/main/java/org/opengis/cite/cdb10/CDBStructure/MaterialsXmlStructureTests.java
+++ b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/MaterialsXmlStructureTests.java
@@ -1,7 +1,8 @@
-package org.opengis.cite.cdb10.CDBStructure;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.opengis.cite.cdb10.CommonFixture;
 import org.opengis.cite.cdb10.util.SchemaValidatorErrorHandler;
+import org.opengis.cite.cdb10.util.XMLUtils;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.w3c.dom.Node;
@@ -14,7 +15,6 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashSet;
 
 /**
  * Created by martin on 2016-09-09.
@@ -32,7 +32,7 @@ public void verifyMaterialsXmlAgainstSchema() throws IOException, SAXException {
         File xmlFile = Paths.get(path, "Metadata", "Materials.xml").toFile();
         File xsdFile = Paths.get(path, "Metadata", "Schema", "Base_Material_Table.xsd").toFile();
 
-        SchemaValidatorErrorHandler errorHandler = XmlUtilities.validateXmlFileIsValid(xmlFile, xsdFile);
+        SchemaValidatorErrorHandler errorHandler = XMLUtils.validateXmlFileIsValid(xmlFile, xsdFile);
 
         if (!errorHandler.noErrors()) {
             Assert.fail(xmlFile.getName() + " does not contain valid XML. Errors: " + errorHandler.getMessages());
@@ -50,7 +50,7 @@ public void verifyMaterialsXmlElementNameIsUnique() {
 
     @Test
     public void verifyMaterialsXmlAllBaseMaterialElementsHaveAChildNodeName() {
-        NodeList baseMaterialNodes = XmlUtilities.getNodeList("//Base_Material[not(Name)]", Paths.get(path, "Metadata", "Materials.xml"));
+        NodeList baseMaterialNodes = XMLUtils.getNodeList("//Base_Material[not(Name)]", Paths.get(path, "Metadata", "Materials.xml"));
         Assert.assertEquals(baseMaterialNodes.getLength(), 0, "Materials.xml element Base_Material requires a child element Name.");
     }
 
@@ -73,7 +73,7 @@ public void verifyMaterialsXmlBaseMaterialNameIsValid() {
     }
 
     private ArrayList<String> getNameValues() {
-        NodeList nameNodes = XmlUtilities.getNodeList("//Base_Material/Name", Paths.get(path, "Metadata", "Materials.xml"));
+        NodeList nameNodes = XMLUtils.getNodeList("//Base_Material/Name", Paths.get(path, "Metadata", "Materials.xml"));
 
         ArrayList<String> nameValues = new ArrayList<>();
 
diff --git a/src/main/java/org/opengis/cite/cdb10/CDBStructure/MetadataStructureTests.java b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/MetadataStructureTests.java
similarity index 97%
rename from src/main/java/org/opengis/cite/cdb10/CDBStructure/MetadataStructureTests.java
rename to src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/MetadataStructureTests.java
index c8714d9..492c02d 100644
--- a/src/main/java/org/opengis/cite/cdb10/CDBStructure/MetadataStructureTests.java
+++ b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/MetadataStructureTests.java
@@ -1,4 +1,4 @@
-package org.opengis.cite.cdb10.CDBStructure;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.opengis.cite.cdb10.CommonFixture;
 import org.testng.Assert;
diff --git a/src/main/java/org/opengis/cite/cdb10/CDBStructure/ModelComponentsXmlStructureTests.java b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/ModelComponentsXmlStructureTests.java
similarity index 84%
rename from src/main/java/org/opengis/cite/cdb10/CDBStructure/ModelComponentsXmlStructureTests.java
rename to src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/ModelComponentsXmlStructureTests.java
index 5e9d9a9..68018c7 100644
--- a/src/main/java/org/opengis/cite/cdb10/CDBStructure/ModelComponentsXmlStructureTests.java
+++ b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/ModelComponentsXmlStructureTests.java
@@ -1,7 +1,8 @@
-package org.opengis.cite.cdb10.CDBStructure;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.opengis.cite.cdb10.CommonFixture;
 import org.opengis.cite.cdb10.util.SchemaValidatorErrorHandler;
+import org.opengis.cite.cdb10.util.XMLUtils;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
@@ -27,7 +28,7 @@ public void verifyModelComponentsXmlAgainstSchema() throws IOException, SAXExcep
         File xmlFile = Paths.get(path, "Metadata", "Model_Components.xml").toFile();
         File xsdFile = Paths.get(path, "Metadata", "Schema", "Model_Components.xsd").toFile();
 
-        SchemaValidatorErrorHandler errorHandler = XmlUtilities.validateXmlFileIsValid(xmlFile, xsdFile);
+        SchemaValidatorErrorHandler errorHandler = XMLUtils.validateXmlFileIsValid(xmlFile, xsdFile);
 
         if (!errorHandler.noErrors()) {
             Assert.fail(xmlFile.getName() + " does not contain valid XML. Errors: " + errorHandler.getMessages());
diff --git a/src/main/java/org/opengis/cite/cdb10/CDBStructure/VendorAttributesXmlStructureTests.java b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/VendorAttributesXmlStructureTests.java
similarity index 88%
rename from src/main/java/org/opengis/cite/cdb10/CDBStructure/VendorAttributesXmlStructureTests.java
rename to src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/VendorAttributesXmlStructureTests.java
index 0f74901..dbfc0f0 100644
--- a/src/main/java/org/opengis/cite/cdb10/CDBStructure/VendorAttributesXmlStructureTests.java
+++ b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/VendorAttributesXmlStructureTests.java
@@ -1,7 +1,8 @@
-package org.opengis.cite.cdb10.CDBStructure;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.opengis.cite.cdb10.CommonFixture;
 import org.opengis.cite.cdb10.util.SchemaValidatorErrorHandler;
+import org.opengis.cite.cdb10.util.XMLUtils;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
@@ -30,7 +31,7 @@ public void verifyVendorAttributesXmlAgainstSchema() throws IOException, SAXExce
             File xmlFile = Paths.get(path, "Metadata", "Vendor_Attributes.xml").toFile();
             File xsdFile = Paths.get(path, "Metadata", "Schema", "Vendor_Attributes.xsd").toFile();
 
-            SchemaValidatorErrorHandler errorHandler = XmlUtilities.validateXmlFileIsValid(xmlFile, xsdFile);
+            SchemaValidatorErrorHandler errorHandler = XMLUtils.validateXmlFileIsValid(xmlFile, xsdFile);
 
             if (!errorHandler.noErrors()) {
                 Assert.fail(xmlFile.getName() + " does not contain valid XML. Errors: " + errorHandler.getMessages());
diff --git a/src/main/java/org/opengis/cite/cdb10/CDBStructure/VersionXmlStructureTests.java b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/VersionXmlStructureTests.java
similarity index 83%
rename from src/main/java/org/opengis/cite/cdb10/CDBStructure/VersionXmlStructureTests.java
rename to src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/VersionXmlStructureTests.java
index e21bf66..ad13ab0 100644
--- a/src/main/java/org/opengis/cite/cdb10/CDBStructure/VersionXmlStructureTests.java
+++ b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/VersionXmlStructureTests.java
@@ -1,7 +1,8 @@
-package org.opengis.cite.cdb10.CDBStructure;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.opengis.cite.cdb10.CommonFixture;
 import org.opengis.cite.cdb10.util.SchemaValidatorErrorHandler;
+import org.opengis.cite.cdb10.util.XMLUtils;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.w3c.dom.Node;
@@ -32,7 +33,7 @@ public void verifyVersionXmlAgainstSchema() throws IOException, SAXException {
         File xmlFile = Paths.get(path, "Metadata", "Version.xml").toFile();
         File xsdFile = Paths.get(path, "Metadata", "Schema", "Version.xsd").toFile();
 
-        SchemaValidatorErrorHandler errorHandler = XmlUtilities.validateXmlFileIsValid(xmlFile, xsdFile);
+        SchemaValidatorErrorHandler errorHandler = XMLUtils.validateXmlFileIsValid(xmlFile, xsdFile);
 
         if (!errorHandler.noErrors()) {
             Assert.fail(xmlFile.getName() + " does not contain valid XML. Errors: " + errorHandler.getMessages());
@@ -41,7 +42,7 @@ public void verifyVersionXmlAgainstSchema() throws IOException, SAXException {
 
     @Test
     public void verifyVersionXmlHasSpecificationElement() {
-        NodeList nodeList = XmlUtilities.getNodeList("//Specification", Paths.get(path, "Metadata", "Version.xml"));
+        NodeList nodeList = XMLUtils.getNodeList("//Specification", Paths.get(path, "Metadata", "Version.xml"));
 
         if (nodeList.getLength() == 0) {
             Assert.fail("Version.xml Specification element is mandatory the element was not found.");
@@ -50,7 +51,7 @@ public void verifyVersionXmlHasSpecificationElement() {
 
     @Test
     public void verifyVersionXmlSpecificationVersionIsValid() {
-        NodeList nodeList = XmlUtilities.getNodeList("//Specification", Paths.get(path, "Metadata", "Version.xml"));
+        NodeList nodeList = XMLUtils.getNodeList("//Specification", Paths.get(path, "Metadata", "Version.xml"));
 
         ArrayList<String> values = new ArrayList<>();
         List<String> VALID_VALUES = Arrays.asList("3.0", "3.1", "3.2");
diff --git a/src/main/java/org/opengis/cite/cdb10/level2/package-info.java b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/package-info.java
similarity index 84%
rename from src/main/java/org/opengis/cite/cdb10/level2/package-info.java
rename to src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/package-info.java
index c4f4798..5a92eb4 100644
--- a/src/main/java/org/opengis/cite/cdb10/level2/package-info.java
+++ b/src/main/java/org/opengis/cite/cdb10/metadataAndVersioning/package-info.java
@@ -10,4 +10,4 @@
  * href="http://www.w3.org/TR/html5/infrastructure.html#conformance-classes">HTML5
  * - Conformance classes</a>
  */
-package org.opengis.cite.cdb10.level2;
+package org.opengis.cite.cdb10.metadataAndVersioning;
diff --git a/src/main/java/org/opengis/cite/cdb10/util/XMLUtils.java b/src/main/java/org/opengis/cite/cdb10/util/XMLUtils.java
index b6e4a69..a153c67 100644
--- a/src/main/java/org/opengis/cite/cdb10/util/XMLUtils.java
+++ b/src/main/java/org/opengis/cite/cdb10/util/XMLUtils.java
@@ -1,10 +1,7 @@
 package org.opengis.cite.cdb10.util;
 
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.Writer;
+import java.io.*;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -12,6 +9,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -25,10 +23,11 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
+import javax.xml.xpath.*;
 
 import net.sf.saxon.s9api.DOMDestination;
 import net.sf.saxon.s9api.DocumentBuilder;
@@ -49,6 +48,7 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
 
 /**
  * Provides various utility methods for accessing or manipulating XML
@@ -407,4 +407,48 @@ public static List<Node> asList(NodeList nodeList) {
         }
         return nodes;
     }
+
+    /**
+     * Returns a errors from schema validation.
+     *
+     * @param xmlFile
+     *              An xml file to be validated
+     * @param xsdFile
+     *              Schema file to validate against
+     *
+     * @return A error handler of errors after schema validation.
+     */
+    public static SchemaValidatorErrorHandler validateXmlFileIsValid(File xmlFile, File xsdFile) throws SAXException, IOException {
+        SchemaValidatorErrorHandler errorHandler = new SchemaValidatorErrorHandler();
+        SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+        Schema schema = schemaFactory.newSchema(xsdFile);
+
+        Validator validator = schema.newValidator();
+        validator.setErrorHandler(errorHandler);
+
+        validator.validate(new StreamSource(xmlFile));
+
+        return errorHandler;
+    }
+
+    /**
+     * Returns a list of nodes based on an xPath query
+     *
+     * @param xpathQuery
+     *              xPath search query
+     * @param xmlFile
+     *              xml file to be searched
+     *
+     * @return A list of nodes if found in the xml file.
+     * */
+    public static NodeList getNodeList(String xpathQuery, Path xmlFile) {
+        try {
+            Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(String.valueOf(xmlFile));
+            XPath xPath = XPathFactory.newInstance().newXPath();
+            XPathExpression exp = xPath.compile(xpathQuery);
+            return (NodeList) exp.evaluate(doc, XPathConstants.NODESET);
+        } catch (ParserConfigurationException | SAXException | IOException | XPathExpressionException ex) {
+            return null;
+        }
+    }
 }
diff --git a/src/main/resources/org/opengis/cite/cdb10/testng.xml b/src/main/resources/org/opengis/cite/cdb10/testng.xml
index c663bfb..dee71af 100644
--- a/src/main/resources/org/opengis/cite/cdb10/testng.xml
+++ b/src/main/resources/org/opengis/cite/cdb10/testng.xml
@@ -11,12 +11,12 @@
 
   <test name="CDB Structure">
     <packages>
-      <package name="org.opengis.cite.cdb10.CDBStructure" />
+      <package name="org.opengis.cite.cdb10.cdbStructure" />
     </packages>
   </test>
- <!-- <test name="Conformance Level 2">
+  <test name="Metadata And Versioning">
     <packages>
-      <package name="org.opengis.cite.cdb10.level2" />
+      <package name="org.opengis.cite.cdb10.metadataAndVersioning" />
     </packages>
-  </test> -->
+  </test>
 </suite>
diff --git a/src/test/java/org/opengis/cite/cdb10/level1/MetadataTestFixture.java b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/MetadataTestFixture.java
similarity index 89%
rename from src/test/java/org/opengis/cite/cdb10/level1/MetadataTestFixture.java
rename to src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/MetadataTestFixture.java
index 1b45267..047d3a4 100644
--- a/src/test/java/org/opengis/cite/cdb10/level1/MetadataTestFixture.java
+++ b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/MetadataTestFixture.java
@@ -1,8 +1,6 @@
-package org.opengis.cite.cdb10.level1;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.junit.Before;
-import org.junit.Rule;
-import org.junit.rules.ExpectedException;
 import org.opengis.cite.cdb10.CommonFixture;
 import org.opengis.cite.cdb10.TestFixture;
 
diff --git a/src/test/java/org/opengis/cite/cdb10/level1/VerifyCDBAttributesXmlStructureTests.java b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyCDBAttributesXmlStructureTests.java
similarity index 98%
rename from src/test/java/org/opengis/cite/cdb10/level1/VerifyCDBAttributesXmlStructureTests.java
rename to src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyCDBAttributesXmlStructureTests.java
index 4cfedaa..80f077a 100644
--- a/src/test/java/org/opengis/cite/cdb10/level1/VerifyCDBAttributesXmlStructureTests.java
+++ b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyCDBAttributesXmlStructureTests.java
@@ -1,7 +1,6 @@
-package org.opengis.cite.cdb10.level1;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.junit.Test;
-import org.opengis.cite.cdb10.CDBStructure.CDBAttributesXmlStructureTests;
 import org.xml.sax.SAXException;
 
 import java.io.IOException;
diff --git a/src/test/java/org/opengis/cite/cdb10/level1/VerifyConfigurationXmlStructureTests.java b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyConfigurationXmlStructureTests.java
similarity index 96%
rename from src/test/java/org/opengis/cite/cdb10/level1/VerifyConfigurationXmlStructureTests.java
rename to src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyConfigurationXmlStructureTests.java
index cefefc9..dfdd29b 100644
--- a/src/test/java/org/opengis/cite/cdb10/level1/VerifyConfigurationXmlStructureTests.java
+++ b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyConfigurationXmlStructureTests.java
@@ -1,7 +1,6 @@
-package org.opengis.cite.cdb10.level1;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.junit.Test;
-import org.opengis.cite.cdb10.CDBStructure.ConfigurationXmlStructureTests;
 import org.xml.sax.SAXException;
 
 import java.io.IOException;
diff --git a/src/test/java/org/opengis/cite/cdb10/level1/VerifyDefaultsXmlStructureTests.java b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyDefaultsXmlStructureTests.java
similarity index 98%
rename from src/test/java/org/opengis/cite/cdb10/level1/VerifyDefaultsXmlStructureTests.java
rename to src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyDefaultsXmlStructureTests.java
index db7ec1e..d01187d 100644
--- a/src/test/java/org/opengis/cite/cdb10/level1/VerifyDefaultsXmlStructureTests.java
+++ b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyDefaultsXmlStructureTests.java
@@ -1,7 +1,6 @@
-package org.opengis.cite.cdb10.level1;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.junit.Test;
-import org.opengis.cite.cdb10.CDBStructure.DefaultsXmlStructureTests;
 import org.xml.sax.SAXException;
 
 import java.io.IOException;
diff --git a/src/test/java/org/opengis/cite/cdb10/level1/VerifyGeomaticsAttributesXmlStructureTests.java b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyGeomaticsAttributesXmlStructureTests.java
similarity index 96%
rename from src/test/java/org/opengis/cite/cdb10/level1/VerifyGeomaticsAttributesXmlStructureTests.java
rename to src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyGeomaticsAttributesXmlStructureTests.java
index 6779178..5862fcf 100644
--- a/src/test/java/org/opengis/cite/cdb10/level1/VerifyGeomaticsAttributesXmlStructureTests.java
+++ b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyGeomaticsAttributesXmlStructureTests.java
@@ -1,7 +1,6 @@
-package org.opengis.cite.cdb10.level1;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.junit.Test;
-import org.opengis.cite.cdb10.CDBStructure.GeomaticsAttributesXmlStructureTests;
 import org.xml.sax.SAXException;
 
 import java.io.IOException;
diff --git a/src/test/java/org/opengis/cite/cdb10/level1/VerifyLightsXmlStructureTests.java b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyLightsXmlStructureTests.java
similarity index 97%
rename from src/test/java/org/opengis/cite/cdb10/level1/VerifyLightsXmlStructureTests.java
rename to src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyLightsXmlStructureTests.java
index 68f3d03..49d3aab 100644
--- a/src/test/java/org/opengis/cite/cdb10/level1/VerifyLightsXmlStructureTests.java
+++ b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyLightsXmlStructureTests.java
@@ -1,7 +1,6 @@
-package org.opengis.cite.cdb10.level1;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.junit.Test;
-import org.opengis.cite.cdb10.CDBStructure.LightsXmlStructureTests;
 import org.xml.sax.SAXException;
 
 import java.io.IOException;
diff --git a/src/test/java/org/opengis/cite/cdb10/level1/VerifyLightsXxxXmlStructureTests.java b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyLightsXxxXmlStructureTests.java
similarity index 99%
rename from src/test/java/org/opengis/cite/cdb10/level1/VerifyLightsXxxXmlStructureTests.java
rename to src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyLightsXxxXmlStructureTests.java
index 9f3a831..5766405 100644
--- a/src/test/java/org/opengis/cite/cdb10/level1/VerifyLightsXxxXmlStructureTests.java
+++ b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyLightsXxxXmlStructureTests.java
@@ -1,7 +1,6 @@
-package org.opengis.cite.cdb10.level1;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.junit.Test;
-import org.opengis.cite.cdb10.CDBStructure.LightsXxxXmlStructureTests;
 import org.xml.sax.SAXException;
 
 import java.io.IOException;
diff --git a/src/test/java/org/opengis/cite/cdb10/level1/VerifyMaterialsXmlStructureTests.java b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyMaterialsXmlStructureTests.java
similarity index 98%
rename from src/test/java/org/opengis/cite/cdb10/level1/VerifyMaterialsXmlStructureTests.java
rename to src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyMaterialsXmlStructureTests.java
index e550ff3..2de2ef0 100644
--- a/src/test/java/org/opengis/cite/cdb10/level1/VerifyMaterialsXmlStructureTests.java
+++ b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyMaterialsXmlStructureTests.java
@@ -1,7 +1,6 @@
-package org.opengis.cite.cdb10.level1;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.junit.Test;
-import org.opengis.cite.cdb10.CDBStructure.MaterialsXmlStructureTests;
 import org.xml.sax.SAXException;
 
 import java.io.IOException;
diff --git a/src/test/java/org/opengis/cite/cdb10/level1/VerifyMetadataStructureTests.java b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyMetadataStructureTests.java
similarity index 98%
rename from src/test/java/org/opengis/cite/cdb10/level1/VerifyMetadataStructureTests.java
rename to src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyMetadataStructureTests.java
index 02f74d5..e627e0a 100644
--- a/src/test/java/org/opengis/cite/cdb10/level1/VerifyMetadataStructureTests.java
+++ b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyMetadataStructureTests.java
@@ -1,7 +1,6 @@
-package org.opengis.cite.cdb10.level1;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.junit.Test;
-import org.opengis.cite.cdb10.CDBStructure.MetadataStructureTests;
 import org.opengis.cite.cdb10.TestFixture;
 
 import java.io.IOException;
diff --git a/src/test/java/org/opengis/cite/cdb10/level1/VerifyModelComponentsXmlStructureTests.java b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyModelComponentsXmlStructureTests.java
similarity index 95%
rename from src/test/java/org/opengis/cite/cdb10/level1/VerifyModelComponentsXmlStructureTests.java
rename to src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyModelComponentsXmlStructureTests.java
index ea1aa29..ffbd7ba 100644
--- a/src/test/java/org/opengis/cite/cdb10/level1/VerifyModelComponentsXmlStructureTests.java
+++ b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyModelComponentsXmlStructureTests.java
@@ -1,7 +1,6 @@
-package org.opengis.cite.cdb10.level1;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.junit.Test;
-import org.opengis.cite.cdb10.CDBStructure.ModelComponentsXmlStructureTests;
 import org.xml.sax.SAXException;
 
 import java.io.IOException;
diff --git a/src/test/java/org/opengis/cite/cdb10/level1/VerifyVendorAttributesXmlStructureTests.java b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyVendorAttributesXmlStructureTests.java
similarity index 96%
rename from src/test/java/org/opengis/cite/cdb10/level1/VerifyVendorAttributesXmlStructureTests.java
rename to src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyVendorAttributesXmlStructureTests.java
index 9f5d8fa..5594770 100644
--- a/src/test/java/org/opengis/cite/cdb10/level1/VerifyVendorAttributesXmlStructureTests.java
+++ b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyVendorAttributesXmlStructureTests.java
@@ -1,7 +1,6 @@
-package org.opengis.cite.cdb10.level1;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.junit.Test;
-import org.opengis.cite.cdb10.CDBStructure.VendorAttributesXmlStructureTests;
 import org.xml.sax.SAXException;
 
 import java.io.IOException;
diff --git a/src/test/java/org/opengis/cite/cdb10/level1/VerifyVersionXmlStructureTests.java b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyVersionXmlStructureTests.java
similarity index 97%
rename from src/test/java/org/opengis/cite/cdb10/level1/VerifyVersionXmlStructureTests.java
rename to src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyVersionXmlStructureTests.java
index f061dbb..7aa6601 100644
--- a/src/test/java/org/opengis/cite/cdb10/level1/VerifyVersionXmlStructureTests.java
+++ b/src/test/java/org/opengis/cite/cdb10/metadataAndVersioning/VerifyVersionXmlStructureTests.java
@@ -1,7 +1,6 @@
-package org.opengis.cite.cdb10.level1;
+package org.opengis.cite.cdb10.metadataAndVersioning;
 
 import org.junit.Test;
-import org.opengis.cite.cdb10.CDBStructure.VersionXmlStructureTests;
 import org.xml.sax.SAXException;
 
 import java.io.IOException;