diff --git a/pom.xml b/pom.xml
index a15e081a9..154cc0eae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -241,14 +241,7 @@
       <version>2.9.9</version>
     </dependency>
 
-    <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <version>2.10.0.pr1</version>
-    </dependency>
-
-    <!-- https://mvnrepository.com/artifact/org.apache.jena/jena-core -->
+     <!-- https://mvnrepository.com/artifact/org.apache.jena/jena-core -->
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-core</artifactId>
diff --git a/src/main/java/nl/imvertor/ChainRegression.java b/src/main/java/nl/imvertor/ChainRegression.java
index 1594bd53b..7518d67c9 100644
--- a/src/main/java/nl/imvertor/ChainRegression.java
+++ b/src/main/java/nl/imvertor/ChainRegression.java
@@ -64,11 +64,13 @@ public static void main(String[] args) {
 		
 		    configurator.save();
 		   
-		    configurator.getRunner().info(logger,"Processing " + configurator.getXParm("cli/tstfolder"));
+		    String owners = configurator.getXParm("cli/regowner");
+		    configurator.getRunner().info(logger,"Testing for owners: " +  (owners == null ? "(all available)" : owners));
+		    configurator.getRunner().setDebug();
 		    
 		    boolean succeeds = true;
-		    		    
-			// compile regression test xml
+		    		  
+		   // compile regression test xml
 		    succeeds = succeeds && (new RegressionExtractor()).run();
 		   
 			// analyze this run. 
diff --git a/src/main/java/nl/imvertor/ChainTranslateAndReport.java b/src/main/java/nl/imvertor/ChainTranslateAndReport.java
index c6cc76744..16a68d523 100644
--- a/src/main/java/nl/imvertor/ChainTranslateAndReport.java
+++ b/src/main/java/nl/imvertor/ChainTranslateAndReport.java
@@ -37,6 +37,7 @@
 import nl.imvertor.ModelHistoryAnalyzer.ModelHistoryAnalyzer;
 import nl.imvertor.OfficeCompiler.OfficeCompiler;
 import nl.imvertor.ReadmeCompiler.ReadmeCompiler;
+import nl.imvertor.RegressionExtractor.RegressionExtractor;
 import nl.imvertor.ReleaseComparer.ReleaseComparer;
 import nl.imvertor.ReleaseCompiler.ReleaseCompiler;
 import nl.imvertor.Reporter.Reporter;
@@ -228,7 +229,12 @@ public static void main(String[] args) {
 		
 				    if (configurator.isTrue("cli","createyaml",false)) 
 			    		succeeds = succeeds && (new YamlCompiler()).run();
-						
+
+				    // finally, a regression test if requested
+				    if (configurator.isTrue("cli","regression",false)) {
+				    	configurator.setXParm("cli/identifier","DEVELOPMENT");
+				    	succeeds = succeeds && (new RegressionExtractor()).run();
+				    }
 			    }
 			} catch (Exception e) {
 				configurator.getRunner().error(logger,"Step-level system error - Please notify your system administrator: " + e.getMessage(),e);
diff --git a/src/main/java/nl/imvertor/ConfigCompiler/ConfigCompiler.java b/src/main/java/nl/imvertor/ConfigCompiler/ConfigCompiler.java
index 134b8c185..b11a5a27b 100644
--- a/src/main/java/nl/imvertor/ConfigCompiler/ConfigCompiler.java
+++ b/src/main/java/nl/imvertor/ConfigCompiler/ConfigCompiler.java
@@ -25,6 +25,7 @@
 import nl.imvertor.common.Step;
 import nl.imvertor.common.Transformer;
 import nl.imvertor.common.file.AnyFolder;
+import nl.imvertor.common.file.ShaclFile;
 import nl.imvertor.common.file.XmlFile;
 
 /**
@@ -57,6 +58,13 @@ public boolean run() throws Exception{
 		
 		succeeds = succeeds ? transformer.transformStep("system/cur-imvertor-filepath", "properties/WORK_CONFIG_FILE", "properties/IMVERTOR_CONFIG_XSLPATH") : false ;
 		
+		// Save cfg file to etc folder
+		AnyFolder etcFolder = new AnyFolder(configurator.getXParm("system/work-etc-folder-path"));
+		XmlFile cfgFile = new XmlFile(configurator.getXParm("properties/WORK_CONFIG_FILE"));
+		XmlFile appCfgFile = new XmlFile(etcFolder,"config.xml");
+		cfgFile.copyFile(appCfgFile);
+					
+		// create the EA profile/toolbox when requested
 		Boolean p = configurator.isTrue(configurator.getXParm("cli/createeaprofile",false));
 		Boolean q = configurator.isTrue(configurator.getXParm("cli/createeatoolbox",false));
 		
diff --git a/src/main/java/nl/imvertor/OfficeCompiler/OfficeCompiler.java b/src/main/java/nl/imvertor/OfficeCompiler/OfficeCompiler.java
index 1568f2abd..d543dc58b 100644
--- a/src/main/java/nl/imvertor/OfficeCompiler/OfficeCompiler.java
+++ b/src/main/java/nl/imvertor/OfficeCompiler/OfficeCompiler.java
@@ -128,10 +128,13 @@ public void generateOfficeReport() throws Exception {
 						succeeds = succeeds ? transformer.transformStep("system/cur-imvertor-filepath","properties/WORK_RESPEC_FILE", "properties/IMVERTOR_METAMODEL_" + mm + "_MODELDOC_RESPEC_XSLPATH") : false;
 						if (succeeds) processDoc(fn,"respec.full.html","appinfo/full-respec-documentation-filename","properties/WORK_RESPEC_FILE","none");
 					}
-					// process catalog only
+					// process catalog only, save as HTML
 					transformer.setXslParm("catalog-only", "true");
 					succeeds = succeeds ? transformer.transformStep("system/cur-imvertor-filepath","properties/WORK_RESPEC_FILE", "properties/IMVERTOR_METAMODEL_" + mm + "_MODELDOC_RESPEC_XSLPATH") : false;
 					if (succeeds) processDoc(fn,"respec.html","appinfo/respec-documentation-filename","properties/WORK_RESPEC_FILE",configurator.getXParm("cli/passoffice",false));
+					// process catalog only, save as XHTML
+					succeeds = succeeds ? transformer.transformStep("system/cur-imvertor-filepath","properties/WORK_RESPEC_FILE", "properties/IMVERTOR_MODELDOC_RESPEC_XSLPATH") : false;
+					if (succeeds) processDoc(fn,"respec.catalog.xhtml","appinfo/respec-documentation-filename","properties/WORK_RESPEC_FILE","none");
 				}
 			} else {
 				runner.error(logger,"No (valid) office variant specified: " + vr.toString());
diff --git a/src/main/java/nl/imvertor/RegressionExtractor/RegressionExtractor.java b/src/main/java/nl/imvertor/RegressionExtractor/RegressionExtractor.java
index 19add67b2..48e1dff5e 100644
--- a/src/main/java/nl/imvertor/RegressionExtractor/RegressionExtractor.java
+++ b/src/main/java/nl/imvertor/RegressionExtractor/RegressionExtractor.java
@@ -21,17 +21,32 @@
 package nl.imvertor.RegressionExtractor;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.Vector;
 
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.jena.util.FileUtils;
 import org.apache.log4j.Logger;
 
+import nl.armatiek.saxon.extensions.http.SendRequest;
 import nl.imvertor.common.Configurator;
 import nl.imvertor.common.Step;
 import nl.imvertor.common.Transformer;
+import nl.imvertor.common.exceptions.ConfiguratorException;
 import nl.imvertor.common.file.AnyFile;
 import nl.imvertor.common.file.AnyFolder;
 import nl.imvertor.common.file.XmlFile;
 import nl.imvertor.common.file.XslFile;
 import nl.imvertor.common.xsl.extensions.ImvertorCompareXML;
+import nl.imvertor.common.xsl.extensions.ImvertorFileSpec;
+import nl.imvertor.common.xsl.extensions.ImvertorMergeParms;
+import nl.imvertor.common.xsl.extensions.ImvertorParameterFile;
+import nl.imvertor.common.xsl.extensions.ImvertorStripAccents;
+import nl.imvertor.common.xsl.extensions.ImvertorTrack;
 
 public class RegressionExtractor  extends Step {
 
@@ -40,6 +55,8 @@ public class RegressionExtractor  extends Step {
 	public static final String STEP_NAME = "RegressionExtractor";
 	public static final String VC_IDENTIFIER = "$Id: ReleaseCompiler.java 7473 2016-03-22 07:30:03Z arjan $";
 	
+	public static Transformer transformer;
+
 	/**
 	 *  run the step
 	 */
@@ -55,16 +72,119 @@ public boolean run() throws Exception{
 				"http://www.imvertor.org/imvertor/1.0/xslt/compare/compare-generated.xsl", 
 				url);
 		
-		//1 serialize the tst folder
-		AnyFolder reffolder = new AnyFolder(configurator.getXParm("cli/reffolder"));
-		AnyFolder tstfolder = new AnyFolder(configurator.getXParm("cli/tstfolder"));
-		AnyFolder outfolder = new AnyFolder(configurator.getXParm("cli/outfolder"));
-		String identifier = configurator.getXParm("cli/identifier");
+		transformer = new Transformer(); // Transformer created on basis of current Configurator
+		transformer.setExtensionFunction(new ImvertorCompareXML());
+		transformer.setExtensionFunction(new ImvertorStripAccents());
+		
+		AnyFolder workFolder = new AnyFolder(configurator.getServerProperty("work.dir"));
+		
+		String identifier = configurator.getXParm("cli/identifier",false);
+		String compareMethod = configurator.getXParm("cli/regressionmethod",false);
+		       compareMethod = compareMethod == null ? "raw" : compareMethod;
+				
+		if (identifier == null) {
+		    // Bulk test: in regression chain
+			
+			String r = Configurator.getInstance().getXParm("cli/regowner",false);
+			String[] regOwners = StringUtils.split(r.replace(" ", ""),';');
+			
+			AnyFolder regfolder = new AnyFolder(configurator.getXParm("cli/regfolder"));
+			configurator.getRunner().info(logger,"Regression testing bulk mode: " + configurator.getXParm("cli/regfolder"));
+		    Iterator<File> owners = Arrays.asList(regfolder.listFiles()).iterator();
+			while (owners.hasNext()) {
+				AnyFile owner = new AnyFile(owners.next());
+				String ownerName = owner.getParentFile().getName();
+				if (regOwners.length == 0 || ArrayUtils.contains(regOwners, ownerName)) {
+					Iterator<File> projects = Arrays.asList(owner.listFiles()).iterator();
+					while (projects.hasNext()) {
+						AnyFile project = new AnyFile(projects.next());
+						Iterator<File> models = Arrays.asList(project.listFiles()).iterator();
+						while (models.hasNext()) {
+							AnyFile model = new AnyFile(models.next());
+							Iterator<File> releases = Arrays.asList(model.listFiles()).iterator();
+							while (releases.hasNext()) {
+								AnyFile release = new AnyFile(releases.next());
+								String subpath = project.getName() + "_" + model.getName() + "_" + release.getName(); // used as identifier
+								
+								AnyFolder refFolder = new AnyFolder(release,"ref");
+								AnyFolder tstFolder = new AnyFolder(release,"tst");
+								AnyFolder outFolder = new AnyFolder(release,"out");
+								
+								// Maak de test folder leeg en maak een workfolder
+								tstFolder.deleteDirectory();
+								
+								AnyFolder wrkfolder = new AnyFolder(tstFolder,"work");
+								wrkfolder.mkdirs();
+								
+								// kopieer alle files uit de workfolder, als die er is, naar de tst folder
+								AnyFolder appFolder = new AnyFolder(workFolder,ownerName + "/app");
+								appFolder.copy(wrkfolder);
+								
+								Integer diffsfound = test(configurator,refFolder,tstFolder,outFolder,subpath,compareMethod);
+								if (diffsfound != 0) 
+									logger.warn("Regression: " + (compareMethod.equals("raw") ? "some" : diffsfound) + " differences in " + tstFolder);
+							}
+						}
+					}
+				} 
+			}
+		} else if (identifier.equals("DEVELOPMENT")) {
+			// Single test: in TranslateAndReport chain
+			configurator.getRunner().info(logger,"Regression testing this model");
+			String subpath = configurator.getXParm("cli/owner") + "/" + configurator.getXParm("appinfo/subpath");
+			AnyFolder regFolder = new AnyFolder(configurator.getXParm("cli/regfolder"));
+		    AnyFolder refFolder = new AnyFolder(regFolder,"ref/" + subpath);
+		    AnyFolder tstFolder = new AnyFolder(regFolder,"tst/" + subpath);
+			AnyFolder outFolder = new AnyFolder(regFolder,"out/" + subpath);
+			// Maak de test folder leeg en maak een workfolder
+			tstFolder.deleteDirectory(); 
+			tstFolder.mkdirs();
+			// copy the chain results to tst folder
+			String ownerName = configurator.getXParm("cli/owner");
+			AnyFolder appFolder = new AnyFolder(workFolder,ownerName + "/app");
+			appFolder.copy(tstFolder);
+			//  Run the test
+			Integer diffsfound = testFileByFile(configurator,refFolder,tstFolder,outFolder,identifier,compareMethod);
+			if (diffsfound != 0) 
+				logger.warn("Regression: " + (compareMethod.equals("raw") ? "some" : diffsfound) + " differences in " + tstFolder);
+		} else {
+			// Single test: in regression chain (identifier is usually the owner name)
+			configurator.getRunner().info(logger,"Regression testing single model: " + configurator.getXParm("cli/tstfolder"));
+		    AnyFolder refFolder = new AnyFolder(configurator.getXParm("cli/reffolder"));
+			AnyFolder tstFolder = new AnyFolder(configurator.getXParm("cli/tstfolder"));
+			AnyFolder outFolder = new AnyFolder(configurator.getXParm("cli/outfolder"));
+			Integer diffsfound = test(configurator,refFolder,tstFolder,outFolder,identifier,compareMethod);
+			if (diffsfound != 0) 
+				logger.warn("Regression: " + (compareMethod.equals("raw") ? "some" : diffsfound) + " differences in " + tstFolder);
+		}
+			    
+	    report();
+		    
+		return runner.succeeds();
+		
+	}
+	
+	/**
+	 * Test the differences between ref and tst folders.
+	 * Return the number of recorded differences.
+	 * 
+	 * @param configurator
+	 * @param reffolder
+	 * @param tstfolder
+	 * @param outfolder
+	 * @param identifier
+	 * @return
+	 * @throws Exception
+	 */
+	private Integer test(Configurator configurator, AnyFolder reffolder, AnyFolder tstfolder, AnyFolder outfolder, String identifier, String compareMethod) throws Exception {
+		
+		Integer diffsfound = 0;
 		
+		//1 serialize the tst folder
 		XslFile xslFilterFile = new XslFile(configurator.getXslPath(configurator.getXParm("properties/REGRESSION_EXTRACT_XSLPATH")));
 		
 		runner.debug(logger,"CHAIN","Serializing test folder: " + tstfolder);
-		tstfolder.serializeToXml(xslFilterFile,"test");
+		tstfolder.serializeToXml(transformer,xslFilterFile,"test",true);
 		
 		//2 serialize the ref folder
 		// determine the __content.xml locations in tst and ref
@@ -76,46 +196,149 @@ public boolean run() throws Exception{
 		// when developing, always replace.
 		if (!refContentXML.isFile() || configurator.getRunMode() == Configurator.RUN_MODE_DEVELOPMENT || configurator.isTrue("cli","rebuildref")) {
 			runner.debug(logger,"CHAIN","Serializing reference folder; " + reffolder);
-			reffolder.serializeToXml(xslFilterFile,"ctrl");
+			reffolder.serializeToXml(transformer,xslFilterFile,"ctrl",true);
 		}
 		
 		// now compare the two __content.xml files.
 		
-		XslFile tempXsl = new XslFile(configurator.getXParm("properties/COMPARE_GENERATED_XSLPATH")); // ...Imvertor-OS-work\default\compare\generated.xsl
-		XslFile compareXsl = new XslFile(configurator.getXParm("properties/COMPARE_GENERATOR_XSLPATH")); // ...RegressionExtractor\compare\xsl\compare.generator.xsl
-		XmlFile listingXml = new XmlFile(configurator.getXParm("properties/WORK_COMPARE_LISTING_FILE")); // ...Imvertor-OS-work\default\imvert\compare.2.listing.xml
-		
-		Boolean valid = true;
-		
-		Transformer transformer = new Transformer();
-		transformer.setExtensionFunction(new ImvertorCompareXML());
-		
-		transformer.setXslParm("ctrl-filepath", refContentXML.getCanonicalPath());
-		transformer.setXslParm("test-filepath", tstContentXML.getCanonicalPath());
-		transformer.setXslParm("diff-filepath", compareXML.getCanonicalPath());
-		transformer.setXslParm("max-difference-reported", configurator.getXParm("cli/maxreport"));
-		
-		//3 create includable stylesheet generated.xsl
-		valid = valid && transformer.transform(refContentXML, tempXsl, compareXsl,null);
-		
-		//4 create listing, while including the generated.xsl
-		XslFile listingXsl = new XslFile(configurator.getXParm("properties/IMVERTOR_COMPARE_LISTING_XSLPATH"));
-		valid = valid && transformer.transform(refContentXML,listingXml,listingXsl,null);
+		if (compareMethod == null || compareMethod.equals("xmlunit")) {
+			XslFile tempXsl = new XslFile(configurator.getXParm("properties/COMPARE_GENERATED_XSLPATH")); // ...Imvertor-OS-work\default\compare\generated.xsl
+			XslFile compareXsl = new XslFile(configurator.getXParm("properties/COMPARE_GENERATOR_XSLPATH")); // ...RegressionExtractor\compare\xsl\compare.generator.xsl
+			XmlFile listingXml = new XmlFile(configurator.getXParm("properties/WORK_COMPARE_LISTING_FILE")); // ...Imvertor-OS-work\default\imvert\compare.2.listing.xml
+			
+			Boolean valid = true;
+			
+			transformer.setXslParm("ctrl-filepath", refContentXML.getCanonicalPath());
+			transformer.setXslParm("test-filepath", tstContentXML.getCanonicalPath());
+			transformer.setXslParm("diff-filepath", compareXML.getCanonicalPath());
+			transformer.setXslParm("max-difference-reported", configurator.getXParm("cli/maxreport") == null ? "100" : configurator.getXParm("cli/maxreport"));
+			
+			//3 create includable stylesheet generated.xsl
+			valid = valid && transformer.transform(refContentXML, tempXsl, compareXsl,null);
+			
+			//4 create listing, while including the generated.xsl
+			XslFile listingXsl = new XslFile(configurator.getXParm("properties/IMVERTOR_COMPARE_LISTING_XSLPATH"));
+			valid = valid && transformer.transform(refContentXML,listingXml,listingXsl,null);
+			// copy the listing to the outfolder. 
+			AnyFile outfile = new AnyFile(outfolder,identifier + ".report.xml");
+			listingXml.copyFile(outfile);
+			
+			diffsfound = Integer.parseInt(configurator.getXParm("application/differencesfound"));
+		} else if (compareMethod.equals("raw")) {
+			// compare contents
+			diffsfound = refContentXML.compareContent(tstContentXML) ? 0 : 1;
+			
+		} else {
+			// TODO comparemode is definitediff, roep definitediff aan
+		}
+	
+		configurator.setStepDone(STEP_NAME);
+		 
+		// save any changes to the work configuration for report and future steps
+	    configurator.save();
+	    return diffsfound;
+	}
+	/**
+	 * Test the differences between ref and tst folders.
+	 * Return the number of recorded differences.
+	 * 
+	 * @param configurator
+	 * @param reffolder Folder holding the reference files
+	 * @param tstfolder Folder holding the test files, i.e. to be compared to the reference files.
+	 * @param outfolder Output of the comparison.
+	 * @param identifier The identifier can be any string. When "DEVELOPMENT" this indicated regression test in development mode, i.e. on a single run.
+	 * @return
+	 * @throws Exception
+	 */
+	private Integer testFileByFile(Configurator configurator, AnyFolder reffolder, AnyFolder tstfolder, AnyFolder outfolder, String identifier, String compareMethod) throws Exception {
 		
-		// copy the listing to the outfolder. 
-		// This is picked up by the xslweb regression framework
+		//1 serialize the tst folder
+		XslFile xslFilterFile = new XslFile(configurator.getXslPath(configurator.getXParm("properties/REGRESSION_EXTRACT_CANON_XSLPATH")));
+		xslFilterFile.setExtensionFunction(new ImvertorFileSpec());
+		xslFilterFile.setExtensionFunction(new ImvertorParameterFile());
+		xslFilterFile.setExtensionFunction(new ImvertorMergeParms());
+		xslFilterFile.setExtensionFunction(new ImvertorTrack());
+		xslFilterFile.setExtensionFunction(new ImvertorStripAccents());
+		xslFilterFile.setExtensionFunction(new SendRequest());
 		
-		AnyFile outfile = new AnyFile(outfolder,identifier + ".report.xml");
-		listingXml.copyFile(outfile);
+		// when developing, always replace the ref-canon.
+		if (configurator.getRunMode() == Configurator.RUN_MODE_DEVELOPMENT || configurator.isTrue("cli","rebuildref")) {
+			canonizeFolder(reffolder,xslFilterFile,false);
+		}
+		Integer diffsfound = canonizeFolder(tstfolder,xslFilterFile,true);
 		
 		configurator.setStepDone(STEP_NAME);
 		 
 		// save any changes to the work configuration for report and future steps
 	    configurator.save();
-	    
-	    report();
-		    
-		return runner.succeeds();
+	    return diffsfound;
+	}
+	
+	/**
+	 * Create a folder based on the folder passed which holds all files in canonized form.
+	 * 
+	 * @param folder Folder to canonize
+	 * @param xslFilterFile File that transforms the contents of the XML file such taht it is canonized: removing all non-essential info from the file.
+	 * @param compare True when comparison with corresponding tst folder is required.
+	 * @return
+	 * @throws Exception
+	 */
+	private Integer canonizeFolder(AnyFolder folder,XslFile xslFilterFile, boolean compare) throws Exception {
+		runner.debug(logger,"CHAIN","Serializing folder: " + folder);
+		Integer diffsfound = 0;
 		
+		String folderPath = folder.getCanonicalPath();
+		String canonFolderPath = folderPath + "-canon";
+		// remove the canonical folder when exists
+		(new AnyFolder(canonFolderPath)).deleteDirectory();
+		Vector<String> files = folder.listFilesToVector(true); // returns list of canonical paths
+		for (int i = 0; i < files.size(); i++) {
+			// "canonize" the file, replace existing file by the canonized form
+			String origPath = files.get(i);
+			String type = FileUtils.getFilenameExt(origPath).toLowerCase();
+			String relPath = StringUtils.substringAfter(origPath, folderPath);
+			String canonPath = folderPath + "-canon" + relPath;
+			AnyFile fileOrFolder = new AnyFile(origPath);
+			if (fileOrFolder.isFile()) {
+				if (type.equals("xml") || type.equals("xsd") || type.equals("xhtml")) { 
+					// Compare XML contents
+					xslFilterFile.setParm("file-path", relPath);
+					xslFilterFile.setParm("file-type", type);
+					xslFilterFile.transform(origPath, canonPath);
+					if (compare) diffsfound += compare(canonPath);
+				} else if (type.equals("xmi") || type.equals("png") || type.equals("html")) {
+					// skip these files
+				} else { 
+					// compare raw, unprocessed contents
+					fileOrFolder.copyFile(canonPath);
+					if (compare) diffsfound += compare(canonPath);
+				}
+			}
+ 		}
+		return diffsfound;
+	}
+
+	/**
+	 * Compare a reference file with the corresponding test file, both canonized. Pass the ref path, the tst path is calculated by replacing "ref-canon" by "tst-canon". When differences found, signal a warning.
+	 * 
+	 * @param canonPath The pas to the ref folder.
+	 * @return Integer 1 when differences found
+	 * @throws IOException
+	 * @throws ConfiguratorException
+	 */
+	private Integer compare(String canonPath) throws IOException, ConfiguratorException {
+		String refPath = StringUtils.replace(canonPath,"tst-canon","ref-canon");
+		AnyFile refFile = new AnyFile(refPath);
+		AnyFile tstFile = new AnyFile(canonPath);
+		if (tstFile.length() == 0) {
+			return 0; // this file has not be processed and therefore may be disregarded
+		} else if (!refFile.isFile()) {
+			runner.warn(logger, "Reference file not found: " + canonPath); 
+			return 1;
+		} else if (!refFile.compareContent(tstFile)) {
+			runner.warn(logger, "Difference(s) found in file: " + canonPath); 
+			return 1;
+		} else 
+			return 0;
 	}
 }
diff --git a/src/main/java/nl/imvertor/XsdCompiler/XsdCompiler.java b/src/main/java/nl/imvertor/XsdCompiler/XsdCompiler.java
index 48400395f..b3253f6b7 100644
--- a/src/main/java/nl/imvertor/XsdCompiler/XsdCompiler.java
+++ b/src/main/java/nl/imvertor/XsdCompiler/XsdCompiler.java
@@ -116,7 +116,15 @@ else if (owner.equals("Kadaster")) {
 				done = true;
 			}  
 		} else if (owner.equals("IHW")) {
-			if (xmlschemarules.equals("XML-IHWUGM")) {
+			if (xmlschemarules.equals("XML-ISO19136")) {
+				generateXsdISO19136();
+				supplyExternalSchemas();
+				done = true;
+			} else if (xmlschemarules.equals("XML-Kadaster")) {
+				generateXsdKadaster();
+				supplyExternalSchemas();
+				done = true;
+			} else if (xmlschemarules.equals("XML-IHWUGM")) {
 				generateUgmXsdKING();
 				done = true;
 			} else if (xmlschemarules.equals("XML-IHWBSM")) {
diff --git a/src/main/java/nl/imvertor/common/Configurator.java b/src/main/java/nl/imvertor/common/Configurator.java
index 4ffcee13c..caed79870 100644
--- a/src/main/java/nl/imvertor/common/Configurator.java
+++ b/src/main/java/nl/imvertor/common/Configurator.java
@@ -23,6 +23,7 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -1068,6 +1069,9 @@ private void loadFromStore(String processingmode) throws Exception {
 		
 		String owner = System.getProperty("owner.name");
 		File commonStoreFile = new File(inputFolder,"props/" + owner + ".xlsx");
+		if (!commonStoreFile.isFile()) {
+			throw new FileNotFoundException("Excel configuration file not found: \"" + commonStoreFile.getAbsolutePath() + "\"");
+		}
 		
 		// get the column names
 		String[] cols = StringUtils.split(processingmode,":");
diff --git a/src/main/java/nl/imvertor/common/Transformer.java b/src/main/java/nl/imvertor/common/Transformer.java
index 6b51acfa7..efb250119 100644
--- a/src/main/java/nl/imvertor/common/Transformer.java
+++ b/src/main/java/nl/imvertor/common/Transformer.java
@@ -21,7 +21,6 @@
 package nl.imvertor.common;
 
 import java.io.File;
-import java.io.PrintStream;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -73,6 +72,8 @@ public class Transformer {
 	
 	protected static boolean MAYPROFILE = false; // profiling required? then explicitly switch on in the chain!
 	
+	private HashMap<String,XsltExecutable> xslCache = new HashMap<String,XsltExecutable>(); // keep compiled XSL executables; key is the XSL path 
+	
 	private ErrorListener errorListener; // vooralsnog null. work in progress?
 	private Messenger messageEmitter;
 
@@ -209,9 +210,13 @@ public boolean transform(File infile, File outfile, File xslfile, String alias)
 		StreamSource source = new StreamSource(infile);
 		StreamSource xslt = new StreamSource(xslfile);
 
-		XsltExecutable exec = null;
+		// Create or fetch Xslt Executor from cache
+		XsltExecutable exec = xslCache.get(xslfile.getCanonicalPath());
 		try {
-			exec = compiler.compile(xslt);
+			if (exec == null) {
+				exec = compiler.compile(xslt);
+				xslCache.put(xslfile.getCanonicalPath(), exec);
+			}
 		} catch (Throwable t) {
 			Exception e = new Exception(t.getMessage() + t.getClass().getName() + ExceptionUtils.getFullStackTrace(t));
 			configurator.getRunner().fatal(logger,"Fout",e,"","");
@@ -250,11 +255,14 @@ public boolean transform(File infile, File outfile, File xslfile, String alias)
 		transformer.setSource(source);
 		transformer.setDestination(processor.newSerializer(outfile));
 
-		PrintStream stream = null;
-		
 		configurator.save(); // may throw exception when config file not avail
 		long starttime = System.currentTimeMillis();
-		transformer.transform();
+		
+		try {
+			transformer.transform();
+		} catch (Exception e) {
+			throw new Exception("Transformation causes a fatal error: " + e.getMessage());
+		}
 		
 		if (!outfile.isFile())
 			throw new Exception("Transformation did not produce the expected file result " + outfile.getCanonicalPath());
diff --git a/src/main/java/nl/imvertor/common/file/AnyFile.java b/src/main/java/nl/imvertor/common/file/AnyFile.java
index 35c92a7e8..f319b608b 100644
--- a/src/main/java/nl/imvertor/common/file/AnyFile.java
+++ b/src/main/java/nl/imvertor/common/file/AnyFile.java
@@ -25,8 +25,10 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.Reader;
 import java.io.Writer;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -43,6 +45,7 @@
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.FileWriterWithEncoding;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -484,6 +487,7 @@ public boolean isXml() throws Exception {
 		if (getExtension().equals("xsl")) return true;
 		if (getExtension().equals("xslt")) return true;
 		if (getExtension().equals("xmi")) return true;
+		if (getExtension().equals("xsd")) return true;
 		
 		byte[] head = getHeadBytes(5);
 		if ((new String(Arrays.copyOfRange(head,0,5), "UTF-8")).equals("<?xml")) return true;
@@ -629,6 +633,14 @@ public String getETag(Integer type) throws IOException {
 		
 		return String.valueOf(DigestUtils.md5(content));
 	}
+	
+	public Boolean compareContent(File testFile) throws IOException {
+	
+	    Reader reader1 = new BufferedReader(new FileReader(this));
+	    Reader reader2 = new BufferedReader(new FileReader(testFile));
+
+	    return IOUtils.contentEqualsIgnoreEOL(reader1, reader2);
+	}
 }
 
 
diff --git a/src/main/java/nl/imvertor/common/file/AnyFolder.java b/src/main/java/nl/imvertor/common/file/AnyFolder.java
index 264fa2086..b811627b4 100644
--- a/src/main/java/nl/imvertor/common/file/AnyFolder.java
+++ b/src/main/java/nl/imvertor/common/file/AnyFolder.java
@@ -23,6 +23,7 @@
 import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Vector;
 
 import org.apache.commons.io.FileUtils;
@@ -154,6 +155,8 @@ public void deleteDirectory() throws IOException {
 	 * @returns Number of files selected
 	 */
 	
+	// TODO deze code moet worden uitgefaseerd: beter is het meegeven van een transformer, en, nog beter, een gecompileerd stylesheet ipv. een stylesheet file.
+	// Zie hieronder: serializeToXml(Transformer transformer, XslFile filterXslFile, String roleInfo, boolean includeContents)
 	public int serializeToXml(XslFile filterXslFile, String roleInfo, boolean includeContents) throws Exception {
 		// create a content file. If local name, the relative, else assume absolute.
 		XmlFile content = (serializedFilePath == SERIALIZED_CONTENT_XML_FILENAME) ? new XmlFile(this,serializedFilePath) : new XmlFile(serializedFilePath);
@@ -176,14 +179,16 @@ public int serializeToXml(XslFile filterXslFile, String roleInfo, boolean includ
     			XmlFile wrapperInputFile = new XmlFile(File.createTempFile("serializeToXml_", "_input.xml"));
 				wrapperInputFile.deleteOnExit();
 
-    			String type;
+				String type;
     			String contentString;
     			
     			if (f.isXml()) {
     				type = "xml";
     				if (includeContents) {
 	    				XmlFile fx = new XmlFile(f);
-	        			if (fx.isWellFormed()) 
+	    				if (f.getName().endsWith(".ea-profile.xml") || f.getName().endsWith(".ea-toolbox.xml"))
+	    	    			fx.setEncoding(StandardCharsets.UTF_16.displayName());
+	    	    		if (fx.isWellFormed()) 
 	         	    		contentString = cleanXmlPI(fx.getContent());
 	        			else
 	        				contentString = "<!--not wellformed-->";
@@ -203,19 +208,18 @@ public int serializeToXml(XslFile filterXslFile, String roleInfo, boolean includ
      				
     			wrapperInputFile.setContent(startWrapperString + contentString + endWrapperString);
     				
-				if (type.equals("xml"))
-	    			if (filterXslFile != null)
-	 					if (filterXslFile.isFile()) {
-	 						XmlFile wrapperOutputFile = new XmlFile(File.createTempFile("serializeToXml_", "_output.xml"));
-	 						wrapperOutputFile.deleteOnExit();
-	 	    				// do a filter transformation
-	 	    				filterXslFile.transform(wrapperInputFile,wrapperOutputFile);
-	     					// place that result in the content XML.
-	     					wrapperInputFile = wrapperOutputFile;
-	     					selected += 1;
-	     				}
-	 					else
-	 						throw new IOException("No such XSL file: " + filterXslFile.getCanonicalPath());
+				if (filterXslFile != null)
+ 					if (filterXslFile.isFile()) {
+ 						XmlFile wrapperOutputFile = new XmlFile(File.createTempFile("serializeToXml_", "_output.xml"));
+ 						wrapperOutputFile.deleteOnExit();
+ 	    				// do a filter transformation
+ 	    				filterXslFile.transform(wrapperInputFile,wrapperOutputFile);
+     					// place that result in the content XML.
+     					wrapperInputFile = wrapperOutputFile;
+     					selected += 1;
+     				}
+ 					else
+ 						throw new IOException("No such XSL file: " + filterXslFile.getCanonicalPath());
  			
  				contentWriter.append(wrapperInputFile.getContent());
 			}
@@ -226,6 +230,99 @@ public int serializeToXml(XslFile filterXslFile, String roleInfo, boolean includ
     	return selected;
 	}
 	
+	/**
+	 * Serialize the entire folder to a content xml file.
+	 * For each XML file found, transform the file using the XSL provided.
+	 * This XSL must therefore cater for various XML files expected in the folder. 
+	 * The result of the transformation is insert in the content XML file.
+	 * The XSL file is provided with the local file URL for the file at hand. 
+	 * This takes the form of a &lt;file path="c:\myfile.xml"/&gt; context document (a single element). 
+	 * As such, any huge or unimportant XML files may be dismissed immediately without having to read and process it.
+	 * The result of the transformation however is inserted in the __content.xml file as returned by the XSLT.
+	 * 
+	 * @param filterXslFile Pass XSL file to filter search file found, operating on the cw:file root element.
+	 * @param roleInfo Pass roleInfo when the result should be typed for further processing. This role info will appear on the @role attribute of the cw:files root element. 
+	 * @param includeContents Include the contents of the XML (possibly after transform)?
+	 * @throws Exception
+	 * @returns Number of files selected
+	 */
+	
+	public int serializeToXml(Transformer transformer, XslFile filterXslFile, String roleInfo, boolean includeContents) throws Exception {
+		// create a content file. If local name, the relative, else assume absolute.
+		XmlFile content = (serializedFilePath == SERIALIZED_CONTENT_XML_FILENAME) ? new XmlFile(this,serializedFilePath) : new XmlFile(serializedFilePath);
+    	// If from a previous run, remove
+    	if (content.isFile()) content.delete();
+    	// Build a writer
+    	FileWriterWithEncoding contentWriter = content.getWriter(false);
+    	contentWriter.append(
+    			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+    			+ "<cw:files xmlns:cw=\"" + FOLDER_CONTENT_WRAPPER_NAMESPACE + "\">");
+    	// now go through all files in the folder. Based in the XML or binary type of the file, add to XML stream.
+    	Vector<String> files = this.listFilesToVector(true);
+    	int selected = 0;
+    	for (int i = 0; i < files.size(); i++) {
+    		AnyFile f = new AnyFile(files.get(i));
+    		String relpath = f.getRelativePath(this);  // i.e. skip the "work1/" part
+    		
+    		if (f.isFile() && !f.getName().equals(serializedFilePath)) {
+    			
+    			XmlFile wrapperInputFile = new XmlFile(File.createTempFile("serializeToXml_", "_input.xml"));
+				wrapperInputFile.deleteOnExit();
+
+				String type;
+    			String contentString;
+    			
+    			if (f.isXml()) {
+    				type = "xml";
+    				if (includeContents) {
+	    				XmlFile fx = new XmlFile(f);
+	    	   			fx.setEncoding(f.guessEncoding());  // UTF-16BE etc wordt later teruggezet als UTF-8 bij serialisatie
+    		    	 	if (fx.isWellFormed()) 
+	         	    		contentString = cleanXmlPI(fx.getContent());
+	        			else
+	        				contentString = "<!--not wellformed-->";
+    				} else
+    					contentString = "<!--see xml-->";
+	      		} else {
+					type = "bin";
+					contentString = "<!--see binary-->";
+				}
+				
+				String startWrapperString = 
+						"<cw:file"
+						+ " xmlns:cw=\"" + FOLDER_CONTENT_WRAPPER_NAMESPACE + "\""
+						+ " type=\"" + type + "\" path=\"" + XmlFile.xmlescape(relpath) + "\"" + getSpecs(f) + ">";
+				String endWrapperString = 
+						"</cw:file>";
+     				
+    			wrapperInputFile.setContent(startWrapperString + contentString + endWrapperString);
+    				
+				if (filterXslFile != null)
+ 					if (filterXslFile.isFile()) {
+ 						XmlFile wrapperOutputFile = new XmlFile(File.createTempFile("serializeToXml_", "_output.xml"));
+ 						wrapperOutputFile.deleteOnExit();
+ 	    				// do a filter transformation
+ 	    				transformer.transform(wrapperInputFile,wrapperOutputFile,filterXslFile,"filtered");
+     					// place that result in the content XML.
+     					wrapperInputFile = wrapperOutputFile;
+     					selected += 1;
+     				}
+ 					else
+ 						throw new IOException("No such XSL file: " + filterXslFile.getCanonicalPath());
+ 			
+ 				contentWriter.append(wrapperInputFile.getContent());
+			}
+			
+    	}
+    	contentWriter.append("</cw:files>");
+    	contentWriter.close();
+    	
+    	// nu beide files indenteren en canoniseren, zodat je het goed kunt vergelijken
+    	content.prettyPrintXml(true);
+    	
+    	return selected;
+	}
+	
 	public int serializeToXml(XslFile filterXslFile, String roleInfo) throws Exception {
 		return serializeToXml(filterXslFile,roleInfo,true);
 	}
@@ -248,7 +345,7 @@ private String getSpecs(AnyFile file) throws IOException {
 			+ " ishidden = \"" + file.isHidden() + "\""
 			+ " isreadonly = \"" + file.canRead() + "\""
 			+ " ext = \"" + XmlFile.xmlescape(file.getExtensionCS()) + "\""
-			+ " fullpath = \"" + XmlFile.xmlescape(file.getCanonicalPath()) + "\"";
+			;
 	}
 	
 	private String cleanXmlPI(String xmlString) {
diff --git a/src/main/java/nl/imvertor/common/file/EapFile.java b/src/main/java/nl/imvertor/common/file/EapFile.java
index 686092a42..2dff5645e 100644
--- a/src/main/java/nl/imvertor/common/file/EapFile.java
+++ b/src/main/java/nl/imvertor/common/file/EapFile.java
@@ -399,7 +399,14 @@ public String getRootPackageGUID() throws Exception {
 	 * @throws Exception
 	 */
 	public String getModelPackageGUID(String projectName, String modelName) throws Exception {
-		Package p = getPackageByName(repo.GetModels().GetAt((short) 0), projectName);
+		Package p = null;
+		for (int i = 0; i < repo.GetModels().GetCount(); i++) {
+			Package r = repo.GetModels().GetAt((short) i);
+			if (p == null) 
+				p = getPackageByName(r, projectName);
+			else
+				throw new Exception("Multiple projects with name \"" + projectName + "\" found");
+			}
 		if (p == null) return "";
 		Package m = getPackageByName(p, modelName);
 		return (m != null) ? m.GetPackageGUID() : ""; 
diff --git a/src/main/java/nl/imvertor/common/file/JsonFile.java b/src/main/java/nl/imvertor/common/file/JsonFile.java
index da0456fce..ede2ca6e0 100644
--- a/src/main/java/nl/imvertor/common/file/JsonFile.java
+++ b/src/main/java/nl/imvertor/common/file/JsonFile.java
@@ -170,8 +170,8 @@ public boolean toYaml(YamlFile resultYamlFile) throws Exception {
 	        // save it as YAML
 	        YAMLMapper m = new YAMLMapper();
 	        m.disable(Feature.WRITE_DOC_START_MARKER);
-	        m.disable(Feature.ALWAYS_QUOTE_NUMBERS_AS_STRINGS);
-	        m.enable(Feature.MINIMIZE_QUOTES);
+	        m.enable(Feature.ALWAYS_QUOTE_NUMBERS_AS_STRINGS); // #issues/244
+	        m.disable(Feature.MINIMIZE_QUOTES); // #244
 	        String jsonAsYaml = m.writeValueAsString(jsonNodeTree);
 	        resultYamlFile.setContent(jsonAsYaml);
         } catch (Exception e) {
diff --git a/src/main/java/nl/imvertor/common/file/XslFile.java b/src/main/java/nl/imvertor/common/file/XslFile.java
index c08f511bb..861ba6f4a 100644
--- a/src/main/java/nl/imvertor/common/file/XslFile.java
+++ b/src/main/java/nl/imvertor/common/file/XslFile.java
@@ -180,8 +180,11 @@ public void transform(XmlFile infile, File outfile, HashMap<String, String> parm
 		}
 		transformer.setSource(source);
 		transformer.setDestination(processor.newSerializer(outfile));
-		
-		transformer.transform();
+		try {
+			transformer.transform();
+		} catch (Exception e) {
+			logger.error("Cannot transform " + infile.getCanonicalPath() + " using " + this.getName() + ": " + e.getMessage());
+		}
 	}
     
     /**
@@ -206,4 +209,15 @@ public void transform(XmlFile infile, File outfile) throws Exception {
      	transform(infile, outfile, null, null);
      }	
 	
+     /**
+      * Set XSLT Parameter
+      * 
+      * The parameter is added to the set of previously defined parameter on this XSLfile, and may overwrite existing parameters.
+      * 
+      * @param name The name
+      * @param value The value, may overwrite existing value.
+      */
+     public void setParm(String name, String value) {
+    	 this.parms.put(name, value);
+     }
 }
diff --git a/src/main/resources/cfg/OfficeCompiler/parms.xml b/src/main/resources/cfg/OfficeCompiler/parms.xml
index b14b26371..951486541 100644
--- a/src/main/resources/cfg/OfficeCompiler/parms.xml
+++ b/src/main/resources/cfg/OfficeCompiler/parms.xml
@@ -146,6 +146,8 @@
       <WORK_MSWORD_FILE>${system/work-imvert-folder-path}/imvertor.25.4.msword.html</WORK_MSWORD_FILE>
       <WORK_RESPEC_FILE>${system/work-imvert-folder-path}/imvertor.25.4.respec.html</WORK_RESPEC_FILE>
       
+      <IMVERTOR_MODELDOC_RESPEC_XSLPATH alias="ITO">Imvert2modeldoc-xhtml-respec.xsl</IMVERTOR_MODELDOC_RESPEC_XSLPATH>
+    
       <!-- KING -->
       <IMVERTOR_METAMODEL_KINGSIM_MODELDOC_XSLPATH alias="ITO">Imvert2modeldoc-KINGSIM.xsl</IMVERTOR_METAMODEL_KINGSIM_MODELDOC_XSLPATH>
       <IMVERTOR_METAMODEL_KINGSIM_MODELDOC_MSWORD_XSLPATH alias="ITO">Imvert2modeldoc-KINGSIM-html-msword.xsl</IMVERTOR_METAMODEL_KINGSIM_MODELDOC_MSWORD_XSLPATH>
@@ -201,8 +203,8 @@
       <IMVERTOR_METAMODEL_WaarderingskamerBSM_MODELDOC_RESPEC_XSLPATH alias="ITO">Imvert2modeldoc-Waarderingskamer-SIM-html-respec.xsl</IMVERTOR_METAMODEL_WaarderingskamerBSM_MODELDOC_RESPEC_XSLPATH>
       
       <!-- BIJ12 -->
-      <IMVERTOR_METAMODEL_BIJ12SIM_MODELDOC_XSLPATH alias="ITO">Imvert2modeldoc-Waarderingskamer-SIM.xsl</IMVERTOR_METAMODEL_BIJ12SIM_MODELDOC_XSLPATH>
-      <IMVERTOR_METAMODEL_BIJ12SIM_MODELDOC_RESPEC_XSLPATH alias="ITO">Imvert2modeldoc-Waarderingskamer-SIM-html-respec.xsl</IMVERTOR_METAMODEL_BIJ12SIM_MODELDOC_RESPEC_XSLPATH>
+      <IMVERTOR_METAMODEL_BIJ12CM_MODELDOC_XSLPATH alias="ITO">Imvert2modeldoc-Waarderingskamer-SIM.xsl</IMVERTOR_METAMODEL_BIJ12CM_MODELDOC_XSLPATH>
+      <IMVERTOR_METAMODEL_BIJ12CM_MODELDOC_RESPEC_XSLPATH alias="ITO">Imvert2modeldoc-Waarderingskamer-SIM-html-respec.xsl</IMVERTOR_METAMODEL_BIJ12CM_MODELDOC_RESPEC_XSLPATH>
       
       <!-- KENNISNET -->
       <IMVERTOR_METAMODEL_KennisnetSIM_MODELDOC_XSLPATH alias="ITO">Imvert2modeldoc-Kennisnet-SIM.xsl</IMVERTOR_METAMODEL_KennisnetSIM_MODELDOC_XSLPATH>
diff --git a/src/main/resources/cfg/RegressionExtractor/parms.xml b/src/main/resources/cfg/RegressionExtractor/parms.xml
index f024da1ae..230dcdc1a 100644
--- a/src/main/resources/cfg/RegressionExtractor/parms.xml
+++ b/src/main/resources/cfg/RegressionExtractor/parms.xml
@@ -32,29 +32,59 @@
       </cli-parm> 
       
       <!-- specifiek voor deze chain -->
+      
+      <!-- deze parameter hebben betrekking op de bulk regression test -->
+      <cli-parm>
+         <name>regfolder</name>
+         <arg>path</arg>
+         <tip>Full path to the root folder that holds the regression folders of bulk regression</tip>
+         <required>false</required>
+      </cli-parm> 
+      <cli-parm>
+         <name>regowner</name>
+         <arg>names</arg>
+         <tip>Names of the owners for which to perform the regression test. Separate by semicolon.</tip>
+         <required>false</required>
+      </cli-parm> 
+      
+      <!-- deze parameter hebben betrekking op regression test uitgevoerd op één specifiek model -->
       <cli-parm>
          <name>reffolder</name>
          <arg>path</arg>
          <tip>Full path to the folder that holds the reference Imvertor files</tip>
-         <required>true</required>
+         <required>false</required>
       </cli-parm> 
       <cli-parm>
          <name>tstfolder</name>
          <arg>path</arg>
          <tip>Full path to the folder that holds the Imvertor files to be tested</tip>
-         <required>true</required>
+         <required>false</required>
       </cli-parm> 
       <cli-parm>
          <name>outfolder</name>
          <arg>path</arg>
          <tip>Full path to the folder that will hold the report XML as generated by the regression test</tip>
-         <required>true</required>
+         <required>false</required>
       </cli-parm> 
+      
+      <!-- dit zijn gemeenschappelijke parameters -->
+      <cli-parm>
+         <name>regression</name>
+         <arg>yes|no</arg>
+         <tip>Should a regression test be performed on the results of this run?</tip>
+         <required>false</required>
+      </cli-parm>
+      <cli-parm>
+         <name>regressionmethod</name>
+         <arg>name</arg>
+         <tip>Specify a name of a known compare method. Currently known methods are: "xmlunit" and "raw".</tip>
+         <required>false</required>
+      </cli-parm>
       <cli-parm>
          <name>identifier</name>
          <arg>String</arg>
          <tip>A unique identifier for this application. The report is stored in the outfolder by this name. Typical use: the RUN ID.</tip>
-         <required>true</required>
+         <required>false</required>
       </cli-parm> 
       <cli-parm>
          <name>maxreport</name>
@@ -128,6 +158,7 @@
          <cw:file type="xml" path="work\rep\XmiCompiler-report.xml" name="" ext="" date="" size="" attrib="">
       -->
       <REGRESSION_EXTRACT_XSLPATH>RegressionExtractor-extract.xsl</REGRESSION_EXTRACT_XSLPATH>
+      <REGRESSION_EXTRACT_CANON_XSLPATH>RegressionExtractor-extract-canon.xsl</REGRESSION_EXTRACT_CANON_XSLPATH>
       
       
       
diff --git a/src/main/resources/cfg/Validator/parms.xml b/src/main/resources/cfg/Validator/parms.xml
index 7bfd244c5..9318c7d33 100644
--- a/src/main/resources/cfg/Validator/parms.xml
+++ b/src/main/resources/cfg/Validator/parms.xml
@@ -282,12 +282,12 @@
       <!-- BIJ12 -->
       
       <!--canonize-->
-      <IMVERTOR_METAMODEL_BIJ12SIM_CANONICAL_XSLPATH>Imvert2canonical.xsl</IMVERTOR_METAMODEL_BIJ12SIM_CANONICAL_XSLPATH>
-      <IMVERTOR_METAMODEL_BIJ12SIM_CANONICAL_XSLPATH_2>Imvert2canonical-MIM11.xsl</IMVERTOR_METAMODEL_BIJ12SIM_CANONICAL_XSLPATH_2>
-      <IMVERTOR_METAMODEL_BIJ12SIM_CANONICAL_XSLPATH_3>Imvert2canonical-KING.xsl</IMVERTOR_METAMODEL_BIJ12SIM_CANONICAL_XSLPATH_3>
-      <IMVERTOR_METAMODEL_BIJ12SIM_CANONICAL_XSLPATH_4>Imvert2canonical-KINGSIM.xsl</IMVERTOR_METAMODEL_BIJ12SIM_CANONICAL_XSLPATH_4>
+      <IMVERTOR_METAMODEL_BIJ12CM_CANONICAL_XSLPATH>Imvert2canonical.xsl</IMVERTOR_METAMODEL_BIJ12CM_CANONICAL_XSLPATH>
+      <IMVERTOR_METAMODEL_BIJ12CM_CANONICAL_XSLPATH_2>Imvert2canonical-MIM11.xsl</IMVERTOR_METAMODEL_BIJ12CM_CANONICAL_XSLPATH_2>
+      <IMVERTOR_METAMODEL_BIJ12CM_CANONICAL_XSLPATH_3>Imvert2canonical-KING.xsl</IMVERTOR_METAMODEL_BIJ12CM_CANONICAL_XSLPATH_3>
+      <IMVERTOR_METAMODEL_BIJ12CM_CANONICAL_XSLPATH_4>Imvert2canonical-KINGSIM.xsl</IMVERTOR_METAMODEL_BIJ12CM_CANONICAL_XSLPATH_4>
       <!--validate-->
-      <IMVERTOR_METAMODEL_BIJ12SIM_VALIDATE_XSLPATH>Imvert2validation-KINGSIM.xsl</IMVERTOR_METAMODEL_BIJ12SIM_VALIDATE_XSLPATH>
+      <IMVERTOR_METAMODEL_BIJ12CM_VALIDATE_XSLPATH>Imvert2validation-KINGSIM.xsl</IMVERTOR_METAMODEL_BIJ12CM_VALIDATE_XSLPATH>
       
       <!-- Kennisnet -->
       
diff --git a/src/main/resources/cfg/XsdCompiler/parms.xml b/src/main/resources/cfg/XsdCompiler/parms.xml
index 0b07d941c..e95a7be50 100644
--- a/src/main/resources/cfg/XsdCompiler/parms.xml
+++ b/src/main/resources/cfg/XsdCompiler/parms.xml
@@ -163,6 +163,13 @@
          <tip>Version of the GML profile XSD file. You may use [...] parameters. Defaults to "1.0.0-3.2.2".</tip>
          <required>false</required>
       </cli-parm>  
+      <cli-parm>
+         <name>assocbyreference</name>
+         <arg>yes|no</arg>
+         <tip>Associations to an objecttype/featuretype must be realized "by reference" in ISO 19136 XML instances</tip>
+         <required>false</required>
+         <context>XSD compiler for ISO 19136 schemas</context>
+      </cli-parm>  
    </cli-parms>
   
    <properties>
diff --git a/src/main/resources/etc/xsd/ConceptualSchema/root/model/v20181210/ConceptualSchemas_Model_v1_0.xsd b/src/main/resources/etc/xsd/ConceptualSchema/root/model/v20181210/ConceptualSchemas_Model_v1_0.xsd
index ee5c3b3db..42b37d090 100644
--- a/src/main/resources/etc/xsd/ConceptualSchema/root/model/v20181210/ConceptualSchemas_Model_v1_0.xsd
+++ b/src/main/resources/etc/xsd/ConceptualSchema/root/model/v20181210/ConceptualSchemas_Model_v1_0.xsd
@@ -23,7 +23,9 @@
          Adaptations of the generated version:
          - 2020-10-22 Added references to the xml:base attribute. Needed to allow xi:inclusions to appear on instances (producing xml:base attributes).
          - ? manually added unique key constraint on element ConceptualSchemasComponents
-         - 2021-03-04 New construct aosTypes added. 
+         - 2021-03-04 New construct aosTypes added.
+         - 2022-01-26 added version, phase
+         - 2022-01-26 added definition, source and data-location
          
       </xs:documentation>
       
@@ -145,6 +147,26 @@
                </xs:restriction>
             </xs:simpleType>
          </xs:element>
+         <xs:element name="version" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:documentation source="http://www.imvertor.org/schema-info/technical-documentation">The version of the schema.</xs:documentation>
+            </xs:annotation>
+            <xs:simpleType>
+               <xs:restriction base="xs:string">
+                  <xs:pattern value="\S.*"/>
+               </xs:restriction>
+            </xs:simpleType>
+         </xs:element>
+         <xs:element name="phase" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:documentation source="http://www.imvertor.org/schema-info/technical-documentation">The phase of the schema, usually "final".</xs:documentation>
+            </xs:annotation>
+            <xs:simpleType>
+               <xs:restriction base="xs:string">
+                  <xs:pattern value="\S.*"/>
+               </xs:restriction>
+            </xs:simpleType>
+         </xs:element>
          <xs:element name="desc" minOccurs="0" maxOccurs="1">
             <xs:simpleType>
                <xs:restriction base="xs:string">
@@ -152,6 +174,26 @@
                </xs:restriction>
             </xs:simpleType>
          </xs:element>
+         <xs:element name="source" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:documentation source="http://www.imvertor.org/schema-info/technical-documentation">The bron van de specificatie, veelal een organisatie naam.</xs:documentation>
+            </xs:annotation>
+            <xs:simpleType>
+               <xs:restriction base="xs:string">
+                  <xs:pattern value="\S.*"/>
+               </xs:restriction>
+            </xs:simpleType>
+         </xs:element>
+         <xs:element name="data-location" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:documentation source="http://www.imvertor.org/schema-info/technical-documentation">The locatie waar informatie over dit schema kan worden gevonden. Veelal een URL.</xs:documentation>
+            </xs:annotation>
+            <xs:simpleType>
+               <xs:restriction base="xs:string">
+                  <xs:pattern value="\S.*"/>
+               </xs:restriction>
+            </xs:simpleType>
+         </xs:element>
          <xs:element name="url" minOccurs="1" maxOccurs="1">
             <xs:annotation>
                <xs:documentation source="http://www.imvertor.org/schema-info/technical-documentation">This URL is the formal name fo the schema witin the EA project.Insert it as the alias of the &gt; package. </xs:documentation>
diff --git a/src/main/resources/input/BIJ12/cfg/docrules/BIJ12CM.xml b/src/main/resources/input/BIJ12/cfg/docrules/BIJ12CM.xml
new file mode 100644
index 000000000..9bc198c1d
--- /dev/null
+++ b/src/main/resources/input/BIJ12/cfg/docrules/BIJ12CM.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ * Copyright (C) 
+-->
+<doc-rules type="config" xmlns:xi="http://www.w3.org/2001/XInclude">
+  
+    <xi:include href="../../../Geonovum/cfg/docrules/MIMCM.xml"/>
+    
+    <name>BIJ12 Conceptual model documentation rules</name>
+    
+    <desc>BIJ12 SIM specific requirements on documentation. Follows Geonovum.</desc>
+ 
+</doc-rules>
\ No newline at end of file
diff --git a/src/main/resources/input/BIJ12/cfg/docrules/BIJ12SIM.xml b/src/main/resources/input/BIJ12/cfg/docrules/BIJ12SIM.xml
deleted file mode 100644
index c165ef2fe..000000000
--- a/src/main/resources/input/BIJ12/cfg/docrules/BIJ12SIM.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- * Copyright (C) 
--->
-<doc-rules type="config" xmlns:xi="http://www.w3.org/2001/XInclude">
-  
-    <xi:include href="../../../MIM/cfg/docrules/MIM11-extended.xml"/>
-    
-    <name>BIJ12 SIM</name>
-    
-    <desc>BIJ12 SIM specific requirements on documentation. Follows MIM 11 rules.</desc>
-  
-    <!--
-        Where to show the explanation?
-    -->
-    <explanation-location>as-row</explanation-location>
-    
-    <include-overview-section-level>no</include-overview-section-level>
-
-</doc-rules>
\ No newline at end of file
diff --git a/src/main/resources/input/BIJ12/cfg/metamodels/BIJ12CM.xml b/src/main/resources/input/BIJ12/cfg/metamodels/BIJ12CM.xml
new file mode 100644
index 000000000..27ea41c36
--- /dev/null
+++ b/src/main/resources/input/BIJ12/cfg/metamodels/BIJ12CM.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ * Copyright (C) 2016 Dienst voor het kadaster en de openbare registers
+ * 
+ * This file is part of Imvertor.
+ *
+ * Imvertor is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Imvertor is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Imvertor.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<metamodel type="config" xmlns:xi="http://www.w3.org/2001/XInclude">
+
+   <!-- BIJ12 follows MIM requirements -->
+   <xi:include href="../../../Geonovum/cfg/metamodels/Geonovum-MIMCM.xml"/>
+
+   <name>BIJ12 SIM</name>
+   
+   <desc lang="en">BIJ12 Conceptual model metamodel</desc>
+   
+   <profiles>
+      <profile lang="nl"> 
+         <id>BIJ12CMNL</id>
+         <release>1.1</release>
+         <desc>BIJ12 Conceptual models NL</desc> 
+         <profile-name>BCMIM</profile-name>
+      </profile>
+      <profile lang="en"> <!-- ACTUALLY, there is no english variant -->
+         <id>BIJ12CMEN</id>
+         <release>1.1</release>
+         <desc>BIJ12 Conceptual models EN</desc>
+         <profile-name>BCMIM</profile-name>
+      </profile>
+   </profiles>
+   
+</metamodel>
diff --git a/src/main/resources/input/BIJ12/cfg/metamodels/BIJ12SIM.xml b/src/main/resources/input/BIJ12/cfg/metamodels/BIJ12SIM.xml
deleted file mode 100644
index 81a5a5145..000000000
--- a/src/main/resources/input/BIJ12/cfg/metamodels/BIJ12SIM.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- * Copyright (C) 2016 Dienst voor het kadaster en de openbare registers
- * 
- * This file is part of Imvertor.
- *
- * Imvertor is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Imvertor is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Imvertor.  If not, see <http://www.gnu.org/licenses/>.
--->
-<metamodel type="config" xmlns:xi="http://www.w3.org/2001/XInclude">
-
-   <!-- BIJ12 follows MIM requirements -->
-   <xi:include href="../../../MIM/cfg/metamodels/MIM11.xml"/>
-
-   <name>BIJ12 SIM</name>
-   
-   <desc lang="en">Metamodel for BIJ12 information models: semantisch informatiemodel</desc>
-   
-   <profiles>
-      <profile lang="nl"> 
-         <id>BIJ12SIMNL</id>
-         <release>1.1</release>
-         <desc>BIJ12 SIM Grouping NL</desc> 
-         <profile-name>BMIM</profile-name>
-      </profile>
-      <profile lang="en"> <!-- ACTUALLY, there is no english variant -->
-         <id>BIJ12SIMEN</id>
-         <release>1.1</release>
-         <desc>BIJ12 SIM Grouping EN</desc>
-         <profile-name>BMIM</profile-name>
-      </profile>
-   </profiles>
-   
-   <!-- 
-      The normal direction of the composition is from Whole to Part (source to target). 
-      If this is reversed (as is discussied in Task #487339), set this parameter to "part", otherwise set to "whole" (default).
-   -->  
-   <composition-direction-source>part</composition-direction-source>
-   
-   <naming>
-      <package>
-         <format>AsIs</format>
-      </package>
-      <class>
-         <format>AsIs</format>
-      </class>
-      <property>
-         <format>AsIs</format>
-      </property>
-      <tv>
-         <format>Upperstart</format> <!-- first character must be upper case. -->
-      </tv>
-   </naming>
-   
-   <features>
-      <feature name="role-based">false</feature>
-      <feature name="allow-multiple-supertypes">false</feature>
-      <feature name="allow-scalar-in-union">true</feature>
-   </features>
-   
-</metamodel>
diff --git a/src/main/resources/input/BIJ12/cfg/notesrules/BIJ12SIM.xml b/src/main/resources/input/BIJ12/cfg/notesrules/BIJ12CM.xml
similarity index 58%
rename from src/main/resources/input/BIJ12/cfg/notesrules/BIJ12SIM.xml
rename to src/main/resources/input/BIJ12/cfg/notesrules/BIJ12CM.xml
index 7d6fa10c7..57bc308a0 100644
--- a/src/main/resources/input/BIJ12/cfg/notesrules/BIJ12SIM.xml
+++ b/src/main/resources/input/BIJ12/cfg/notesrules/BIJ12CM.xml
@@ -4,8 +4,8 @@
 -->
 <notes-rules type="config" xmlns:xi="http://www.w3.org/2001/XInclude">
   
-    <xi:include href="../../../MIM/cfg/notesrules/MIM10-ISO.xml"/>
+    <xi:include href="../../../Geonovum/cfg/notesrules/MIMCM.xml"/>
     
-    <name>BIJ12 SIM notesrules</name>
+    <name>BIJ12 Conceptual model notesrules</name>
     
 </notes-rules>
\ No newline at end of file
diff --git a/src/main/resources/input/BIJ12/cfg/owners/BIJ12.xml b/src/main/resources/input/BIJ12/cfg/owners/BIJ12.xml
index a70ca1ac4..811de5359 100644
--- a/src/main/resources/input/BIJ12/cfg/owners/BIJ12.xml
+++ b/src/main/resources/input/BIJ12/cfg/owners/BIJ12.xml
@@ -43,7 +43,7 @@
     <!-- 
         some constructs in UML have a fixed value
     -->
-    <parameter name="fixed-identification-attribute-name">identificatie</parameter>
+    <parameter name="fixed-identification-attribute-name"/><!--name may be anything-->
     <parameter name="url-prefix-conceptual-schema">
         <!-- space separated list of conceptual schema URL domains/paths -->
         http://www.geonovum.nl/conceptual-schemas/
diff --git a/src/main/resources/input/BIJ12/cfg/schemarules/XML-BIJ12SIM.xml b/src/main/resources/input/BIJ12/cfg/schemarules/XML-BIJ12CM.xml
similarity index 100%
rename from src/main/resources/input/BIJ12/cfg/schemarules/XML-BIJ12SIM.xml
rename to src/main/resources/input/BIJ12/cfg/schemarules/XML-BIJ12CM.xml
diff --git a/src/main/resources/input/BIJ12/cfg/tvsets/BIJ12CM.xml b/src/main/resources/input/BIJ12/cfg/tvsets/BIJ12CM.xml
new file mode 100644
index 000000000..b2a13bab8
--- /dev/null
+++ b/src/main/resources/input/BIJ12/cfg/tvsets/BIJ12CM.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ * Copyright (C) 2016 Dienst voor het kadaster en de openbare registers
+ * 
+ * This file is part of Imvertor.
+ *
+ * Imvertor is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Imvertor is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Imvertor.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<tagset type="config" xmlns:xi="http://www.w3.org/2001/XInclude">
+    
+    <!-- BIJ12 follows MIM1.1 requirements -->
+    <xi:include href="../../../Geonovum/cfg/tvsets/MIMCM.xml"/>
+    
+    <name>BIJ12 Conceptual model tagged values</name>
+    
+</tagset>
\ No newline at end of file
diff --git a/src/main/resources/input/BIJ12/cfg/tvsets/BIJ12SIM.xml b/src/main/resources/input/BIJ12/cfg/tvsets/BIJ12SIM.xml
deleted file mode 100644
index 452d94781..000000000
--- a/src/main/resources/input/BIJ12/cfg/tvsets/BIJ12SIM.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- * Copyright (C) 2016 Dienst voor het kadaster en de openbare registers
- * 
- * This file is part of Imvertor.
- *
- * Imvertor is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Imvertor is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Imvertor.  If not, see <http://www.gnu.org/licenses/>.
--->
-<tagset type="config" xmlns:xi="http://www.w3.org/2001/XInclude">
-    
-    <!-- BIJ12 follows MIM1.1 requirements -->
-    <xi:include href="../../../MIM/cfg/tvsets/MIM11.xml"/>
-    
-    <name>BIJ12 SIM</name>
-    <tagged-values>
-        <tv id="CFG-TV-MINVALUEINCLUSIVE">
-            <name lang="nl">Minimumwaarde</name>
-            <name lang="en">MinInclusive</name>
-            <desc lang="nl">De ondergrens (inclusief) voor de waarde van een getal.</desc>
-            <desc lang="en">Defines lower bounds for numeric values including this number.</desc>
-            <derive>yes</derive>
-            <stereotypes>
-                <stereo minmax="0..1">stereotype-name-attribute</stereo>
-                <stereo minmax="0..1">stereotype-name-data-element</stereo>
-            </stereotypes>
-        </tv>
-        <tv id="CFG-TV-MAXVALUEINCLUSIVE">
-            <name lang="nl">Maximumwaarde</name>
-            <name lang="en">MaxInclusive</name>
-            <desc lang="nl">De boven (inclusief) voor de waarde van een getal.</desc>
-            <desc lang="en">Defines upper bounds for numeric values including this number.</desc>
-            <derive>yes</derive>
-            <stereotypes>
-                <stereo minmax="0..1">stereotype-name-attribute</stereo>
-                <stereo minmax="0..1">stereotype-name-data-element</stereo>
-            </stereotypes>
-        </tv>
-        <tv norm="space" id="CFG-TV-INDICATIEINONDERZOEK">
-            <name lang="nl">Indicatie in onderzoek</name>
-            <derive>yes</derive><!-- SIM kan altijd terugvallen op een supplier SIM -->
-            <desc lang="nl">
-                De indicatie of te bevragen is dat er twijfel is of is geweest aan de juistheid van de attribuutwaarde en dat een onderzoek wordt 
-                of is uitgevoerd naar de juistheid van de attribuutwaarde. 
-            </desc>
-            <stereotypes>
-                <stereo minmax="0..1">stereotype-name-attribute</stereo>
-                <stereo minmax="0..1">stereotype-name-composite</stereo>
-                <stereo minmax="0..1">stereotype-name-relatiesoort</stereo>
-            </stereotypes>
-            <declared-values lang="nl">
-                <value>Ja</value>
-                <value default="yes">Nee</value>
-                <value>Zie groep</value>
-            </declared-values>
-        </tv>
-    </tagged-values>
-</tagset>
\ No newline at end of file
diff --git a/src/main/resources/input/BIJ12/cfg/versionrules/BIJ12.xml b/src/main/resources/input/BIJ12/cfg/versionrules/BIJ12.xml
index 7eb992310..1e1dc3c50 100644
--- a/src/main/resources/input/BIJ12/cfg/versionrules/BIJ12.xml
+++ b/src/main/resources/input/BIJ12/cfg/versionrules/BIJ12.xml
@@ -4,92 +4,8 @@
 -->
 <version-rules type="config" xmlns:xi="http://www.w3.org/2001/XInclude">
   
-    <name>BIJ12</name>
+    <name>BIJ12 Version rules</name>
     
-    <desc>BIJ12 specific version and phase rules</desc>
-    
-    <version-rule>
-        <version id="CFG-VERSION-NEM">
-            <name lang="#all">Nonempty</name>
-            <desc lang="en">Versions must be non-empty.</desc>
-            <pattern>.+</pattern>
-            <fragment group="1" required="yes">
-                <name lang="#all">Version (not empty)</name>
-            </fragment>
-        </version>
-    </version-rule>            
-    
-    <phase-rule>
-        <phase id="CFG-PHASE-INIT">
-            <name lang="nl">Initieel</name>
-            <name lang="en">Initial</name>
-            <level>0</level>
-            <desc lang="nl">Initiële versies zijn in ontwikkeling en worden niet intern verspreid.</desc>
-            <!-- 
-                kan optreden als supplier voor ieder level kleiner of gelijk aan 0
-            -->
-            <may-supply>0</may-supply>
-            <!-- mag worden overschreven -->
-            <is-fixed>no</is-fixed>
-            <allow-docrelease>yes</allow-docrelease>
-            <!-- All property files are valid for processing such a model. -->
-            <props/>
-        </phase>
-        <phase id="CFG-PHASE-DRAFT">
-            <name lang="nl">Klad</name>
-            <name lang="en">Draft</name>
-            <level>1</level>
-            <desc lang="nl">Klad versies zijn in ontwikkeling en kunnen intern worden verspreid.</desc>
-            <!-- 
-                kan optreden als supplier voor ieder level kleiner of gelijk aan 1
-            -->
-            <may-supply>1</may-supply>
-            <!-- mag worden overschreven -->
-            <is-fixed>no</is-fixed>
-            <allow-docrelease>yes</allow-docrelease>
-            <!-- All property files are valid for processing such a model. -->
-            <props/>
-        </phase>
-        <phase id="CFG-PHASE-FINALDRAFT">
-            <name lang="nl">Voorstel</name>
-            <name lang="en">Final draft</name>
-            <level>2</level>
-            <desc lang="nl">Voorstel versies zijn in ontwikkeling en kunnen extern worden verspreid, ter consultatie.</desc>
-            <!-- 
-                kan optreden als supplier voor ieder level kleiner of gelijk aan 2
-            -->
-            <may-supply>2</may-supply>
-            <!-- mag worden overschreven -->
-            <is-fixed>no</is-fixed>
-            <allow-docrelease>yes</allow-docrelease>
-            <!-- All property files are valid for processing such a model. -->
-            <props/>
-        </phase>
-        <phase id="CFG-PHASE-FINAL">
-            <name lang="nl">Vastgesteld</name>
-            <name lang="en">Final</name>
-            <level>3</level>
-            <desc lang="nl">Vastgestelde versies zijn gereed, kunnen extern worden verspreid, en dienen niet meer te worden vervangen.</desc>
-            <!-- 
-                kan optreden als supplier voor ieder level kleiner of gelijk aan 3
-            -->
-            <may-supply>3</may-supply>
-            <!-- mag niet worden overschreven! -->
-            <is-fixed>yes</is-fixed>
-            <allow-docrelease>yes</allow-docrelease>
-            <!-- Only the following property files are valid for processing a Phase 3 model. -->
-            <props>
-                <prop>Server-WaarderingskamerSIM-Release.properties</prop>
-                <prop>Server-WaarderingskamerUGM-Release.properties</prop>
-                <prop>Server-WaarderingskamerBSM-Release.properties</prop>
-            </props>
-        </phase>
-        <phase id="CFG-PHASE-REJECTED">
-            <name lang="nl">Vervallen</name>
-            <name lang="en">Rejected</name>
-            <level>4</level>
-            <desc lang="nl">Deze versie is vervallen en mag niet meer worden gebruikt, ook niet als supplier.</desc>
-            <may-supply>-1</may-supply>
-        </phase>
-    </phase-rule>   
+    <xi:include href="../../../Geonovum/cfg/versionrules/Geonovum.xml"/>
+   
 </version-rules>
\ No newline at end of file
diff --git a/src/main/resources/input/BIJ12/cfg/visuals/BIJ12SIM.xml b/src/main/resources/input/BIJ12/cfg/visuals/BIJ12CM.xml
similarity index 90%
rename from src/main/resources/input/BIJ12/cfg/visuals/BIJ12SIM.xml
rename to src/main/resources/input/BIJ12/cfg/visuals/BIJ12CM.xml
index 974a9bc70..cd8739c1e 100644
--- a/src/main/resources/input/BIJ12/cfg/visuals/BIJ12SIM.xml
+++ b/src/main/resources/input/BIJ12/cfg/visuals/BIJ12CM.xml
@@ -4,7 +4,7 @@
 -->
 <visuals type="config" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-    <xi:include href="../../../MIM/cfg/visuals/MIM11.xml"/>
+    <xi:include href="../../../Geonovum/cfg/visuals/MIMCM.xml"/>
 
     <!-- 
         these visuals specify the basic visual aspects of the UML profile  
diff --git a/src/main/resources/input/BIJ12/props/BIJ12.xlsx b/src/main/resources/input/BIJ12/props/BIJ12.xlsx
index 1f34660f6..9a6926f96 100644
Binary files a/src/main/resources/input/BIJ12/props/BIJ12.xlsx and b/src/main/resources/input/BIJ12/props/BIJ12.xlsx differ
diff --git a/src/main/resources/input/BRO/cfg/owners/BRO.xml b/src/main/resources/input/BRO/cfg/owners/BRO.xml
index 1a6ccbd64..b791cd673 100644
--- a/src/main/resources/input/BRO/cfg/owners/BRO.xml
+++ b/src/main/resources/input/BRO/cfg/owners/BRO.xml
@@ -26,10 +26,8 @@
         This schema is based on an UML specification, which is transformed by the Imvertor software. Imvertor modules are in the public domain, see http://www.imvertor.org.
     </parameter>
   
-    <!-- 
-        some constructs in UML have a fixed value
-    -->
-    <parameter name="fixed-identification-attribute-name">identificatie</parameter>
+    <parameter name="fixed-identification-attribute-name"/><!--name may be anything-->
+
     <parameter name="url-prefix-conceptual-schema">
         <!-- space separated list of conceptual schema URL domains/paths -->
         http://www.geonovum.nl/conceptual-schemas/
diff --git a/src/main/resources/input/EIGENAAR/cfg/docrules/EIGENAAR.xml b/src/main/resources/input/EIGENAAR/cfg/docrules/EIGENAAR.xml
index 1c5c8c615..32005461e 100644
--- a/src/main/resources/input/EIGENAAR/cfg/docrules/EIGENAAR.xml
+++ b/src/main/resources/input/EIGENAAR/cfg/docrules/EIGENAAR.xml
@@ -46,6 +46,11 @@
     <include-overview-sections-by-type>yes</include-overview-sections-by-type>
     <include-detail-sections-by-type>yes</include-detail-sections-by-type>
     
+    <!-- 
+        Wanneer ReSpec wordt samengesteld, welke config kan worden gebruikt? 
+    -->
+    <respec-config>https://armatiek.nl/respec-profiles/w3c/profile/respec-w3c-common.js</respec-config>
+    
     <image-purpose id="CFG-IMG-OVERVIEW">
         <name lang="nl">Overzichtsdiagram</name>
         <name lang="en">Overview diagram</name>
diff --git a/src/main/resources/input/EIGENAAR/cfg/owners/EIGENAAR.xml b/src/main/resources/input/EIGENAAR/cfg/owners/EIGENAAR.xml
index abcc9ece2..55593693e 100644
--- a/src/main/resources/input/EIGENAAR/cfg/owners/EIGENAAR.xml
+++ b/src/main/resources/input/EIGENAAR/cfg/owners/EIGENAAR.xml
@@ -29,7 +29,7 @@
     <!-- 
         some constructs in UML have a fixed value
     -->
-    <parameter name="fixed-identification-attribute-name">identificatie</parameter>
+    <parameter name="fixed-identification-attribute-name"/><!--name may be anything-->
     <parameter name="url-prefix-conceptual-schema">
         <!-- space separated list of conceptual schema URL domains/paths -->
         http://www.geonovum.nl/conceptual-schemas/
diff --git a/src/main/resources/input/Geonovum/cfg/notesrules/Geonovum.xml b/src/main/resources/input/Geonovum/cfg/notesrules/Geonovum.xml
index 6b07a3011..b2118c53b 100644
--- a/src/main/resources/input/Geonovum/cfg/notesrules/Geonovum.xml
+++ b/src/main/resources/input/Geonovum/cfg/notesrules/Geonovum.xml
@@ -15,6 +15,9 @@
         <section title="Bron" tagged-value="CFG-TV-SOURCE">
             <!-- geen labels -->
         </section>
+        <section title="Herkomst" tagged-value="CFG-TV-SOURCE">
+            <!-- geen labels -->
+        </section>
     </notes-rule>
     
     <notes-rule lang="en">
diff --git a/src/main/resources/input/Geonovum/cfg/owners/Geonovum.xml b/src/main/resources/input/Geonovum/cfg/owners/Geonovum.xml
index bca435eaa..6cacf6c70 100644
--- a/src/main/resources/input/Geonovum/cfg/owners/Geonovum.xml
+++ b/src/main/resources/input/Geonovum/cfg/owners/Geonovum.xml
@@ -29,7 +29,7 @@
     <!-- 
         some constructs in UML have a fixed value
     -->
-    <parameter name="fixed-identification-attribute-name">identificatie</parameter>
+    <parameter name="fixed-identification-attribute-name"/><!--name may be anything-->
     <parameter name="url-prefix-conceptual-schema">
         <!-- space separated list of conceptual schema URL domains/paths -->
         http://www.geonovum.nl/conceptual-schemas/
diff --git a/src/main/resources/input/IHW/cfg/docrules/IHW.xml b/src/main/resources/input/IHW/cfg/docrules/IHW.xml
index 806104aef..f2aefa60b 100644
--- a/src/main/resources/input/IHW/cfg/docrules/IHW.xml
+++ b/src/main/resources/input/IHW/cfg/docrules/IHW.xml
@@ -44,5 +44,9 @@
     <!-- visibility of properties: show in accordance with configuration (@show) or compact: only the specified parts -->
     
     <show-properties>config</show-properties> <!-- config, all, compact -->
-    
+ 
+    <!-- 
+        Wanneer ReSpec wordt samengesteld, welke config kan worden gebruikt? 
+    -->
+    <respec-config>https://armatiek.nl/respec-profiles/w3c/profile/respec-w3c-common.js</respec-config>
 </doc-rules>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/cfg/owners/IHW.xml b/src/main/resources/input/IHW/cfg/owners/IHW.xml
index c0cc1ba62..6ef59f9c6 100644
--- a/src/main/resources/input/IHW/cfg/owners/IHW.xml
+++ b/src/main/resources/input/IHW/cfg/owners/IHW.xml
@@ -43,12 +43,13 @@
     <!--
         some constructs in UML have a fixed value
     -->
-    <parameter name="fixed-identification-attribute-name">identificatie</parameter>
+    <parameter name="fixed-identification-attribute-name"/><!--name may be anything-->
     <parameter name="url-prefix-conceptual-schema">
         <!-- space separated list of conceptual schema URL domains/paths -->
         http://www.geonovum.nl/conceptual-schemas/
         http://www.kinggemeenten.nl/conceptual-schemas/
         http://www.kadaster.nl/conceptual-schemas/
+        http://www.bro.nl/conceptual-schemas/
     </parameter>
     <parameter name="url-prefix-schema-waardelijsten">http://www.kinggemeenten.nl/schemas/waardelijsten/</parameter>
     <parameter name="class-name-waardelijst">Waardelijst</parameter>
diff --git a/src/main/resources/input/IHW/cfg/schemarules/XML-IHWSIM.xml b/src/main/resources/input/IHW/cfg/schemarules/XML-IHWSIM.xml
index 4e6f72585..76edd519b 100644
--- a/src/main/resources/input/IHW/cfg/schemarules/XML-IHWSIM.xml
+++ b/src/main/resources/input/IHW/cfg/schemarules/XML-IHWSIM.xml
@@ -25,6 +25,16 @@
     <desc lang="en">Rule for processing SIM models to XML schemas</desc>
     <desc lang="nl">Regels voor het verwerken van SIM modellen tot XML schema's</desc>
     
-    <!-- IHW produces no schemas based in SIM directly (yet) -->
+    <!-- 
+        IHW specific rules 
+    -->
+    <!-- specify if strings must be non-empty -->
+    <parameter name="strings-nonempty">true</parameter>
+    
+    <!-- specify if the schema location must be absolute or relative. When absolute, XML schema location must be specified as a tagged value. -->
+    <parameter name="xml-schemalocation-approach">relative</parameter>
+    
+    <!-- specify if version or release or none must be inserted into the XSD namespaces -->
+    <parameter name="namespace-composition">release</parameter>
     
 </xmlschema-rules>
diff --git a/src/main/resources/input/IHW/cfg/schemarules/XML-ISO19136.xml b/src/main/resources/input/IHW/cfg/schemarules/XML-ISO19136.xml
new file mode 100644
index 000000000..95100c93d
--- /dev/null
+++ b/src/main/resources/input/IHW/cfg/schemarules/XML-ISO19136.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ * Copyright (C) 2016 Dienst voor het kadaster en de openbare registers
+ * 
+ * This file is part of Imvertor.
+ *
+ * Imvertor is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Imvertor is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Imvertor.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<xmlschema-rules type="config" xmlns:xi="http://www.w3.org/2001/XInclude">
+    
+    <xi:include href="../../../Geonovum/cfg/schemarules/XML-ISO19136.xml"/>
+    
+    <name>IHW ISO19136</name>
+    
+    <!-- 
+        IHW specific rules 
+    -->
+    <!-- specify if strings must be non-empty -->
+    <parameter name="strings-nonempty">false</parameter>
+    
+    <!-- specify if the schema location must be absolute or relative. When absolute, XML schema location must be specified as a tagged value. -->
+    <parameter name="xml-schemalocation-approach">relative</parameter>
+    
+    <!-- specify if version or release or none must be inserted into the XSD namespaces -->
+    <parameter name="namespace-composition">release</parameter>
+    
+    <!-- specify the minOccurs/maxOccurs when needed ("default") or "always" -->
+    <parameter name="specify-xsd-occurrence">always</parameter><!-- only applies to ISO19136 -->
+    
+</xmlschema-rules>
diff --git a/src/main/resources/input/IHW/cfg/tvsets/IHWSIM.xml b/src/main/resources/input/IHW/cfg/tvsets/IHWSIM.xml
index bdd331e06..a060dfc9a 100644
--- a/src/main/resources/input/IHW/cfg/tvsets/IHWSIM.xml
+++ b/src/main/resources/input/IHW/cfg/tvsets/IHWSIM.xml
@@ -25,6 +25,18 @@
     <name>IHW SIM tvsets</name>
     
     <tagged-values>
-        <!-- geen eigen tagged values -->    
+        
+        <tv norm="space" id="CFG-TV-FEATURECOLLECTION">
+            <name lang="en">Feature collection</name>
+            <name lang="nl">Objectverzameling</name>
+            <desc lang="nl">Een verzameling van objecttypen. 
+                Zo'n verzameling wordt alleen gebruikt in toepassingen waarin objecttypen moeten worden uitgewisseld conform GML "featurecollections".
+            </desc>
+            <derive>yes</derive>
+            <stereotypes>
+                <stereo minmax="0..1">stereotype-name-domain-package</stereo>
+            </stereotypes>
+        </tv>
+        
     </tagged-values>
 </tagset>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/conceptual-schemas.xml b/src/main/resources/input/IHW/xsd/conceptual-schemas.xml
index ff435103d..fe0112bcb 100644
--- a/src/main/resources/input/IHW/xsd/conceptual-schemas.xml
+++ b/src/main/resources/input/IHW/xsd/conceptual-schemas.xml
@@ -10,16 +10,8 @@
       <cs:Mapping>
          <cs:name>IHW_GEOSTANDAARDEN</cs:name>
          <cs:use>
-            <cs-ref:MapRef xlink:href="#GML321"/>
-            <cs-ref:MapRef xlink:href="#CIT10"/>
-            <cs-ref:MapRef xlink:href="#GEX10"/>
-            <cs-ref:MapRef xlink:href="#INSPIRE"/>
-            <cs-ref:MapRef xlink:href="#INSPIRE-GEO"/>
-            <cs-ref:MapRef xlink:href="#INSPIRE-SOIL"/>
+            <cs-ref:MapRef xlink:href="#GML322PROFILE"/>
             <cs-ref:MapRef xlink:href="#MIM11"/>
-            <cs-ref:MapRef xlink:href="#NEN3610"/>
-            <cs-ref:MapRef xlink:href="#CITYGML"/>
-            <cs-ref:MapRef xlink:href="#IMGEO211"/>
             <cs-ref:MapRef xlink:href="#IHW-GENERIEK"/>
          </cs:use>
       </cs:Mapping>
@@ -28,15 +20,8 @@
       <cs:ConceptualSchemasComponents>
 
          <xi:include href="../../MIM/xsd/cs-MIM11.xml"/><!-- implements ConceptualSchema MIM11 -->
-
-         <cs:ConceptualSchema>
-            <cs:id>GML3</cs:id>
-            <cs:shortName>gml</cs:shortName>
-            <cs:desc>ISO19107 Geographic information – Spatial schema (Geography Markup Language 3)</cs:desc>
-            <cs:url>http://www.bro.nl/conceptual-schemas/ISO19107</cs:url>
-            <cs:catalogUrl>http://www.opengeospatial.org/standards/gml[entry]</cs:catalogUrl>
-         </cs:ConceptualSchema>
-        
+         <xi:include href="../../ISO/xsd/cs-GML322PROFILE.xml"/><!-- implements ConceptualSchema GML 322 profile -->
+         
          <cs:ConceptualSchema>
             <cs:id>IHW</cs:id>
             <cs:shortName>ihw</cs:shortName>
@@ -44,976 +29,9 @@
             <cs:url>http://www.ihw.nl/</cs:url>
          </cs:ConceptualSchema>
          
-         <cs:ConceptualSchema>
-            <cs:id>CPI</cs:id>
-            <cs:shortName>cit</cs:shortName>
-            <cs:desc>ISO TC211 / ISO 19115:2006 Metadata (Corrigendum) - Citation and responsible party information</cs:desc>
-            <cs:url>http://www.bro.nl/conceptual-schemas/iso/19115/metadata/cit</cs:url>
-         </cs:ConceptualSchema>
-         <cs:ConceptualSchema>
-            <cs:id>EI</cs:id>
-            <cs:shortName>gex</cs:shortName>
-            <cs:desc>ISO TC211 / ISO 19115:2006 Metadata (Corrigendum) - Extent information</cs:desc>
-            <cs:url>http://www.bro.nl/conceptual-schemas/iso/19115/metadata/gex</cs:url>
-         </cs:ConceptualSchema>
-         <cs:ConceptualSchema>
-            <cs:id>INSPIRE</cs:id>
-            <cs:shortName>INSPIRE</cs:shortName>
-            <cs:desc>The INSPIRE Feature Concept Dictionary (IFCD) acts as a common feature concept dictionary for all INSPIRE data specifications. The common feature concept dictionary contains terms and definitions required for specifying thematic spatial object types and it is main role is in particular to support the harmonisation effort and to identify conflicts between the specifications of the spatial object types in the different themes.</cs:desc>
-            <cs:url>http://www.bro.nl/conceptual-schemas/INSPIRE</cs:url>
-            <cs:catalogUrl>http://inspire.ec.europa.eu/featureconcept/[entry]</cs:catalogUrl>
-         </cs:ConceptualSchema>
-         <cs:ConceptualSchema>
-            <cs:id>NEN3610</cs:id>
-            <cs:shortName>nen3610</cs:shortName>
-            <cs:desc>NEN3610 (2011)</cs:desc>
-            <cs:url>http://www.bro.nl/conceptual-schemas/nen3610/1.0/</cs:url>
-         </cs:ConceptualSchema>
-         <cs:ConceptualSchema>
-            <cs:id>CITYGML</cs:id>
-            <cs:shortName>CityGML</cs:shortName>
-            <cs:desc>CityGML...</cs:desc>
-            <cs:url>https://www.opengeospatial.org/standards/citygml</cs:url>
-         </cs:ConceptualSchema>
-         <cs:ConceptualSchema>
-            <cs:id>IMGEO</cs:id>
-            <cs:shortName>IMGEO</cs:shortName>
-            <cs:desc>IMGEO...</cs:desc>
-            <cs:url>https://www.geonovum.nl/geo-standaarden/bgt-imgeo</cs:url>
-            <cs:catalogUrl>http://imgeo.geostandaarden.nl/def/imgeo-object/[entry]</cs:catalogUrl>
-         </cs:ConceptualSchema>
-
          <xi:include href="../../MIM/xsd/cm-MIM11.xml"/><!-- implements Map #MIM11 -->
-
-         <cs:Map>
-            <cs:id>GML321</cs:id>
-            <cs:namespace>http://www.opengis.net/gml/3.2</cs:namespace>
-            <cs:location>https://schema.broservices.nl/profile/gml/1.0/gml-profile.xsd</cs:location>
-            <cs:phase>3</cs:phase>
-            <cs:version>0.0.2-3.2.1</cs:version>
-            <cs:release>BROPROFILE</cs:release>
-            <cs:forSchema>
-               <cs-ref:ConceptualSchemaRef xlink:href="#GML3"/>
-            </cs:forSchema>
-            <cs:constructs>
-               <cs:Construct>
-                  <cs:name>GFI_Feature</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>#AbstractFeature</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>Feature</cs:name>
-                        <cs:asAttribute>FeatureType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>GM_LineString</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>#LineString</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>LineString</cs:name>
-                        <cs:asAttribute>LineStringType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>GM_Point</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>#Point</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>Point</cs:name>
-                        <cs:asAttribute>PointPropertyType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>GM_Polygon</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>#Polygon</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>Polygon</cs:name>
-                        <cs:asAttribute>PolygonType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>GM_Envelope</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>#Envelope</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>Envelope</cs:name>
-                        <cs:asAttribute>EnvelopeType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>GM_AbstractGeometry</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>#AbstractGeometry</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>AbstractGeometry</cs:name>
-                        <cs:asAttribute>AbstractGeometryType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>GM_AbstractCurve</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>#AbstractCurve</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>AbstractCurve</cs:name>
-                        <cs:asAttribute>AbstractCurveType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>GM_AbstractSurface</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>#AbstractSurface</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>AbstractSurface</cs:name>
-                        <cs:asAttribute>AbstractSurfaceType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>GM_AbstractRing</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>#AbstractRing</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>AbstractRing</cs:name>
-                        <cs:asAttribute>AbstractRingType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>LinearRing</cs:name>
-                  <cs:desc>LinearRing is in GML / ISO19136 gedefinieerd. Het heeft geen corresponderende klasse in ISO19107 maar is in GML toegevoegd als convenience type, een simpelere vorm van GM_Ring en formeel een subklasse daarvan.</cs:desc>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>#LinearRing</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>LinearRing</cs:name>
-                        <cs:asAttribute>LinearRingType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>GM_Object</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>#GM_Object</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>AbstractGeometry</cs:name>
-                        <cs:asAttribute>AbstractGeometryType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>GM_Surface</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>#Surface</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>Surface</cs:name>
-                        <cs:asAttribute>SurfacePropertyType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>GM_MultiSurface</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>#MultiSurface</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>MultiSurface</cs:name>
-                        <cs:asAttribute>MultiSurfaceType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>GM_MultiSolid</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>#MultiSolid</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>MultiSolid</cs:name>
-                        <cs:asAttribute>MultiSolidType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>GM_MultiCurve</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>MultiCurve</cs:name>
-                        <cs:asAttribute>MultiCurvePropertyType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-                  <cs:rdfTypes>
-                     <cs:RdfType>
-                        <cs:name>rdfs:Datatype</cs:name>
-                     </cs:RdfType>
-                  </cs:rdfTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>GM_Solid</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>Solid</cs:name>
-                        <cs:asAttribute>SolidPropertyType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-                  <cs:rdfTypes>
-                     <cs:RdfType>
-                        <cs:name>rdfs:Datatype</cs:name>
-                     </cs:RdfType>
-                  </cs:rdfTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>TM_Instant</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>#TimeInstant</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>TimeInstant</cs:name>
-                        <cs:asAttribute>TimeInstantType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>TM_Period</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>#TimePeriod</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>TimePeriod</cs:name>
-                        <cs:asAttribute>TimePeriodType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>CV_Coverage</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>Identifier</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>#Identifier</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>Identifier</cs:name>
-                        <cs:asAttribute>IdentifierType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>OtherSoilNameType</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>#OtherSoilNameType</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>OtherSoilNameType</cs:name>
-                        <cs:asAttribute>OtherSoilNameType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>WRBSoilNameType</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>#WRBSoilNameType</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>WRBSoilNameType</cs:name>
-                        <cs:asAttribute>WRBSoilNameType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>GM_SENTINEL</cs:name>
-                  <cs:sentinel>true</cs:sentinel>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>Measure</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>#Measure</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>Measure</cs:name>
-                        <cs:asAttribute>MeasureType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>GM_Curve</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>Curve</cs:name>
-                        <cs:asAttribute>CurvePropertyType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-                  <cs:rdfTypes>
-                     <cs:RdfType>
-                        <cs:name>rdfs:Datatype</cs:name>
-                     </cs:RdfType>
-                  </cs:rdfTypes>
-               </cs:Construct>
-            </cs:constructs>
-         </cs:Map>
-         <cs:Map>
-            <cs:id>CIT10</cs:id>
-            <cs:namespace>http://standards.iso.org/iso/19115/-3/cit/1.0</cs:namespace>
-            <cs:desc>Citation and responsible party information</cs:desc>
-            <cs:location>http://standards.iso.org/iso/19115/-3/cit/1.0/cit.xsd</cs:location>
-            <cs:phase>3</cs:phase>
-            <cs:version>1.0</cs:version>
-            <cs:release>2006</cs:release>
-            <cs:forSchema>
-               <cs-ref:ConceptualSchemaRef xlink:href="#CPI"/>
-            </cs:forSchema>
-            <cs:constructs>
-               <cs:Construct>
-                  <cs:name>CI_Citation</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>CI_Citation</cs:name>
-                        <cs:asAttribute>CI_Citation_PropertyType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-            </cs:constructs>
-         </cs:Map>
-         <cs:Map>
-            <cs:id>GEX10</cs:id>
-            <cs:namespace>http://standards.iso.org/iso/19115/-3/gex/1.0</cs:namespace>
-            <cs:desc>Extent information</cs:desc>
-            <cs:location>http://standards.iso.org/iso/19115/-3/gex/1.0/gex.xsd</cs:location>
-            <cs:phase>3</cs:phase>
-            <cs:version>1.0</cs:version>
-            <cs:release>2006</cs:release>
-            <cs:forSchema>
-               <cs-ref:ConceptualSchemaRef xlink:href="#EI"/>
-            </cs:forSchema>
-            <cs:constructs>
-               <cs:Construct>
-                  <cs:name>EX_Extent</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>EX_Extent</cs:name>
-                        <cs:asAttribute>EX_Extent_PropertyType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-            </cs:constructs>
-         </cs:Map>
-         <cs:Map>
-            <cs:id>INSPIRE</cs:id>
-            <cs:namespace>http://inspire.ec.europa.eu/</cs:namespace>
-            <cs:desc>Links to the INSPIRE cataloque and schemas.</cs:desc>
-            <cs:location>http://inspire.ec.europa.eu/sample1.xsd</cs:location>
-            <cs:phase>3</cs:phase>
-            <cs:version>1.0</cs:version>
-            <cs:release>2006</cs:release>
-            <cs:forSchema>
-               <cs-ref:ConceptualSchemaRef xlink:href="#INSPIRE"/>
-            </cs:forSchema>
-            <cs:constructs>
-               <cs:Construct>
-                  <cs:name>ActivityComplex</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>ActivityComplex</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>ActivityComplex</cs:name>
-                        <cs:asAttribute>ActivityComplexType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>Identifier</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>Identifier</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>Identifier</cs:name>
-                        <cs:asAttribute>IdentifierType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-            </cs:constructs>
-         </cs:Map>
-         <cs:Map>
-            <cs:id>INSPIRE-GEO</cs:id>
-            <cs:namespace>http://inspire.ec.europa.eu/</cs:namespace>
-            <cs:desc>Links to the INSPIRE Geo core cataloque and schemas.</cs:desc>
-            <cs:location>http://inspire.ec.europa.eu/schemas/ge-core/4.0/GeologyCore.xsd </cs:location>
-            <cs:phase>3</cs:phase>
-            <cs:version>1.0</cs:version>
-            <cs:release>4.0</cs:release>
-            <cs:forSchema>
-               <cs-ref:ConceptualSchemaRef xlink:href="#INSPIRE"/>
-            </cs:forSchema>
-            <cs:constructs>
-               <cs:Construct>
-                  <cs:name>MappedFeature</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>MappedFeature</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>MappedFeature</cs:name>
-                        <cs:asAttribute>MappedFeatureType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-            </cs:constructs>
-         </cs:Map>
-         <cs:Map>
-            <cs:id>INSPIRE-SOIL</cs:id>
-            <cs:namespace>http://inspire.ec.europa.eu/</cs:namespace>
-            <cs:desc>Links to the INSPIRE Soil cataloque and schemas.</cs:desc>
-            <cs:location>http://inspire.ec.europa.eu/schemas/so/4.0/Soil.xsd</cs:location>
-            <cs:phase>3</cs:phase>
-            <cs:version>1.0</cs:version>
-            <cs:release>4.0</cs:release>
-            <cs:forSchema>
-               <cs-ref:ConceptualSchemaRef xlink:href="#INSPIRE"/>
-            </cs:forSchema>
-            <cs:constructs>
-               <cs:Construct>
-                  <cs:name>ProfileElement</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>ProfileElement</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>ProfileElement</cs:name>
-                        <cs:asAttribute>ProfileElementType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>SoilHorizon</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>SoilHorizon</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>SoilHorizon</cs:name>
-                        <cs:asAttribute>SoilHorizonType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>SoilLayer</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>SoilLayer</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>SoilLayer</cs:name>
-                        <cs:asAttribute>SoilLayerType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-            </cs:constructs>
-         </cs:Map>
-         <cs:Map>
-            <cs:id>NEN3610</cs:id>
-            <cs:namespace>http://www.geonovum.nl/NEN3610/schemas/v20110301</cs:namespace>
-            <cs:location>http://www.geonovum.nl/NEN3610/v20110301/NEN3610_NEN3610_v1_0_0.xsd</cs:location>
-            <cs:phase>3</cs:phase>
-            <cs:version>2011</cs:version>
-            <cs:release>20110301</cs:release>
-            <cs:forSchema>
-               <cs-ref:ConceptualSchemaRef xlink:href="#NEN3610"/>
-            </cs:forSchema>
-            <cs:constructs>
-               <cs:Construct>
-                  <cs:name>NEN3610ID</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>https://www.geonovum.nl/onderwerpen/basismodel-geo-informatie-nen3610</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>NEN3610ID</cs:name>
-                        <cs:asAttribute>NEN3610ID</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>GeoObject</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>https://www.geonovum.nl/onderwerpen/basismodel-geo-informatie-nen3610</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>GeoObject</cs:name>
-                        <cs:asAttribute>GeoObject</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>Historie</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>https://www.geonovum.nl/onderwerpen/basismodel-geo-informatie-nen3610</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>Historie</cs:name>
-                        <cs:asAttribute>Historie</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>Levensduur</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>https://www.geonovum.nl/onderwerpen/basismodel-geo-informatie-nen3610</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>Levensduur</cs:name>
-                        <cs:asAttribute>Levensduur</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>VoidReasonValue</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>https://www.geonovum.nl/onderwerpen/basismodel-geo-informatie-nen3610</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>VoidReasonValue</cs:name>
-                        <cs:asAttribute>VoidReasonValue</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>Gebouw</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>http://definities.geostandaarden.nl/nen3610/id/begrip/Gebouw</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>Gebouw</cs:name>
-                        <cs:asAttribute>Gebouw</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>RegistratiefGebied</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>http://definities.geostandaarden.nl/nen3610/id/begrip/RegistratiefGebied</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>RegistratiefGebied</cs:name>
-                        <cs:asAttribute>RegistratiefGebied</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>GeoObject</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>http://definities.geostandaarden.nl/nen3610/id/begrip/GeoObject</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>RegistratiefGebied</cs:name>
-                        <cs:asAttribute>GeoObject</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>Kunstwerk</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>http://definities.geostandaarden.nl/nen3610/id/begrip/Kunstwerk</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>Kunstwerk</cs:name>
-                        <cs:asAttribute>Kunstwerk</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-            </cs:constructs>
-         </cs:Map>
-         <cs:Map>
-            <cs:id>CITYGML</cs:id>
-            <cs:namespace>http://www.opengis.net/citygml/relief/2.0</cs:namespace>
-            <cs:location>http://schemas.opengis.net/citygml/relief/2.0/relief.xsd</cs:location>
-            <cs:phase>3</cs:phase>
-            <cs:version>2.0</cs:version>
-            <cs:release>20120201</cs:release>
-            <cs:forSchema>
-               <cs-ref:ConceptualSchemaRef xlink:href="#CITYGML"/>
-            </cs:forSchema>
-            <cs:constructs>
-               <cs:Construct>
-                  <cs:name>ReliefFeature</cs:name>
-                  <cs:sentinel>false</cs:sentinel>
-                  <cs:xsdTypes>
-                     <cs:XsdType>
-                        <cs:name>ReliefFeature</cs:name>
-                        <cs:asAttribute>ReliefFeatureType</cs:asAttribute>
-                        <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
-                        <cs:primitive>false</cs:primitive>
-                        <cs:hasNilreason>false</cs:hasNilreason>
-                     </cs:XsdType>
-                  </cs:xsdTypes>
-               </cs:Construct>
-            </cs:constructs>
-         </cs:Map>
-         <cs:Map>
-            <cs:id>IMGEO211</cs:id>
-            <cs:namespace>http://www.geostandaarden.nl/imgeo/2.1</cs:namespace>
-            <cs:location>https://register.geostandaarden.nl/gmlapplicatieschema/imgeo/2.1.1/imgeo.xsd</cs:location>
-            <cs:phase>0</cs:phase>
-            <cs:version>2.1.1</cs:version>
-            <cs:release>20130329</cs:release>
-            <cs:forSchema>
-               <cs-ref:ConceptualSchemaRef xlink:href="#IMGEO"/>
-            </cs:forSchema>
-            <cs:constructs>
-               <cs:Construct>
-                  <cs:name>AuxiliaryTrafficArea</cs:name>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>BuildingPart</cs:name>
-                  <cs:catalogEntries>
-                     <cs:CatalogEntry>
-                        <cs:name>BuildingPart</cs:name>
-                     </cs:CatalogEntry>
-                  </cs:catalogEntries>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>BridgeConstructionElement</cs:name>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>FunctioneelGebied</cs:name>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>Kunstwerkdeel</cs:name>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>OnbegroeidTerreindeel</cs:name>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>OndersteunendWaterdeel</cs:name>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>OverigBouwwerk</cs:name>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>PlantCover</cs:name>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>Put</cs:name>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>Scheiding</cs:name>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>TrafficArea</cs:name>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>TunnelPart</cs:name>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>Waterdeel</cs:name>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>Waterinrichtingselement</cs:name>
-               </cs:Construct>
-			   <!-- Toevoeging M Welling om IM Metingen MIM compliant te krijgen in EA -->
-               <cs:Construct>
-                  <cs:name>GenericName</cs:name>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>PreparationStep</cs:name>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>Any</cs:name>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>OM_Observation</cs:name>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>SF_SpatialSamplingFeature</cs:name>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>SF_Specimen</cs:name>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>float</cs:name>
-               </cs:Construct>
-               <cs:Construct>
-                  <cs:name>int</cs:name>
-               </cs:Construct>
-            </cs:constructs>
-         </cs:Map>
+         <xi:include href="../../ISO/xsd/cm-GML322PROFILE.xml"/><!-- implements Map #GML -->
+         
          <cs:Map>
             <cs:id>IHW-GENERIEK</cs:id>
             <cs:namespace>http://www.ihw.nl/</cs:namespace>
diff --git a/src/main/resources/input/IHW/xsd/local-schemas.xml b/src/main/resources/input/IHW/xsd/local-schemas.xml
index 64eff0573..448027027 100644
--- a/src/main/resources/input/IHW/xsd/local-schemas.xml
+++ b/src/main/resources/input/IHW/xsd/local-schemas.xml
@@ -3,4 +3,11 @@
 -->
 <local-schemas>
     
+    <local-schema schemafolder="www.w3.org/XLINKS-20010627">
+        <depends-on schemafolder="www.w3.org/XML-1998"/>
+        <local-map 
+            source-uri-prefix="http://www.w3.org/2001/xml.xsd"
+            target-uri-prefix="../../1998/namespace/xml.xsd"/>
+    </local-schema>
+    
 </local-schemas>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/register.geostandaarden.nl/IMGEO211-20130329/gmlapplicatieschema/imgeo/2.1.1/imgeo.xsd b/src/main/resources/input/IHW/xsd/register.geostandaarden.nl/IMGEO211-20130329/gmlapplicatieschema/imgeo/2.1.1/imgeo.xsd
deleted file mode 100644
index b81160ba6..000000000
--- a/src/main/resources/input/IHW/xsd/register.geostandaarden.nl/IMGEO211-20130329/gmlapplicatieschema/imgeo/2.1.1/imgeo.xsd
+++ /dev/null
@@ -1,1359 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:bri="http://www.opengis.net/citygml/bridge/2.0" xmlns:bui="http://www.opengis.net/citygml/building/2.0" xmlns:cif="http://www.opengis.net/citygml/cityfurniture/2.0" xmlns:cit="http://www.opengis.net/citygml/2.0" xmlns:gml="http://www.opengis.net/gml" xmlns:imgeo="http://www.geostandaarden.nl/imgeo/2.1" xmlns:lu="http://www.opengis.net/citygml/landuse/2.0" xmlns:tra="http://www.opengis.net/citygml/transportation/2.0" xmlns:tun="http://www.opengis.net/citygml/tunnel/2.0" xmlns:veg="http://www.opengis.net/citygml/vegetation/2.0" xmlns:wat="http://www.opengis.net/citygml/waterbody/2.0" elementFormDefault="qualified" targetNamespace="http://www.geostandaarden.nl/imgeo/2.1" version="2.1.1">
-  <import namespace="http://www.opengis.net/citygml/2.0" schemaLocation="http://schemas.opengis.net/citygml/2.0/cityGMLBase.xsd"/>
-  <import namespace="http://www.opengis.net/citygml/bridge/2.0" schemaLocation="http://schemas.opengis.net/citygml/bridge/2.0/bridge.xsd"/>
-  <import namespace="http://www.opengis.net/citygml/building/2.0" schemaLocation="http://schemas.opengis.net/citygml/building/2.0/building.xsd"/>
-  <import namespace="http://www.opengis.net/citygml/cityfurniture/2.0" schemaLocation="http://schemas.opengis.net/citygml/cityfurniture/2.0/cityFurniture.xsd"/>
-  <import namespace="http://www.opengis.net/citygml/landuse/2.0" schemaLocation="http://schemas.opengis.net/citygml/landuse/2.0/landUse.xsd"/>
-  <import namespace="http://www.opengis.net/citygml/transportation/2.0" schemaLocation="http://schemas.opengis.net/citygml/transportation/2.0/transportation.xsd"/>
-  <import namespace="http://www.opengis.net/citygml/tunnel/2.0" schemaLocation="http://schemas.opengis.net/citygml/tunnel/2.0/tunnel.xsd"/>
-  <import namespace="http://www.opengis.net/citygml/vegetation/2.0" schemaLocation="http://schemas.opengis.net/citygml/vegetation/2.0/vegetation.xsd"/>
-  <import namespace="http://www.opengis.net/citygml/waterbody/2.0" schemaLocation="http://schemas.opengis.net/citygml/waterbody/2.0/waterBody.xsd"/>
-  <import namespace="http://www.opengis.net/citygml/relief/2.0" schemaLocation="http://schemas.opengis.net/citygml/relief/2.0/relief.xsd"/>
-  <import namespace="http://www.opengis.net/citygml/generics/2.0" schemaLocation="http://schemas.opengis.net/citygml/generics/2.0/generics.xsd"/>
-  <import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-  <!--XML Schema document created by ShapeChange-->
-  <annotation>
-    <documentation>Erratum 20130329 Correcties (mantis nr) 4068, 4069, 4072, 4073, 4036.</documentation>
-  </annotation>
-  <element name="Straatmeubilair" substitutionGroup="cif:CityFurniture" type="imgeo:StraatmeubilairType">
-    <annotation>
-      <documentation>Een ruimtelijk object ter inrichting van de openbare ruimte.</documentation>
-    </annotation>
-  </element>
-  <complexType name="StraatmeubilairType">
-    <complexContent>
-      <extension base="cif:CityFurnitureType">
-        <sequence>
-          <element minOccurs="0" name="plus-type" type="gml:CodeType">
-            <annotation>
-              <documentation>Het soort straatmeubilair (IMGeo plus-populatie).</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="geometrie2dStraatmeubilair" type="gml:PointPropertyType">
-            <annotation>
-              <documentation>Puntgeometrie.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="lod0GeometrieStraatmeubilair" type="gml:PointPropertyType">
-            <annotation>
-              <documentation>Puntgeometrie in 2.5D op level of detail 0.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="StraatmeubilairPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:Straatmeubilair"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="OpenbareRuimteLabel" substitutionGroup="cit:_CityObject" type="imgeo:OpenbareRuimteLabelType">
-    <annotation>
-      <documentation>Naam en plaatsingspunten van een in de BAG geregistreerde OPENBARE RUIMTE.</documentation>
-    </annotation>
-  </element>
-  <complexType name="OpenbareRuimteLabelType">
-    <complexContent>
-      <extension base="cit:AbstractCityObjectType">
-        <sequence>
-          <element name="identificatieBAGOPR" type="string">
-            <annotation>
-              <documentation>De unieke identificatie van het object zoals is toegekend in de BAG-administratie.</documentation>
-            </annotation>
-          </element>
-          <element name="openbareRuimteNaam" type="imgeo:LabelPropertyType">
-            <annotation>
-              <documentation>Een door het bevoegde gemeentelijke orgaan aan een OPENBARE RUIMTE toegekende benaming.</documentation>
-            </annotation>
-          </element>
-          <element name="openbareRuimteType" type="gml:CodeType">
-            <annotation>
-              <documentation>De aard van de als zodanig benoemde OPENBARE RUIMTE.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="OpenbareRuimteLabelPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:OpenbareRuimteLabel"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="Bak" substitutionGroup="cif:CityFurniture" type="imgeo:BakType">
-    <annotation>
-      <documentation>Object met een permanent karakter dat dient om iets in te bergen of te verzamelen.</documentation>
-    </annotation>
-  </element>
-  <complexType name="BakType">
-    <complexContent>
-      <extension base="cif:CityFurnitureType">
-        <sequence>
-          <element minOccurs="0" name="plus-type" type="gml:CodeType">
-            <annotation>
-              <documentation>Het soort bak (IMGeo plus-populatie).</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="geometrie2dBak" type="gml:PointPropertyType">
-            <annotation>
-              <documentation>Puntgeometrie.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="lod0GeometrieBak" type="gml:PointPropertyType">
-            <annotation>
-              <documentation>Puntgeometrie in 2.5D op level of detail 0.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="BakPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:Bak"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="plus-functieSpoor" substitutionGroup="tra:_GenericApplicationPropertyOfRailway" type="gml:CodeType">
-    <annotation>
-      <documentation>Specificatie van het soort gebruik van het spoor, indien dit een IMGeo uitbreiding van de populatie betreft.</documentation>
-    </annotation>
-  </element>
-  <element name="lod0CurveSpoor" substitutionGroup="tra:_GenericApplicationPropertyOfRailway" type="gml:CurvePropertyType">
-    <annotation>
-      <documentation>Lijngeometrie in 2.5D.</documentation>
-    </annotation>
-  </element>
-  <element name="geometrie2dSpoor" substitutionGroup="tra:_GenericApplicationPropertyOfRailway" type="gml:CurvePropertyType">
-    <annotation>
-      <documentation>Lijngeometrie.</documentation>
-    </annotation>
-  </element>
-  <element name="plus-type" substitutionGroup="veg:_GenericApplicationPropertyOfSolitaryVegetationObject" type="gml:CodeType">
-    <annotation>
-      <documentation>De specificatie van het soort vrijstaand vegetatieobject.</documentation>
-    </annotation>
-  </element>
-  <element name="lod0GeometryVegetatieObject" substitutionGroup="veg:_GenericApplicationPropertyOfSolitaryVegetationObject" type="gml:GeometryPropertyType">
-    <annotation>
-      <documentation>Punt-, lijn-, of vlakgeometrie in 2.5D op level of detail 0.</documentation>
-    </annotation>
-  </element>
-  <element name="geometrie2dVegetatieObject" substitutionGroup="veg:_GenericApplicationPropertyOfSolitaryVegetationObject" type="gml:GeometryPropertyType">
-    <annotation>
-      <documentation>Punt-, lijn-, of vlakgeometrie.</documentation>
-    </annotation>
-  </element>
-  <element name="geometrie2dTunneldeel" substitutionGroup="tun:_GenericApplicationPropertyOfTunnelPart" type="gml:SurfacePropertyType">
-    <annotation>
-      <documentation>Vlakgeometrie.</documentation>
-    </annotation>
-  </element>
-  <element name="lod0GeometrieTunneldeel" substitutionGroup="tun:_GenericApplicationPropertyOfTunnelPart" type="gml:SurfacePropertyType">
-    <annotation>
-      <documentation>Vlakgeometrie in 2.5D op level of detail 0.</documentation>
-    </annotation>
-  </element>
-  <element name="OverigeScheiding" substitutionGroup="imgeo:OverigeConstructie" type="imgeo:OverigeScheidingType">
-    <annotation>
-      <documentation>Kunstmatig, meestal lineair obstakel met een werende functie, met kleinere afmetingen dan toegestaan voor opname in de BGT.</documentation>
-    </annotation>
-  </element>
-  <complexType name="OverigeScheidingType">
-    <complexContent>
-      <extension base="imgeo:OverigeConstructieType">
-        <sequence>
-          <element minOccurs="0" name="plus-type" type="gml:CodeType">
-            <annotation>
-              <documentation>Specificatie van het soort overige scheiding.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="OverigeScheidingPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:OverigeScheiding"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="Scheiding" substitutionGroup="imgeo:OverigeConstructie" type="imgeo:ScheidingType">
-    <annotation>
-      <documentation>Kunstmatig, meestal lineair obstakel met een werende functie.</documentation>
-    </annotation>
-  </element>
-  <complexType name="ScheidingType">
-    <complexContent>
-      <extension base="imgeo:OverigeConstructieType">
-        <sequence>
-          <element name="bgt-type" type="gml:CodeType">
-            <annotation>
-              <documentation>Specificatie van het soort scheiding.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="plus-type" type="gml:CodeType">
-            <annotation>
-              <documentation>Specificatie van het soort scheiding, indien dit een IMGeo uitbreiding van de populatie betreft.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="ScheidingPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:Scheiding"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="Put" substitutionGroup="cif:CityFurniture" type="imgeo:PutType">
-    <annotation>
-      <documentation>Gegraven of geboorde kokervormige diepte waarin zich (vloei)stoffen bevinden.</documentation>
-    </annotation>
-  </element>
-  <complexType name="PutType">
-    <complexContent>
-      <extension base="cif:CityFurnitureType">
-        <sequence>
-          <element minOccurs="0" name="plus-type" type="gml:CodeType">
-            <annotation>
-              <documentation>Het soort put (IMGeo plus-populatie).</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="geometrie2dPut" type="gml:PointPropertyType">
-            <annotation>
-              <documentation>Puntgeometrie.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="lod0GeometriePut" type="gml:PointPropertyType">
-            <annotation>
-              <documentation>Puntgeometrie in 2.5D op level of detail 0.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="PutPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:Put"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="Weginrichtingselement" substitutionGroup="cif:CityFurniture" type="imgeo:WeginrichtingselementType">
-    <annotation>
-      <documentation>Een ruimtelijk object dat dient voor de inrichting van de openbare weg.</documentation>
-    </annotation>
-  </element>
-  <complexType name="WeginrichtingselementType">
-    <complexContent>
-      <extension base="cif:CityFurnitureType">
-        <sequence>
-          <element minOccurs="0" name="plus-type" type="gml:CodeType">
-            <annotation>
-              <documentation>Het soort weginrichtingselement (IMGeo plus-populatie).</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="geometrie2dWeginrichtingselement" type="gml:GeometryPropertyType">
-            <annotation>
-              <documentation>Punt-, lijn of vlakgeometrie.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="lod0GeometrieWeginrichtingselement" type="gml:GeometryPropertyType">
-            <annotation>
-              <documentation>Punt-, lijn- of vlakgeometrie in 2.5D op level of detail 0.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="WeginrichtingselementPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:Weginrichtingselement"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="plus-typeGebouwInstallatie" substitutionGroup="bui:_GenericApplicationPropertyOfBuildingInstallation" type="gml:CodeType">
-    <annotation>
-      <documentation>Specificatie van het soort gebouwinstallatie, indien dit een IMGeo uitbreiding van de populatie betreft.</documentation>
-    </annotation>
-  </element>
-  <element name="lod0GeometryGebouwInstallatie" substitutionGroup="bui:_GenericApplicationPropertyOfBuildingInstallation" type="gml:SurfacePropertyType">
-    <annotation>
-      <documentation>Vlakgeometrie in 2.5D op level of detail 0.</documentation>
-    </annotation>
-  </element>
-  <element name="geometrie2dGebouwInstallatie" substitutionGroup="bui:_GenericApplicationPropertyOfBuildingInstallation" type="gml:SurfacePropertyType">
-    <annotation>
-      <documentation>Vlakgeometrie.</documentation>
-    </annotation>
-  </element>
-  <element name="Waterinrichtingselement" substitutionGroup="cif:CityFurniture" type="imgeo:WaterinrichtingselementType">
-    <annotation>
-      <documentation>Een ruimtelijk object ter inrichting van het water.</documentation>
-    </annotation>
-  </element>
-  <complexType name="WaterinrichtingselementType">
-    <complexContent>
-      <extension base="cif:CityFurnitureType">
-        <sequence>
-          <element minOccurs="0" name="plus-type" type="gml:CodeType">
-            <annotation>
-              <documentation>Het soort waterinrichtingselement (IMGeo plus-populatie).</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="geometrie2dWaterinrichtingselement" type="gml:GeometryPropertyType">
-            <annotation>
-              <documentation>Punt- of lijngeometrie.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="lod0GeometrieWaterinrichtingselement" type="gml:GeometryPropertyType">
-            <annotation>
-              <documentation>Punt- of lijngeometrie in 2.5D op level of detail 0.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="WaterinrichtingselementPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:Waterinrichtingselement"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="OpenbareRuimte" substitutionGroup="imgeo:RegistratiefGebied" type="imgeo:OpenbareRuimteType">
-    <annotation>
-      <documentation>Een OPENBARE RUIMTE is een door het bevoegde gemeentelijke orgaan als zodanig aangewezen en van een naam voorziene buitenruimte die binnen één woonplaats is gelegen.</documentation>
-    </annotation>
-  </element>
-  <complexType name="OpenbareRuimteType">
-    <complexContent>
-      <extension base="imgeo:RegistratiefGebiedType">
-        <sequence>
-          <element minOccurs="0" name="naamEnIdOpenbareRuimte" type="imgeo:OpenbareRuimteLabelPropertyType">
-            <annotation>
-              <documentation>Verwijzing naar het BGT object OpenbareRuimteLabel waarin de BGT identificatie, BAG identificatie, naam en type van de openbare ruimte zijn opgenomen.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="OpenbareRuimtePropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:OpenbareRuimte"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="Stadsdeel" substitutionGroup="imgeo:RegistratiefGebied" type="imgeo:StadsdeelType">
-    <annotation>
-      <documentation>Deel van een stad, wijk.</documentation>
-    </annotation>
-  </element>
-  <complexType name="StadsdeelType">
-    <complexContent>
-      <extension base="imgeo:RegistratiefGebiedType">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="StadsdeelPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:Stadsdeel"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="hoortBijTypeOverbrugging" substitutionGroup="bri:_GenericApplicationPropertyOfBridgeConstructionElement" type="gml:CodeType">
-    <annotation>
-      <documentation>Nadere classificatie van de overbrugging waar het overbruggingsdeel een onderdeel van is.</documentation>
-    </annotation>
-  </element>
-  <element name="overbruggingIsBeweegbaar" substitutionGroup="bri:_GenericApplicationPropertyOfBridgeConstructionElement" type="boolean">
-    <annotation>
-      <documentation>Aanduiding of de brug waar het overbruggingsdeel bij hoort al dan niet beweegbaar is.</documentation>
-    </annotation>
-  </element>
-  <element name="geometrie2dOverbruggingsdeel" substitutionGroup="bri:_GenericApplicationPropertyOfBridgeConstructionElement" type="gml:SurfacePropertyType">
-    <annotation>
-      <documentation>Vlakgeometrie.</documentation>
-    </annotation>
-  </element>
-  <element name="lod0GeometrieOverbruggingsdeel" substitutionGroup="bri:_GenericApplicationPropertyOfBridgeConstructionElement" type="gml:SurfacePropertyType">
-    <annotation>
-      <documentation>Vlakgeometrie in 2.5D op level of detail 0.</documentation>
-    </annotation>
-  </element>
-  <element abstract="true" name="OverigeConstructie" substitutionGroup="cit:_Site" type="imgeo:OverigeConstructieType">
-    <annotation>
-      <documentation>Abstract objecttype zijnde een gebouwd object dat niet valt onder de definitie van NEN 3610 Gebouw.</documentation>
-    </annotation>
-  </element>
-  <complexType abstract="true" name="OverigeConstructieType">
-    <complexContent>
-      <extension base="cit:AbstractSiteType">
-        <sequence>
-          <element minOccurs="0" name="lod3ImplicitRepresentation" type="cit:ImplicitRepresentationPropertyType">
-            <annotation>
-              <documentation>Link naar een prototypische geometrie op level of detail 3, die wordt hergebruikt elke keer als een dergelijk object voorkomt.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="lod1ImplicitRepresentation" type="cit:ImplicitRepresentationPropertyType">
-            <annotation>
-              <documentation>Link naar een prototypische geometrie op level of detail 1, die wordt hergebruikt elke keer als een dergelijk object voorkomt.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="lod2ImplicitRepresentation" type="cit:ImplicitRepresentationPropertyType">
-            <annotation>
-              <documentation>Link naar een prototypische geometrie op level of detail 2, die wordt hergebruikt elke keer als een dergelijk object voorkomt.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="lod0ImplicitRepresentation" type="cit:ImplicitRepresentationPropertyType">
-            <annotation>
-              <documentation>Link naar een prototypische geometrie op level of detail 0, die wordt hergebruikt elke keer als een dergelijk object voorkomt.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="lod0Geometry" type="gml:GeometryPropertyType">
-            <annotation>
-              <documentation>Punt-, lijn- of vlakgeometrie in 2.5D.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="lod3Geometry" type="gml:GeometryPropertyType">
-            <annotation>
-              <documentation>3D geometrie op level of detail 3.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="lod1Geometry" type="gml:GeometryPropertyType">
-            <annotation>
-              <documentation>3D geometrie op level of detail 1.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="lod2Geometry" type="gml:GeometryPropertyType">
-            <annotation>
-              <documentation>3D geometrie op level of detail 2.</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="geometrie2dOverigeConstructie" type="gml:GeometryPropertyType">
-            <annotation>
-              <documentation>Punt-, lijn-, vlak- of multivlakgeometrie.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="OverigeConstructiePropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:OverigeConstructie"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="Labelpositie" substitutionGroup="gml:_Object" type="imgeo:LabelpositieType">
-    <annotation>
-      <documentation>Locatie waar een label ten behoeve van visualisatie moet worden afgebeeld.</documentation>
-    </annotation>
-  </element>
-  <complexType name="LabelpositieType">
-    <sequence>
-      <element name="plaatsingspunt" type="gml:PointPropertyType">
-        <annotation>
-          <documentation>Coördinaten voor de locatie waar het label moet worden getoond.</documentation>
-        </annotation>
-      </element>
-      <element name="hoek" type="double">
-        <annotation>
-          <documentation>De rotatie van het label bij visualisatie, met de klok mee ten opzichte van de normale tekstrichting.</documentation>
-        </annotation>
-      </element>
-    </sequence>
-  </complexType>
-  <complexType name="LabelpositiePropertyType">
-    <sequence>
-      <element ref="imgeo:Labelpositie"/>
-    </sequence>
-  </complexType>
-  <element name="Waterdeel" substitutionGroup="wat:WaterBody" type="imgeo:WaterdeelType">
-    <annotation>
-      <documentation>Kleinste functioneel onafhankelijk stukje water met gelijkblijvende, homogene eigenschappen en relaties dat er binnen het objecttype Water van NEN 3610 wordt onderscheiden en dat permanent met water bedekt is.</documentation>
-    </annotation>
-  </element>
-  <complexType name="WaterdeelType">
-    <complexContent>
-      <extension base="wat:WaterBodyType">
-        <sequence>
-          <element minOccurs="0" name="plus-type" type="gml:CodeType">
-            <annotation>
-              <documentation>Specificatie van het soort Water, nadere classificatie.</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="geometrie2dWaterdeel" type="gml:SurfacePropertyType">
-            <annotation>
-              <documentation>Vlakgeometrie.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="WaterdeelPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:Waterdeel"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="Waterschap" substitutionGroup="imgeo:RegistratiefGebied" type="imgeo:WaterschapType">
-    <annotation>
-      <documentation>Regionaal gebied onder het bestuur van een overheidsinstantie (waterschap) die tot taak heeft de waterhuishouding in dit gebied te regelen.</documentation>
-    </annotation>
-  </element>
-  <complexType name="WaterschapType">
-    <complexContent>
-      <extension base="imgeo:RegistratiefGebiedType">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="WaterschapPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:Waterschap"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="Label" substitutionGroup="gml:_Object" type="imgeo:LabelType">
-    <annotation>
-      <documentation>Een samengesteld attribuut voor verwijzing naar een te plaatsen labeltekst en positie daarvan.</documentation>
-    </annotation>
-  </element>
-  <complexType name="LabelType">
-    <sequence>
-      <element name="tekst" type="string">
-        <annotation>
-          <documentation>Tekst voor het label.</documentation>
-        </annotation>
-      </element>
-      <element maxOccurs="unbounded" name="positie" type="imgeo:LabelpositiePropertyType">
-        <annotation>
-          <documentation>Labelpositie, samengesteld uit plaatsingspunt en rotatiehoek.</documentation>
-        </annotation>
-      </element>
-    </sequence>
-  </complexType>
-  <complexType name="LabelPropertyType">
-    <sequence>
-      <element ref="imgeo:Label"/>
-    </sequence>
-  </complexType>
-  <element name="Paal" substitutionGroup="cif:CityFurniture" type="imgeo:PaalType">
-    <annotation>
-      <documentation>Langwerpig stuk hout, ijzer, steen enz., dat in de grond staat.</documentation>
-    </annotation>
-  </element>
-  <complexType name="PaalType">
-    <complexContent>
-      <extension base="cif:CityFurnitureType">
-        <sequence>
-          <element minOccurs="0" name="hectometeraanduiding" type="string">
-            <annotation>
-              <documentation>Code van de paal die kan worden gebruikt voor afstandsaanduiding, zoals bij hectometerpaaltjes en dijkpalen.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="plus-type" type="gml:CodeType">
-            <annotation>
-              <documentation>Het soort paal (IMGeo plus-populatie).</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="geometrie2dPaal" type="gml:PointPropertyType">
-            <annotation>
-              <documentation>Puntgeometrie.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="lod0GeometriePaal" type="gml:PointPropertyType">
-            <annotation>
-              <documentation>Puntgeometrie in 2.5D op level of detail 0.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="PaalPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:Paal"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="begroeidTerreindeelOpTalud" substitutionGroup="veg:_GenericApplicationPropertyOfPlantCover" nillable="true">
-    <annotation>
-      <documentation>Indicatie of het object wel of niet op een hellend vlak ligt.</documentation>
-    </annotation>
-    <complexType>
-      <simpleContent>
-        <extension base="boolean">
-          <attribute name="nilReason" type="gml:NullType"/>
-        </extension>
-      </simpleContent>
-    </complexType>
-  </element>
-  <element name="plus-fysiekVoorkomen" substitutionGroup="veg:_GenericApplicationPropertyOfPlantCover" type="gml:CodeType">
-    <annotation>
-      <documentation>Nadere classificatie van het vegetatiedek, ingedeeld naar soort vegetatie.</documentation>
-    </annotation>
-  </element>
-  <element name="lod0MultiSurfaceBegroeidTerreindeel" substitutionGroup="veg:_GenericApplicationPropertyOfPlantCover" type="gml:MultiSurfacePropertyType">
-    <annotation>
-      <documentation>Multivlakgeometrie in 2.5D.</documentation>
-    </annotation>
-  </element>
-  <element name="geometrie2dBegroeidTerreindeel" substitutionGroup="veg:_GenericApplicationPropertyOfPlantCover" type="gml:SurfacePropertyType">
-    <annotation>
-      <documentation>Vlakgeometrie.</documentation>
-    </annotation>
-  </element>
-  <element name="kruinlijnBegroeidTerreindeel" substitutionGroup="veg:_GenericApplicationPropertyOfPlantCover" nillable="true">
-    <annotation>
-      <documentation>Lijngeometrie van de hoogstgelegen begrenzing van een kunstmatig aangelegd en onderhouden helling.</documentation>
-    </annotation>
-    <complexType>
-      <complexContent>
-        <extension base="gml:CurvePropertyType">
-          <attribute name="nilReason" type="gml:NullType"/>
-        </extension>
-      </complexContent>
-    </complexType>
-  </element>
-  <element name="Kunstwerkdeel" substitutionGroup="imgeo:OverigeConstructie" type="imgeo:KunstwerkdeelType">
-    <annotation>
-      <documentation>Onderdeel van een civiel-technisch werk voor de infrastructuur van wegen, water, spoorbanen, waterkeringen en/of leidingen.</documentation>
-    </annotation>
-  </element>
-  <complexType name="KunstwerkdeelType">
-    <complexContent>
-      <extension base="imgeo:OverigeConstructieType">
-        <sequence>
-          <element name="bgt-type" type="gml:CodeType">
-            <annotation>
-              <documentation>Specificatie van het soort kunstwerk.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="plus-type" type="gml:CodeType">
-            <annotation>
-              <documentation>Specificatie van het soort kunstwerk, indien dit een IMGeo uitbreiding van de populatie betreft.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="KunstwerkdeelPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:Kunstwerkdeel"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="plus-functieWegdeel" substitutionGroup="tra:_GenericApplicationPropertyOfTrafficArea" type="gml:CodeType">
-    <annotation>
-      <documentation>Specificatie van het hoofdgebruiksdoel van het wegdeel, nadere classificatie.</documentation>
-    </annotation>
-  </element>
-  <element name="wegdeelOpTalud" substitutionGroup="tra:_GenericApplicationPropertyOfTrafficArea" nillable="true">
-    <annotation>
-      <documentation>Indicatie of het object wel of niet op een hellend vlak ligt.</documentation>
-    </annotation>
-    <complexType>
-      <simpleContent>
-        <extension base="boolean">
-          <attribute name="nilReason" type="gml:NullType"/>
-        </extension>
-      </simpleContent>
-    </complexType>
-  </element>
-  <element name="plus-fysiekVoorkomenWegdeel" substitutionGroup="tra:_GenericApplicationPropertyOfTrafficArea" type="gml:CodeType">
-    <annotation>
-      <documentation>Mate waarin het wegdeel al of niet verhard is, nadere classificatie.</documentation>
-    </annotation>
-  </element>
-  <element name="kruinlijnWegdeel" substitutionGroup="tra:_GenericApplicationPropertyOfTrafficArea" nillable="true">
-    <annotation>
-      <documentation>Lijngeometrie van de hoogstgelegen begrenzing van een kunstmatig aangelegd en onderhouden helling.</documentation>
-    </annotation>
-    <complexType>
-      <complexContent>
-        <extension base="gml:CurvePropertyType">
-          <attribute name="nilReason" type="gml:NullType"/>
-        </extension>
-      </complexContent>
-    </complexType>
-  </element>
-  <element name="lod0SurfaceWegdeel" substitutionGroup="tra:_GenericApplicationPropertyOfTrafficArea" type="gml:SurfacePropertyType">
-    <annotation>
-      <documentation>Vlakgeometrie in 2.5D.</documentation>
-    </annotation>
-  </element>
-  <element name="geometrie2dWegdeel" substitutionGroup="tra:_GenericApplicationPropertyOfTrafficArea" type="gml:SurfacePropertyType">
-    <annotation>
-      <documentation>Vlakgeometrie.</documentation>
-    </annotation>
-  </element>
-  <element name="NEN3610ID" substitutionGroup="gml:_Object" type="imgeo:NEN3610IDType">
-    <annotation>
-      <documentation>Identificatiegegevens voor de universeel unieke identificatie van een object.</documentation>
-    </annotation>
-  </element>
-  <complexType name="NEN3610IDType">
-    <sequence>
-      <element name="namespace" type="string">
-        <annotation>
-          <documentation>Unieke verwijzing naar een registratie van objecten.</documentation>
-        </annotation>
-      </element>
-      <element name="lokaalID" type="string">
-        <annotation>
-          <documentation>Unieke identificatiecode binnen een registratie.</documentation>
-        </annotation>
-      </element>
-    </sequence>
-  </complexType>
-  <complexType name="NEN3610IDPropertyType">
-    <sequence>
-      <element ref="imgeo:NEN3610ID"/>
-    </sequence>
-  </complexType>
-  <element name="Wijk" substitutionGroup="imgeo:RegistratiefGebied" type="imgeo:WijkType">
-    <annotation>
-      <documentation>Een aaneengesloten gedeelte van het grondgebied van een gemeente, waarvan de grenzen zoveel mogelijk zijn gebaseerd op sociaalgeografische kenmerken.</documentation>
-    </annotation>
-  </element>
-  <complexType name="WijkType">
-    <complexContent>
-      <extension base="imgeo:RegistratiefGebiedType">
-        <sequence>
-          <element name="wijkcode" type="string">
-            <annotation>
-              <documentation>De code behorende bij de naam van de wijk.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="stadsdeel" type="imgeo:StadsdeelPropertyType">
-            <annotation>
-              <documentation>Het stadsdeel waarin de wijk gelegen is.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="WijkPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:Wijk"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="identificatieBAGPND" substitutionGroup="bui:_GenericApplicationPropertyOfBuildingPart" type="string">
-    <annotation>
-      <documentation>De unieke identificatie van het object zoals is toegekend in de BAG-administratie.</documentation>
-    </annotation>
-  </element>
-  <element name="nummeraanduidingreeks" substitutionGroup="bui:_GenericApplicationPropertyOfBuildingPart" type="imgeo:NummeraanduidingreeksPropertyType">
-    <annotation>
-      <documentation>Bevat de reeks nummeraanduidingen behorend bij het pand ten behoeve van visualisatie.</documentation>
-    </annotation>
-  </element>
-  <element name="geometrie2dGrondvlak" substitutionGroup="bui:_GenericApplicationPropertyOfBuildingPart" type="gml:MultiSurfacePropertyType">
-    <annotation>
-      <documentation>Vlakgeometrie grondvlak.</documentation>
-    </annotation>
-  </element>
-  <element name="Mast" substitutionGroup="cif:CityFurniture" type="imgeo:MastType">
-    <annotation>
-      <documentation>Hoge draagconstructie.</documentation>
-    </annotation>
-  </element>
-  <complexType name="MastType">
-    <complexContent>
-      <extension base="cif:CityFurnitureType">
-        <sequence>
-          <element minOccurs="0" name="plus-type" type="gml:CodeType">
-            <annotation>
-              <documentation>Het soort mast (IMGeo plus-populatie).</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="geometrie2dMast" type="gml:PointPropertyType">
-            <annotation>
-              <documentation>Puntgeometrie.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="lod0GeometrieMast" type="gml:PointPropertyType">
-            <annotation>
-              <documentation>Puntgeometrie in 2.5D op level of detail 0.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MastPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:Mast"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="OverigBouwwerk" substitutionGroup="imgeo:OverigeConstructie" type="imgeo:OverigBouwwerkType">
-    <annotation>
-      <documentation>Met de aarde verbonden duurzaam bouwwerk, dat niet valt onder de definities van een pand of kunstwerk.</documentation>
-    </annotation>
-  </element>
-  <complexType name="OverigBouwwerkType">
-    <complexContent>
-      <extension base="imgeo:OverigeConstructieType">
-        <sequence>
-          <element name="bgt-type" type="gml:CodeType">
-            <annotation>
-              <documentation>Specificatie van het soort overig bouwwerk.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="plus-type" type="gml:CodeType">
-            <annotation>
-              <documentation>Specificatie van het soort overig bouwwerk, indien dit een IMGeo uitbreiding van de populatie betreft.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="OverigBouwwerkPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:OverigBouwwerk"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="Plaatsbepalingspunt" substitutionGroup="gml:_Feature" type="imgeo:PlaatsbepalingspuntType">
-    <annotation>
-      <documentation>Punt dat is ingemeten en vervolgens gebruikt is bij en onderdeel uitmaakt van de begrenzing van BGT objecten.</documentation>
-    </annotation>
-  </element>
-  <complexType name="PlaatsbepalingspuntType">
-    <complexContent>
-      <extension base="gml:AbstractFeatureType">
-        <sequence>
-          <element name="identificatie" type="imgeo:NEN3610IDPropertyType">
-            <annotation>
-              <documentation>Uniek identificatienummer voor het object dat onveranderlijk is zolang het object bestaat.</documentation>
-            </annotation>
-          </element>
-          <element name="nauwkeurigheid" nillable="true">
-            <annotation>
-              <documentation>Gerealiseerde geometrische nauwkeurigheid van de geometrie van het object ten opzichte van de werkelijkheid, uitgedrukt in centimeters.</documentation>
-            </annotation>
-            <complexType>
-              <simpleContent>
-                <extension base="integer">
-                  <attribute name="nilReason" type="gml:NullType"/>
-                </extension>
-              </simpleContent>
-            </complexType>
-          </element>
-          <element name="datumInwinning" type="date">
-            <annotation>
-              <documentation>Datum waarop het punt is ingewonnen.</documentation>
-            </annotation>
-          </element>
-          <element name="inwinnendeInstantie" nillable="true">
-            <annotation>
-              <documentation>De organisatie die namens de bronhouder het object inwint.</documentation>
-            </annotation>
-            <complexType>
-              <simpleContent>
-                <extension base="string">
-                  <attribute name="nilReason" type="gml:NullType"/>
-                </extension>
-              </simpleContent>
-            </complexType>
-          </element>
-          <element name="inwinningsmethode" type="gml:CodeType">
-            <annotation>
-              <documentation>De wijze waarop het punt is ingewonnen.</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="geometrie" type="gml:PointPropertyType">
-            <annotation>
-              <documentation>Puntgeometrie.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="PlaatsbepalingspuntPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:Plaatsbepalingspunt"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="Sensor" substitutionGroup="cif:CityFurniture" type="imgeo:SensorType">
-    <annotation>
-      <documentation>Apparaat voor de meting van een fysieke grootheid (bijv. temperatuur, licht, druk, elektriciteit).</documentation>
-    </annotation>
-  </element>
-  <complexType name="SensorType">
-    <complexContent>
-      <extension base="cif:CityFurnitureType">
-        <sequence>
-          <element minOccurs="0" name="plus-type" type="gml:CodeType">
-            <annotation>
-              <documentation>Het soort sensor (IMGeo plus-populatie).</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="geometrie2dSensor" type="gml:GeometryPropertyType">
-            <annotation>
-              <documentation>Punt- of lijngeometrie.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="lod0GeometrieSensor" type="gml:GeometryPropertyType">
-            <annotation>
-              <documentation>Punt- of lijngeometrie in 2.5D op level of detail 0.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="SensorPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:Sensor"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="OnbegroeidTerreindeel" substitutionGroup="lu:LandUse" type="imgeo:OnbegroeidTerreindeelType">
-    <annotation>
-      <documentation>Kleinste functioneel onafhankelijk stukje van een terrein, dat er binnen het objecttype Terrein van NEN 3610 wordt onderscheiden, zonder aaneengesloten vegetatie.</documentation>
-    </annotation>
-  </element>
-  <complexType name="OnbegroeidTerreindeelType">
-    <complexContent>
-      <extension base="lu:LandUseType">
-        <sequence>
-          <element name="bgt-fysiekVoorkomen" type="gml:CodeType">
-            <annotation>
-              <documentation>Classificatie van het soort terrein, ingedeeld naar de uiterlijke verschijningsvorm.</documentation>
-            </annotation>
-          </element>
-          <element default="false" name="onbegroeidTerreindeelOpTalud" nillable="true">
-            <annotation>
-              <documentation>Indicatie of het object wel of niet op een hellend vlak ligt.</documentation>
-            </annotation>
-            <complexType>
-              <simpleContent>
-                <extension base="boolean">
-                  <attribute name="nilReason" type="gml:NullType"/>
-                </extension>
-              </simpleContent>
-            </complexType>
-          </element>
-          <element minOccurs="0" name="plus-fysiekVoorkomen" type="gml:CodeType">
-            <annotation>
-              <documentation>Nadere classificatie van het soort terrein, ingedeeld naar de uiterlijke verschijningsvorm.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="kruinlijnOnbegroeidTerreindeel" nillable="true">
-            <annotation>
-              <documentation>Lijngeometrie van de hoogstgelegen begrenzing van een kunstmatig aangelegd en onderhouden helling.</documentation>
-            </annotation>
-            <complexType>
-              <complexContent>
-                <extension base="gml:CurvePropertyType">
-                  <attribute name="nilReason" type="gml:NullType"/>
-                </extension>
-              </complexContent>
-            </complexType>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="geometrie2dOnbegroeidTerreindeel" type="gml:SurfacePropertyType">
-            <annotation>
-              <documentation>Vlakgeometrie.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="OnbegroeidTerreindeelPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:OnbegroeidTerreindeel"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="Kast" substitutionGroup="cif:CityFurniture" type="imgeo:KastType">
-    <annotation>
-      <documentation>Object met een permanent karakter dat dient om iets in te bergen en te beschermen.</documentation>
-    </annotation>
-  </element>
-  <complexType name="KastType">
-    <complexContent>
-      <extension base="cif:CityFurnitureType">
-        <sequence>
-          <element minOccurs="0" name="plus-type" type="gml:CodeType">
-            <annotation>
-              <documentation>Het soort kast (IMGeo plus-populatie).</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="geometrie2dKast" type="gml:PointPropertyType">
-            <annotation>
-              <documentation>Puntgeometrie.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="lod0GeometrieKast" type="gml:PointPropertyType">
-            <annotation>
-              <documentation>Puntgeometrie in 2.5D op level of detail 0.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="KastPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:Kast"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="OngeclassificeerdObject" substitutionGroup="cit:_CityObject" type="imgeo:OngeclassificeerdObjectType">
-    <annotation>
-      <documentation>Object waarvoor geen bronhouder aangewezen is en/of dat niet nader is geclassificeerd.</documentation>
-    </annotation>
-  </element>
-  <complexType name="OngeclassificeerdObjectType">
-    <complexContent>
-      <extension base="cit:AbstractCityObjectType">
-        <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="geometrie2d" type="gml:SurfacePropertyType">
-            <annotation>
-              <documentation>Vlakgeometrie.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="OngeclassificeerdObjectPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:OngeclassificeerdObject"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element abstract="true" name="RegistratiefGebied" substitutionGroup="lu:LandUse" type="imgeo:RegistratiefGebiedType">
-    <annotation>
-      <documentation>Op basis van wet- of regelgeving afgebakend gebied dat als eenheid geldt van politiek/bestuurlijke verantwoordelijkheid of voor bedrijfsvoering.</documentation>
-    </annotation>
-  </element>
-  <complexType abstract="true" name="RegistratiefGebiedType">
-    <complexContent>
-      <extension base="lu:LandUseType">
-        <sequence>
-          <element minOccurs="0" name="naam" type="gml:CodeType">
-            <annotation>
-              <documentation>De benaming van het registratieve gebied.</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="geometrie2d" type="gml:MultiSurfacePropertyType">
-            <annotation>
-              <documentation>Multivlakgeometrie.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="RegistratiefGebiedPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:RegistratiefGebied"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="ondersteunendWegdeelOpTalud" substitutionGroup="tra:_GenericApplicationPropertyOfAuxiliaryTrafficArea" nillable="true">
-    <annotation>
-      <documentation>Indicatie of het object wel of niet op een hellend vlak ligt.</documentation>
-    </annotation>
-    <complexType>
-      <simpleContent>
-        <extension base="boolean">
-          <attribute name="nilReason" type="gml:NullType"/>
-        </extension>
-      </simpleContent>
-    </complexType>
-  </element>
-  <element name="plus-functieOndersteunendWegdeel" substitutionGroup="tra:_GenericApplicationPropertyOfAuxiliaryTrafficArea" type="gml:CodeType">
-    <annotation>
-      <documentation>Specificatie van het soort ondersteunend wegdeel, nadere classificatie.</documentation>
-    </annotation>
-  </element>
-  <element name="plus-fysiekVoorkomenOndersteunendWegdeel" substitutionGroup="tra:_GenericApplicationPropertyOfAuxiliaryTrafficArea" type="gml:CodeType">
-    <annotation>
-      <documentation>Mate waarin het ondersteunend wegdeel al of niet verhard is, nadere classificatie.</documentation>
-    </annotation>
-  </element>
-  <element name="kruinlijnOndersteunendWegdeel" substitutionGroup="tra:_GenericApplicationPropertyOfAuxiliaryTrafficArea" nillable="true">
-    <annotation>
-      <documentation>Lijngeometrie van de hoogstgelegen begrenzing van een kunstmatig aangelegd en onderhouden helling.</documentation>
-    </annotation>
-    <complexType>
-      <complexContent>
-        <extension base="gml:CurvePropertyType">
-          <attribute name="nilReason" type="gml:NullType"/>
-        </extension>
-      </complexContent>
-    </complexType>
-  </element>
-  <element name="lod0SurfaceOndersteunendWegdeel" substitutionGroup="tra:_GenericApplicationPropertyOfAuxiliaryTrafficArea" type="gml:SurfacePropertyType">
-    <annotation>
-      <documentation>Vlakgeometrie in 2.5D.</documentation>
-    </annotation>
-  </element>
-  <element name="geometrie2dOndersteunendWegdeel" substitutionGroup="tra:_GenericApplicationPropertyOfAuxiliaryTrafficArea" type="gml:SurfacePropertyType">
-    <annotation>
-      <documentation>Vlakgeometrie.</documentation>
-    </annotation>
-  </element>
-  <element name="Installatie" substitutionGroup="cif:CityFurniture" type="imgeo:InstallatieType">
-    <annotation>
-      <documentation>Samenhangend systeem dat een bepaald doel dient.</documentation>
-    </annotation>
-  </element>
-  <complexType name="InstallatieType">
-    <complexContent>
-      <extension base="cif:CityFurnitureType">
-        <sequence>
-          <element minOccurs="0" name="plus-type" type="gml:CodeType">
-            <annotation>
-              <documentation>Het soort installatie (IMGeo plus-populatie).</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="geometrie2dInstallatie" type="gml:PointPropertyType">
-            <annotation>
-              <documentation>Puntgeometrie.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="lod0GeometrieInstallatie" type="gml:PointPropertyType">
-            <annotation>
-              <documentation>Puntgeometrie in 2.5D op level of detail 0.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="InstallatiePropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:Installatie"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="Bord" substitutionGroup="cif:CityFurniture" type="imgeo:BordType">
-    <annotation>
-      <documentation>Een paneel waarop informatie wordt afgebeeld.</documentation>
-    </annotation>
-  </element>
-  <complexType name="BordType">
-    <complexContent>
-      <extension base="cif:CityFurnitureType">
-        <sequence>
-          <element minOccurs="0" name="plus-type" type="gml:CodeType">
-            <annotation>
-              <documentation>Het soort bord (IMGeo plus-populatie).</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="geometrie2dBord" type="gml:PointPropertyType">
-            <annotation>
-              <documentation>Puntgeometrie.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="lod0GeometrieBord" type="gml:PointPropertyType">
-            <annotation>
-              <documentation>Puntgeometrie in 2.5D op level of detail 0.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="BordPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:Bord"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="Buurt" substitutionGroup="imgeo:RegistratiefGebied" type="imgeo:BuurtType">
-    <annotation>
-      <documentation>Een aaneengesloten gedeelte van een wijk, waarvan de grenzen zoveel mogelijk zijn gebaseerd op topografische elementen.</documentation>
-    </annotation>
-  </element>
-  <complexType name="BuurtType">
-    <complexContent>
-      <extension base="imgeo:RegistratiefGebiedType">
-        <sequence>
-          <element name="buurtcode" type="string">
-            <annotation>
-              <documentation>De code behorende bij de naam van de buurt.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="wijk" type="imgeo:WijkPropertyType">
-            <annotation>
-              <documentation>De wijk waarin de buurt gelegen is.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="BuurtPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:Buurt"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="OndersteunendWaterdeel" substitutionGroup="wat:WaterBody" type="imgeo:OndersteunendWaterdeelType">
-    <annotation>
-      <documentation>Object dat in het kader van de waterhuishouding periodiek gedeeltelijk of geheel met water is bedekt.</documentation>
-    </annotation>
-  </element>
-  <complexType name="OndersteunendWaterdeelType">
-    <complexContent>
-      <extension base="wat:WaterBodyType">
-        <sequence>
-          <element minOccurs="0" name="plus-type" type="gml:CodeType">
-            <annotation>
-              <documentation>Specificatie van het soort Water, nadere classificatie.</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="geometrie2dOndersteunendWaterdeel" type="gml:SurfacePropertyType">
-            <annotation>
-              <documentation>Vlakgeometrie.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="OndersteunendWaterdeelPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:OndersteunendWaterdeel"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-  <element name="identificatie" substitutionGroup="cit:_GenericApplicationPropertyOfCityObject" type="imgeo:NEN3610IDPropertyType">
-    <annotation>
-      <documentation>Uniek identificatienummer voor het object dat onveranderlijk is zolang het object bestaat.</documentation>
-    </annotation>
-  </element>
-  <element name="tijdstipRegistratie" substitutionGroup="cit:_GenericApplicationPropertyOfCityObject" type="dateTime">
-    <annotation>
-      <documentation>Tijdstip waarop deze instantie van het object is opgenomen door de bronhouder.</documentation>
-    </annotation>
-  </element>
-  <element name="eindRegistratie" substitutionGroup="cit:_GenericApplicationPropertyOfCityObject" type="dateTime">
-    <annotation>
-      <documentation>Eind van de periode waarop deze instantie van het object geldig is bij de bronhouder. Wanneer deze waarde niet is ingevuld is de instantie nog geldig.</documentation>
-    </annotation>
-  </element>
-  <element name="LV-publicatiedatum" substitutionGroup="cit:_GenericApplicationPropertyOfCityObject" type="dateTime">
-    <annotation>
-      <documentation>Tijdstip waarop deze instantie van het object is opgenomen in de landelijke voorziening.</documentation>
-    </annotation>
-  </element>
-  <element name="bronhouder" substitutionGroup="cit:_GenericApplicationPropertyOfCityObject" type="string">
-    <annotation>
-      <documentation>De bronhoudercode van het object.</documentation>
-    </annotation>
-  </element>
-  <element name="inOnderzoek" substitutionGroup="cit:_GenericApplicationPropertyOfCityObject" type="boolean">
-    <annotation>
-      <documentation>Een aanduiding waarmee wordt aangegeven dat een onderzoek wordt uitgevoerd naar de juistheid van een of meer gegevens van het betreffende object.</documentation>
-    </annotation>
-  </element>
-  <element name="relatieveHoogteligging" substitutionGroup="cit:_GenericApplicationPropertyOfCityObject" type="integer">
-    <annotation>
-      <documentation>Aanduiding voor de relatieve hoogte van het object</documentation>
-    </annotation>
-  </element>
-  <element name="bgt-status" substitutionGroup="cit:_GenericApplicationPropertyOfCityObject" type="gml:CodeType">
-    <annotation>
-      <documentation>De status gekoppeld aan de levenscyclus van een geo-object</documentation>
-    </annotation>
-  </element>
-  <element name="plus-status" substitutionGroup="cit:_GenericApplicationPropertyOfCityObject" type="gml:CodeType">
-    <annotation>
-      <documentation>De status gekoppeld aan de levenscyclus van een geo-object, indien dit een uitbreiding van de populatie betreft.</documentation>
-    </annotation>
-  </element>
-  <element name="Nummeraanduidingreeks" substitutionGroup="gml:_Object" type="imgeo:NummeraanduidingreeksType">
-    <annotation>
-      <documentation>Samengesteld attribuut ten behoeve van opname van een reeks nummeraanduidingen van verblijfsobjecten in een pand.</documentation>
-    </annotation>
-  </element>
-  <complexType name="NummeraanduidingreeksType">
-    <sequence>
-      <element name="nummeraanduidingreeks" type="imgeo:LabelPropertyType">
-        <annotation>
-          <documentation>Bevat de reeks nummeraanduidingen behorend bij het pand ten behoeve van visualisatie.</documentation>
-        </annotation>
-      </element>
-      <element name="identificatieBAGVBOLaagsteHuisnummer" type="string">
-        <annotation>
-          <documentation>Identificatie in de BAG registratie van het verblijfsobject met het laagste huisnummer behorende tot de reeks.</documentation>
-        </annotation>
-      </element>
-      <element minOccurs="0" name="identificatieBAGVBOHoogsteHuisnummer" type="string">
-        <annotation>
-          <documentation>Identificatie in de BAG registratie van het verblijfsobject met het hoogste huisnummer behorende tot de reeks.</documentation>
-        </annotation>
-      </element>
-    </sequence>
-  </complexType>
-  <complexType name="NummeraanduidingreeksPropertyType">
-    <sequence>
-      <element ref="imgeo:Nummeraanduidingreeks"/>
-    </sequence>
-  </complexType>
-  <element name="FunctioneelGebied" substitutionGroup="lu:LandUse" type="imgeo:FunctioneelGebiedType">
-    <annotation>
-      <documentation>Begrensd en benoemd gebied dat door een functionele eenheid beschreven wordt.</documentation>
-    </annotation>
-  </element>
-  <complexType name="FunctioneelGebiedType">
-    <complexContent>
-      <extension base="lu:LandUseType">
-        <sequence>
-          <element name="bgt-type" type="gml:CodeType">
-            <annotation>
-              <documentation>Specificatie van het soort Functioneel Gebied.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="plus-type" type="gml:CodeType">
-            <annotation>
-              <documentation>Specificatie van het soort Functioneel Gebied, indien het een IMGeo uitbreiding van de populatie betreft.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="naam" type="gml:CodeType">
-            <annotation>
-              <documentation>De benaming van het functionele gebied.</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="geometrie2dFunctioneelGebied" type="gml:SurfacePropertyType">
-            <annotation>
-              <documentation>Vlakgeometrie.</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="FunctioneelGebiedPropertyType">
-    <sequence minOccurs="0">
-      <element ref="imgeo:FunctioneelGebied"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-</schema>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/cat.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/cat.png
deleted file mode 100644
index 1758a16fb..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/cat.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/cat.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/cat.xsd
deleted file mode 100644
index abfff4ab6..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/cat.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0" 
-  xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/cat/1.0" version="1.0">
-  <annotation>
-    <documentation>catalogue is a collection of  information items (CT_Items) that are managed using a registry (CT_Catalogue). The abstract concept of catalogue was defined in ISO19139 to harmonise the different ISO 19100 series catalogue concepts, such as PF_PortrayalCatalogue (ISO 19117) and FC_FeatureCatalogue (ISO 19110).</documentation>
-  </annotation>
-  <include schemaLocation="catalogues.xsd"/>
-  <include schemaLocation="codelistItem.xsd"/>
-  <include schemaLocation="crsItem.xsd"/>
-  <include schemaLocation="uomItem.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/lan/1.0" schemaLocation="../../../../19115/-3/lan/1.0/lan.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/cat.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/cat.zip
deleted file mode 100644
index 185f7d7c6..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/cat.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/catalogues.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/catalogues.xsd
deleted file mode 100644
index ebe8f22c3..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/catalogues.xsd
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/cat/1.0" version="1.0">
-  <annotation>
-    <documentation>Handcrafted</documentation>
-  </annotation>
-  <include schemaLocation="cat.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/lan/1.0" schemaLocation="../../../../19115/-3/lan/1.0/lan.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element abstract="true" name="AbstractCT_Catalogue" substitutionGroup="gco:AbstractObject" type="cat:AbstractCT_Catalogue_Type"/>
-  <complexType abstract="true" name="AbstractCT_Catalogue_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="name" type="gco:CharacterString_PropertyType"/>
-          <element maxOccurs="unbounded" name="scope" type="gco:CharacterString_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="fieldOfApplication" type="gco:CharacterString_PropertyType"/>
-          <element name="versionNumber" type="gco:CharacterString_PropertyType"/>
-          <element name="versionDate" type="gco:Date_PropertyType"/>
-          <element minOccurs="0" name="language" type="gco:CharacterString_PropertyType"/>
-          <element minOccurs="0" name="characterSet" type="lan:MD_CharacterSetCode_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="locale" type="lan:PT_Locale_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="AbstractCT_Catalogue_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cat:AbstractCT_Catalogue"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="AbstractCT_Item" substitutionGroup="gco:AbstractObject" type="cat:AbstractCT_Item_Type"/>
-  <complexType abstract="true" name="AbstractCT_Item_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="identifier" type="gco:GenericName_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="name" type="gco:GenericName_PropertyType"/>
-          <element name="definition" type="gco:CharacterString_PropertyType"/>
-          <element minOccurs="0" name="description" type="gco:CharacterString_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="AbstractCT_Item_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cat:AbstractCT_Item"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/codelistItem.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/codelistItem.xsd
deleted file mode 100644
index 5c586052f..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/codelistItem.xsd
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/cat/1.0" version="1.0">
-  <include schemaLocation="cat.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="CT_Codelist" substitutionGroup="cat:AbstractCT_Item" type="cat:CT_Codelist_Type"/>
-  <complexType name="CT_Codelist_Type">
-    <complexContent>
-      <extension base="cat:AbstractCT_Item_Type">
-        <sequence>
-          <element maxOccurs="unbounded" name="codeEntry" type="cat:CT_CodelistValue_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CT_Codelist_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cat:CT_Codelist"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CT_CodelistCatalogue" substitutionGroup="cat:AbstractCT_Catalogue" type="cat:CT_CodelistCatalogue_Type"/>
-  <complexType name="CT_CodelistCatalogue_Type">
-    <complexContent>
-      <extension base="cat:AbstractCT_Catalogue_Type">
-        <sequence>
-          <element maxOccurs="unbounded" name="codelistItem" type="cat:CT_Codelist_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CT_CodelistCatalogue_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cat:CT_CodelistCatalogue"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CT_CodelistValue" substitutionGroup="cat:AbstractCT_Item" type="cat:CT_CodelistValue_Type"/>
-  <complexType name="CT_CodelistValue_Type">
-    <complexContent>
-      <extension base="cat:AbstractCT_Item_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CT_CodelistValue_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cat:CT_CodelistValue"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/crsItem.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/crsItem.xsd
deleted file mode 100644
index 36d966fe7..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/crsItem.xsd
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/cat/1.0" version="1.0">
-  <include schemaLocation="cat.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="CT_CRS" substitutionGroup="gco:AbstractObject" type="cat:CT_CRS_Type"/>
-  <complexType name="CT_CRS_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="definition" type="gco:CharacterString_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CT_CRS_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cat:CT_CRS"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CT_CoordinateSystem" substitutionGroup="gco:AbstractObject" type="cat:CT_CoordinateSystem_Type"/>
-  <complexType name="CT_CoordinateSystem_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="definition" type="gco:CharacterString_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CT_CoordinateSystem_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cat:CT_CoordinateSystem"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CT_CoordinateSystemAxis" substitutionGroup="gco:AbstractObject" type="cat:CT_CoordinateSystemAxis_Type"/>
-  <complexType name="CT_CoordinateSystemAxis_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="definition" type="gco:CharacterString_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CT_CoordinateSystemAxis_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cat:CT_CoordinateSystemAxis"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CT_CrsCatalogue" substitutionGroup="cat:AbstractCT_Catalogue" type="cat:CT_CrsCatalogue_Type"/>
-  <complexType name="CT_CrsCatalogue_Type">
-    <complexContent>
-      <extension base="cat:AbstractCT_Catalogue_Type">
-        <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="parameters" type="cat:CT_OperationParameters_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="operation" type="cat:CT_Operation_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="coordinateSystem" type="cat:CT_CoordinateSystem_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="ellipsoid" type="cat:CT_Ellipsoid_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="datum" type="cat:CT_Datum_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="operationMethod" type="cat:CT_OperationMethod_PropertyType"/>
-          <element maxOccurs="unbounded" name="crs" type="cat:CT_CRS_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="primeMeridian" type="cat:CT_PrimeMeridian_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="axis" type="cat:CT_CoordinateSystemAxis_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CT_CrsCatalogue_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cat:CT_CrsCatalogue"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CT_Datum" substitutionGroup="gco:AbstractObject" type="cat:CT_Datum_Type"/>
-  <complexType name="CT_Datum_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="definition" type="gco:CharacterString_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CT_Datum_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cat:CT_Datum"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CT_Ellipsoid" substitutionGroup="gco:AbstractObject" type="cat:CT_Ellipsoid_Type"/>
-  <complexType name="CT_Ellipsoid_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="definition" type="gco:CharacterString_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CT_Ellipsoid_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cat:CT_Ellipsoid"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CT_Operation" substitutionGroup="gco:AbstractObject" type="cat:CT_Operation_Type"/>
-  <complexType name="CT_Operation_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CT_Operation_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cat:CT_Operation"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CT_OperationMethod" substitutionGroup="gco:AbstractObject" type="cat:CT_OperationMethod_Type"/>
-  <complexType name="CT_OperationMethod_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="definition" type="gco:CharacterString_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CT_OperationMethod_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cat:CT_OperationMethod"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CT_OperationParameters" substitutionGroup="gco:AbstractObject" type="cat:CT_OperationParameters_Type"/>
-  <complexType name="CT_OperationParameters_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="definition" type="gco:CharacterString_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CT_OperationParameters_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cat:CT_OperationParameters"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CT_PrimeMeridian" substitutionGroup="gco:AbstractObject" type="cat:CT_PrimeMeridian_Type"/>
-  <complexType name="CT_PrimeMeridian_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="definition" type="gco:CharacterString_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CT_PrimeMeridian_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cat:CT_PrimeMeridian"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/index.html
deleted file mode 100644
index 415a0800c..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/index.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>CATalogue (CAT) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>CATalogue (CAT) Version: 1.0</h1><img src="cat.png"><h2>Description</h2>
-      <p>CAT 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 7.4.4.  It includes elements for codelist catalogues, and example catalogues. The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>XML Namespace for cat 1.0</h2>
-      <p>The namespace URI for cat 1.0 is <b>http://standards.iso.org/iso/19115/-3/cat/1.0</b>.
-      </p>
-      <h2>XML Schema for cat 1.0</h2>
-      <p><b><a href="cat.xsd">cat.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the cat 1.0 namespace or by XML Schema documents importing the cat 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the cat namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for cat 1.0 are available <a href="cat.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for cat 1.0</h2>
-      <p><b><a href="catalogues.xsd">catalogues.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 7.4.4. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): AbstractCT_Catalogue, and AbstractCT_Item
-      </p>
-      <p><b><a href="codelistItem.xsd">codelistItem.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 7.4.4. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): CT_Codelist, CT_CodelistCatalogue, and CT_CodelistValue
-      </p>
-      <p><b><a href="crsItem.xsd">crsItem.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 7.4.4. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): CT_CRS, CT_CoordinateSystem, CT_CoordinateSystemAxis, CT_CrsCatalogue, CT_Datum, CT_Ellipsoid, CT_Operation, CT_OperationMethod, CT_OperationParameters, and CT_PrimeMeridian
-      </p>
-      <p><b><a href="uomItem.xsd">uomItem.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 7.4.4. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): CT_UnitOfMeasure, and CT_UomCatalogue
-      </p>
-      <h2>Related XML Namespaces for cat 1.0</h2> The cat 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Geographic COmmon</td>
-            <td>gco</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gco/1.0">http://standards.iso.org/iso/19115/-3/gco/1.0</a></td>
-            <td>../../../../19115/-3/gco/1.0/gco.xsd</td>
-         </tr>
-         <tr>
-            <td>Language localization</td>
-            <td>lan</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/lan/1.0">http://standards.iso.org/iso/19115/-3/lan/1.0</a></td>
-            <td>../../../../19115/-3/lan/1.0/lan.xsd</td>
-         </tr>
-      </table>
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/uomItem.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/uomItem.xsd
deleted file mode 100644
index 1de19e9f3..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cat/1.0/uomItem.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/cat/1.0" version="1.0">
-  <include schemaLocation="cat.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="CT_UnitOfMeasure" substitutionGroup="cat:AbstractCT_Item" type="cat:CT_UnitOfMeasure_Type"/>
-  <complexType name="CT_UnitOfMeasure_Type">
-    <complexContent>
-      <extension base="cat:AbstractCT_Item_Type">
-        <sequence>
-          <element minOccurs="0" name="quantityType" type="gco:CharacterString_PropertyType"/>
-          <element minOccurs="0" name="uomSymbol" type="gco:CharacterString_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CT_UnitOfMeasure_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cat:CT_UnitOfMeasure"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CT_UomCatalogue" substitutionGroup="cat:AbstractCT_Catalogue" type="cat:CT_UomCatalogue_Type"/>
-  <complexType name="CT_UomCatalogue_Type">
-    <complexContent>
-      <extension base="cat:AbstractCT_Catalogue_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CT_UomCatalogue_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cat:CT_UomCatalogue"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/cit.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/cit.png
deleted file mode 100644
index 5e511a7aa..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/cit.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/cit.sch b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/cit.sch
deleted file mode 100644
index 97e17eaaa..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/cit.sch
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron">
-  <sch:ns prefix="cit" uri="http://standards.iso.org/iso/19115/-3/cit/1.0"/>
-  <sch:ns prefix="mri" uri="http://standards.iso.org/iso/19115/-3/mri/1.0"/>
-  <sch:ns prefix="srv" uri="http://standards.iso.org/iso/19115/-3/srv/2.0"/>
-  <sch:ns prefix="mdb" uri="http://standards.iso.org/iso/19115/-3/mdb/1.0"/>
-  <sch:ns prefix="mcc" uri="http://standards.iso.org/iso/19115/-3/mcc/1.0"/>
-  <sch:ns prefix="lan" uri="http://standards.iso.org/iso/19115/-3/lan/1.0"/>
-  <sch:ns prefix="gco" uri="http://standards.iso.org/iso/19115/-3/gco/1.0"/>
-  <!--
-    ISO 19115-3 base requirements for metadata instance documents
-    
-    See ISO19115-1:2014(E) page 25, Figure 20 Citation and responsible party information classes
-  -->
-  
-  <!-- 
-    Rule: CI_Individual
-    Ref: {count(name + positionName) > 0}
-    -->
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.cit.individualnameandposition-failure-en"
-      xml:lang="en">The individual does not have a name or a position.</sch:diagnostic>
-    <sch:diagnostic id="rule.cit.individualnameandposition-failure-fr"
-      xml:lang="fr">Une personne n'a pas de nom ou de fonction.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.cit.individualnameandposition-success-en"
-      xml:lang="en">Individual name is  
-      "<sch:value-of select="normalize-space($name)"/>"
-      and position
-      "<sch:value-of select="normalize-space($position)"/>"
-      .</sch:diagnostic>
-    <sch:diagnostic id="rule.cit.individualnameandposition-success-fr"
-      xml:lang="fr">Le nom de la personne est  
-      "<sch:value-of select="normalize-space($name)"/>"
-      ,sa fonction 
-      "<sch:value-of select="normalize-space($position)"/>"
-      .</sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.cit.individualnameandposition">
-    <sch:title xml:lang="en">Individual MUST have a name or a position</sch:title>
-    <sch:title xml:lang="fr">Une personne DOIT avoir un nom ou une fonction</sch:title>
-    
-    <sch:rule context="//cit:CI_Individual">
-      
-      <sch:let name="name" value="cit:name"/>
-      <sch:let name="position" value="cit:positionName"/>
-      <sch:let name="hasName" 
-               value="normalize-space($name) != ''"/>
-      <sch:let name="hasPosition" 
-        value="normalize-space($position) != ''"/>
-      
-      <sch:assert test="$hasName or $hasPosition"
-        diagnostics="rule.cit.individualnameandposition-failure-en 
-                     rule.cit.individualnameandposition-failure-fr"/>
-      
-      <sch:report test="$hasName or $hasPosition"
-        diagnostics="rule.cit.individualnameandposition-success-en 
-                     rule.cit.individualnameandposition-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
-  
-  
-  
-  
-  <!-- 
-    Rule: CI_Organisation
-    Ref: {count(name + logo) > 0}
-  -->
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.cit.organisationnameandlogo-failure-en"
-      xml:lang="en">The organisation does not have a name or a logo.</sch:diagnostic>
-    <sch:diagnostic id="rule.cit.organisationnameandlogo-failure-fr"
-      xml:lang="fr">Une organisation n'a pas de nom ou de logo.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.cit.organisationnameandlogo-success-en"
-      xml:lang="en">Organisation name is  
-      "<sch:value-of select="normalize-space($name)"/>"
-      and logo filename is 
-      "<sch:value-of select="normalize-space($logo)"/>"
-      .</sch:diagnostic>
-    <sch:diagnostic id="rule.cit.organisationnameandlogo-success-fr"
-      xml:lang="fr">Le nom de l'organisation est  
-      "<sch:value-of select="normalize-space($name)"/>"
-      , son logo
-      "<sch:value-of select="normalize-space($logo)"/>"
-      .</sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.cit.organisationnameandlogo">
-    <sch:title xml:lang="en">Organisation MUST have a name or a logo</sch:title>
-    <sch:title xml:lang="fr">Une organisation DOIT avoir un nom ou un logo</sch:title>
-    
-    <sch:rule context="//cit:CI_Organisation">
-      
-      <sch:let name="name" value="cit:name"/>
-      <sch:let name="logo" value="cit:logo/mcc:MD_BrowseGraphic/mcc:fileName"/>
-      <sch:let name="hasName" 
-        value="normalize-space($name) != ''"/>
-      <sch:let name="hasLogo" 
-        value="normalize-space($logo) != ''"/>
-      
-      <sch:assert test="$hasName or $hasLogo"
-        diagnostics="rule.cit.organisationnameandlogo-failure-en 
-                     rule.cit.organisationnameandlogo-failure-fr"/>
-      
-      <sch:report test="$hasName or $hasLogo"
-        diagnostics="rule.cit.organisationnameandlogo-success-en 
-                     rule.cit.organisationnameandlogo-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
-  
-</sch:schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/cit.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/cit.xsd
deleted file mode 100644
index 46c6c561f..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/cit.xsd
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/cit/1.0" version="1.0">
-  <annotation>
-    <documentation>Namespace for XML elements &lt;font color="#1f497d"&gt;for constructing citations to resources&lt;/font&gt;.</documentation>
-  </annotation>
-  <include schemaLocation="citation.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/cit.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/cit.zip
deleted file mode 100644
index a6f930da5..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/cit.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/cit_invalid.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/cit_invalid.xml
deleted file mode 100644
index cb9504076..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/cit_invalid.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mdb/1.0 ../../mdb/1.0/mdb.xsd"
-   xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0"
-   xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0">
-   <mdb:metadataIdentifier/>
-   <mdb:contact>
-      <cit:CI_Responsibility>
-         <cit:role>
-            <cit:CI_RoleCode codeList="" codeListValue="owner"/>
-         </cit:role>
-         <cit:party>
-            <cit:CI_Individual>
-               <!-- Invalid for rule.cit.individualnameandposition -->
-               <cit:name>
-                  <gco:CharacterString/>
-               </cit:name>
-               <cit:positionName>
-                  <gco:CharacterString/>
-               </cit:positionName>
-            </cit:CI_Individual>
-         </cit:party>
-         <cit:party>
-            <cit:CI_Individual>
-               <!-- Invalid for rule.cit.individualnameandposition -->
-               <cit:positionName xsi:type="lan:PT_FreeText_PropertyType">
-                  <lan:PT_FreeText>
-                     <lan:textGroup>
-                        <lan:LocalisedCharacterString/>
-                     </lan:textGroup>
-                     <lan:textGroup>
-                        <lan:LocalisedCharacterString/>
-                     </lan:textGroup>
-                  </lan:PT_FreeText>
-               </cit:positionName>
-            </cit:CI_Individual>
-         </cit:party>
-         <cit:party>
-            <cit:CI_Organisation>
-               <!-- Invalid for rule.cit.organisationnameandlogo -->
-               <cit:name/>
-               <cit:logo>
-                  <mcc:MD_BrowseGraphic>
-                     <mcc:fileName/>
-                  </mcc:MD_BrowseGraphic>
-               </cit:logo>
-            </cit:CI_Organisation>
-         </cit:party>
-         <cit:party>
-            <cit:CI_Organisation>
-               <!-- Invalid for rule.cit.organisationnameandlogo -->
-               <cit:name/>
-            </cit:CI_Organisation>
-         </cit:party>
-         <cit:party>
-            <cit:CI_Organisation>
-               <!-- Invalid for rule.cit.organisationnameandlogo -->
-            </cit:CI_Organisation>
-         </cit:party>
-      </cit:CI_Responsibility>
-   </mdb:contact>
-   <mdb:dateInfo gco:nilReason="inapplicable"/>
-   <mdb:identificationInfo gco:nilReason="inapplicable"/>
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/cit_valid.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/cit_valid.xml
deleted file mode 100644
index bdfc9dc78..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/cit_valid.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mdb/1.0 ../../mdb/1.0/mdb.xsd"
-   xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0"
-   xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0">
-   <mdb:metadataIdentifier/>
-   <mdb:contact>
-      <cit:CI_Responsibility>
-         <cit:role>
-            <cit:CI_RoleCode codeList="" codeListValue="owner"/>
-         </cit:role>
-         <cit:party>
-            <cit:CI_Individual>
-               <!-- Valid for rule.cit.individualnameandposition -->
-               <cit:name>
-                  <gco:CharacterString>name</gco:CharacterString>
-               </cit:name>
-               <cit:positionName>
-                  <gco:CharacterString>positionName</gco:CharacterString>
-               </cit:positionName>
-            </cit:CI_Individual>
-         </cit:party>
-         <cit:party>
-            <cit:CI_Individual>
-               <!-- Valid for rule.cit.individualnameandposition -->
-               <cit:name xsi:type="lan:PT_FreeText_PropertyType">
-                  <lan:PT_FreeText>
-                     <lan:textGroup>
-                        <lan:LocalisedCharacterString>MultilingualName</lan:LocalisedCharacterString>
-                     </lan:textGroup>
-                     <lan:textGroup>
-                        <lan:LocalisedCharacterString>MultilingualName2</lan:LocalisedCharacterString>
-                     </lan:textGroup>
-                  </lan:PT_FreeText>
-               </cit:name>
-               <cit:positionName xsi:type="lan:PT_FreeText_PropertyType">
-                  <lan:PT_FreeText>
-                     <lan:textGroup>
-                        <lan:LocalisedCharacterString>MultilingualPosition</lan:LocalisedCharacterString>
-                     </lan:textGroup>
-                     <lan:textGroup>
-                        <lan:LocalisedCharacterString>MultilingualPosition2</lan:LocalisedCharacterString>
-                     </lan:textGroup>
-                  </lan:PT_FreeText>
-               </cit:positionName>
-            </cit:CI_Individual>
-         </cit:party>
-         <cit:party>
-            <cit:CI_Organisation>
-               <!-- valid for rule.cit.organisationnameandlogo -->
-               <cit:name>
-                  <gco:CharacterString>orgName</gco:CharacterString>
-               </cit:name>
-               <cit:logo>
-                  <mcc:MD_BrowseGraphic>
-                     <mcc:fileName>
-                        <gco:CharacterString>fileName</gco:CharacterString>
-                     </mcc:fileName>
-                  </mcc:MD_BrowseGraphic>
-               </cit:logo>
-            </cit:CI_Organisation>
-         </cit:party>
-      </cit:CI_Responsibility>
-   </mdb:contact>
-   <mdb:dateInfo gco:nilReason="inapplicable"/>
-   <mdb:identificationInfo gco:nilReason="inapplicable"/>
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/citation.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/citation.xsd
deleted file mode 100644
index 3c7dfd885..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/citation.xsd
+++ /dev/null
@@ -1,509 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/cit/1.0" version="1.0">
-  <include schemaLocation="cit.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="CI_Address" substitutionGroup="gco:AbstractObject" type="cit:CI_Address_Type">
-    <annotation>
-      <documentation>location of the responsible individual or organisation</documentation>
-    </annotation>
-  </element>
-  <complexType name="CI_Address_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="deliveryPoint" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>address line for the location (as described in ISO 11180, Annex A)</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="city" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>city of the location</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="administrativeArea" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>state, province of the location</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="postalCode" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>ZIP or other postal code</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="country" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>country of the physical address</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="electronicMailAddress" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>address of the electronic mailbox of the responsible organisation or individual</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CI_Address_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cit:CI_Address"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CI_Citation" substitutionGroup="mcc:Abstract_Citation" type="cit:CI_Citation_Type">
-    <annotation>
-      <documentation>standardized resource reference</documentation>
-    </annotation>
-  </element>
-  <complexType name="CI_Citation_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_Citation_Type">
-        <sequence>
-          <element name="title" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>name by which the cited resource is known</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="alternateTitle" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>short name or other language name by which the cited information is known. Example: DCW as an alternative title for Digital Chart of the World</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="date" type="cit:CI_Date_PropertyType">
-            <annotation>
-              <documentation>reference date for the cited resource</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="edition" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>version of the cited resource</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="editionDate" type="gco:DateTime_PropertyType">
-            <annotation>
-              <documentation>date of the edition</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="identifier" type="mcc:MD_Identifier_PropertyType">
-            <annotation>
-              <documentation>value uniquely identifying an object within a namespace</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="citedResponsibleParty" type="cit:CI_Responsibility_PropertyType">
-            <annotation>
-              <documentation>name and position information for an individual or organisation that is responsible for the resource</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="presentationForm" type="cit:CI_PresentationFormCode_PropertyType">
-            <annotation>
-              <documentation>mode in which the resource is represented</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="series" type="cit:CI_Series_PropertyType">
-            <annotation>
-              <documentation>information about the series, or aggregate resource, of which the resource is a part</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="otherCitationDetails" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>other information required to complete the citation that is not recorded elsewhere</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="ISBN" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>international Standard Book Number</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="ISSN" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>international Standard Serial Number</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="onlineResource" type="cit:CI_OnlineResource_PropertyType">
-            <annotation>
-              <documentation>online reference to the cited resource</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="graphic" type="mcc:MD_BrowseGraphic_PropertyType">
-            <annotation>
-              <documentation>citation graphic or logo for cited party</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CI_Citation_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cit:CI_Citation"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CI_Contact" substitutionGroup="gco:AbstractObject" type="cit:CI_Contact_Type">
-    <annotation>
-      <documentation>information required to enable contact with the responsible person and/or organisation</documentation>
-    </annotation>
-  </element>
-  <complexType name="CI_Contact_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="phone" type="cit:CI_Telephone_PropertyType">
-            <annotation>
-              <documentation>telephone numbers at which the organisation or individual may be contacted</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="address" type="cit:CI_Address_PropertyType">
-            <annotation>
-              <documentation>physical and email address at which the organisation or individual may be contacted</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="onlineResource" type="cit:CI_OnlineResource_PropertyType">
-            <annotation>
-              <documentation>on-line information that can be used to contact the individual or organisation</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="hoursOfService" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>time period (including time zone) when individuals can contact the organisation or individual</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="contactInstructions" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>supplemental instructions on how or when to contact the individual or organisation</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="contactType" type="gco:CharacterString_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CI_Contact_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cit:CI_Contact"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CI_Date" substitutionGroup="mcc:Abstract_TypedDate" type="cit:CI_Date_Type">
-    <annotation>
-      <documentation>reference date and event used to describe it</documentation>
-    </annotation>
-  </element>
-  <complexType name="CI_Date_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_TypedDate_Type">
-        <sequence>
-          <element name="date" type="gco:DateTime_PropertyType">
-            <annotation>
-              <documentation>reference date for the cited resource</documentation>
-            </annotation>
-          </element>
-          <element name="dateType" type="cit:CI_DateTypeCode_PropertyType">
-            <annotation>
-              <documentation>event used for reference date</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CI_Date_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cit:CI_Date"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CI_DateTypeCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>identification of when a given event occurred</documentation>
-    </annotation>
-  </element>
-  <complexType name="CI_DateTypeCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cit:CI_DateTypeCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CI_Individual" substitutionGroup="cit:AbstractCI_Party" type="cit:CI_Individual_Type">
-    <annotation>
-      <documentation>information about the party if the party is an individual</documentation>
-    </annotation>
-  </element>
-  <complexType name="CI_Individual_Type">
-    <complexContent>
-      <extension base="cit:AbstractCI_Party_Type">
-        <sequence>
-          <element minOccurs="0" name="positionName" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>position of the individual in an organisation</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CI_Individual_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cit:CI_Individual"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CI_OnLineFunctionCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>function performed by the resource</documentation>
-    </annotation>
-  </element>
-  <complexType name="CI_OnLineFunctionCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cit:CI_OnLineFunctionCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CI_OnlineResource" substitutionGroup="mcc:Abstract_OnlineResource" type="cit:CI_OnlineResource_Type">
-    <annotation>
-      <documentation>information about on-line sources from which the resource, specification, or community profile name and extended metadata elements can be obtained</documentation>
-    </annotation>
-  </element>
-  <complexType name="CI_OnlineResource_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_OnlineResource_Type">
-        <sequence>
-          <element name="linkage" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>location (address) for on-line access using a Uniform Resource Locator/Uniform Resource Identifier address or similar addressing scheme such as http://www.statkart.no/isotc211</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="protocol" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>connection protocol to be used e.g. http, ftp, file</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="applicationProfile" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>name of an application profile that can be used with the online resource</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="name" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>name of the online resource</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="description" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>detailed text description of what the online resource is/does</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="function" type="cit:CI_OnLineFunctionCode_PropertyType">
-            <annotation>
-              <documentation>code for function performed by the online resource</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="protocolRequest" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>protocol used by the accessed resource</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CI_OnlineResource_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cit:CI_OnlineResource"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CI_Organisation" substitutionGroup="cit:AbstractCI_Party" type="cit:CI_Organisation_Type">
-    <annotation>
-      <documentation>information about the party if the party is an organisation</documentation>
-    </annotation>
-  </element>
-  <complexType name="CI_Organisation_Type">
-    <complexContent>
-      <extension base="cit:AbstractCI_Party_Type">
-        <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="logo" type="mcc:MD_BrowseGraphic_PropertyType">
-            <annotation>
-              <documentation>Graphic identifying organization</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="individual" type="cit:CI_Individual_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CI_Organisation_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cit:CI_Organisation"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="AbstractCI_Party" substitutionGroup="gco:AbstractObject" type="cit:AbstractCI_Party_Type">
-    <annotation>
-      <documentation>information about the individual and/or organisation of the party</documentation>
-    </annotation>
-  </element>
-  <complexType abstract="true" name="AbstractCI_Party_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element minOccurs="0" name="name" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>name of the party</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="contactInfo" type="cit:CI_Contact_PropertyType">
-            <annotation>
-              <documentation>contact information for the party</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="AbstractCI_Party_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cit:AbstractCI_Party"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CI_PresentationFormCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>mode in which the data is represented</documentation>
-    </annotation>
-  </element>
-  <complexType name="CI_PresentationFormCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cit:CI_PresentationFormCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CI_Responsibility" substitutionGroup="mcc:Abstract_Responsibility" type="cit:CI_Responsibility_Type">
-    <annotation>
-      <documentation>information about the party and their role</documentation>
-    </annotation>
-  </element>
-  <complexType name="CI_Responsibility_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_Responsibility_Type">
-        <sequence>
-          <element name="role" type="cit:CI_RoleCode_PropertyType">
-            <annotation>
-              <documentation>function performed by the responsible party</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="extent" type="mcc:Abstract_Extent_PropertyType">
-            <annotation>
-              <documentation>spatial or temporal extent of the role</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" name="party" type="cit:AbstractCI_Party_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CI_Responsibility_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cit:CI_Responsibility"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CI_RoleCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>function performed by the responsible party</documentation>
-    </annotation>
-  </element>
-  <complexType name="CI_RoleCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cit:CI_RoleCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CI_Series" substitutionGroup="gco:AbstractObject" type="cit:CI_Series_Type">
-    <annotation>
-      <documentation>information about the series, or aggregate resource, to which a resource belongs</documentation>
-    </annotation>
-  </element>
-  <complexType name="CI_Series_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element minOccurs="0" name="name" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>name of the series, or aggregate resource, of which the resource is a part</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="issueIdentification" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>information identifying the issue of the series</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="page" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>details on which pages of the publication the article was published</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CI_Series_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cit:CI_Series"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CI_Telephone" substitutionGroup="gco:AbstractObject" type="cit:CI_Telephone_Type">
-    <annotation>
-      <documentation>telephone numbers for contacting the responsible individual or organisation</documentation>
-    </annotation>
-  </element>
-  <complexType name="CI_Telephone_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="number" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>telephone number by which individuals can contact responsible organisation or individual</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="numberType" type="cit:CI_TelephoneTypeCode_PropertyType">
-            <annotation>
-              <documentation>type of telephone responsible organisation or individual</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="CI_Telephone_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cit:CI_Telephone"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="CI_TelephoneTypeCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>type of telephone</documentation>
-    </annotation>
-  </element>
-  <complexType name="CI_TelephoneTypeCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="cit:CI_TelephoneTypeCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/codelists.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/codelists.html
deleted file mode 100644
index d16780b00..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/codelists.html
+++ /dev/null
@@ -1,336 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0" xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title> Codelists from the Citation (cit) Namespace </title>
-   </head>
-   <body><a name="top"></a><h1>ISO 19115-3 Codelist Report</h1>
-      <h2> Codelists from the Citation (cit) Namespace </h2>
-      <table>
-         <tr>
-            <b>
-               <td>Scope</td></b>
-            <td> Codelists related to Citation (cit) Namespace </td>
-         </tr>
-         <tr>
-            <b>
-               <td>Field of Application</td></b>
-            <td> ISO TC211 Metadata Standards </td>
-         </tr>
-         <tr>
-            <b>
-               <td>Version (Date)</td></b>
-            <td> 1.0 () </td>
-         </tr>
-      </table>
-      <h2> CI_DateTypeCode ( CI_DateTypeCode ): </h2><b>Description: </b> identification of when a given event occurred <table width="95%" border="1" cellpadding="2" cellspacing="2">
-         <tr>
-            <th valign="top">Entry</th>
-            <th valign="top">Definition</th>
-         </tr>
-         <tr>
-            <td valign="top"> CI_DateTypeCode_creation </td>
-            <td valign="top"> date identifies when the resource was brought into existence </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_DateTypeCode_publication </td>
-            <td valign="top"> date identifies when the resource was issued </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_DateTypeCode_revision </td>
-            <td valign="top"> date identifies when the resource was examined or re-examined and improved or amended </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_DateTypeCode_expiry </td>
-            <td valign="top"> date identifies when resource expires </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_DateTypeCode_lastUpdate </td>
-            <td valign="top"> date identifies when resource was last updated </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_DateTypeCode_lastRevision </td>
-            <td valign="top"> date identifies when resource was last reviewed </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_DateTypeCode_nextUpdate </td>
-            <td valign="top"> date identifies when resource will be next updated </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_DateTypeCode_unavailable </td>
-            <td valign="top"> date identifies when resource became not available or obtainable </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_DateTypeCode_inForce </td>
-            <td valign="top"> date identifies when resource became in force </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_DateTypeCode_adopted </td>
-            <td valign="top"> date identifies when resource was adopted </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_DateTypeCode_deprecated </td>
-            <td valign="top"> date identifies when resource was deprecated </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_DateTypeCode_superseded </td>
-            <td valign="top"> date identifies when resource was superseded or replaced by another resource </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_DateTypeCode_validityBegins </td>
-            <td valign="top"> time at which the data are considered to become valid. NOTE: There could be quite a delay between creation and validity begins </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_DateTypeCode_validityExpires </td>
-            <td valign="top"> time at which the data are no longer considered to be valid </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_DateTypeCode_released </td>
-            <td valign="top"> the date that the resource shall be released for public access </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_DateTypeCode_distribution </td>
-            <td valign="top"> date identifies when an instance of the resource was distributed </td>
-         </tr>
-      </table><a href="#top">top</a><h2> CI_OnLineFunctionCode ( CI_OnLineFunctionCode ): </h2><b>Description: </b> function performed by the resource <table width="95%" border="1" cellpadding="2" cellspacing="2">
-         <tr>
-            <th valign="top">Entry</th>
-            <th valign="top">Definition</th>
-         </tr>
-         <tr>
-            <td valign="top"> CI_OnLineFunctionCode_download </td>
-            <td valign="top"> online instructions for transferring data from one storage device or system to another </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_OnLineFunctionCode_information </td>
-            <td valign="top"> online information about the resource </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_OnLineFunctionCode_offlineAccess </td>
-            <td valign="top"> online instructions for requesting the resource from the provider </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_OnLineFunctionCode_order </td>
-            <td valign="top"> online order process for obtaining the resource </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_OnLineFunctionCode_search </td>
-            <td valign="top"> online search interface for seeking out information about the resource </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_OnLineFunctionCode_completeMetadata </td>
-            <td valign="top"> complete metadata provided </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_OnLineFunctionCode_browseGraphic </td>
-            <td valign="top"> browse graphic provided </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_OnLineFunctionCode_upload </td>
-            <td valign="top"> online resource upload capability provided </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_OnLineFunctionCode_emailService </td>
-            <td valign="top"> online email service provided </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_OnLineFunctionCode_browsing </td>
-            <td valign="top"> online browsing provided </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_OnLineFunctionCode_fileAccess </td>
-            <td valign="top"> online file access provided </td>
-         </tr>
-      </table><a href="#top">top</a><h2> CI_PresentationFormCode ( CI_PresentationFormCode ): </h2><b>Description: </b> mode in which the data are represented <table width="95%" border="1" cellpadding="2" cellspacing="2">
-         <tr>
-            <th valign="top">Entry</th>
-            <th valign="top">Definition</th>
-         </tr>
-         <tr>
-            <td valign="top"> CI_PresentationFormCode_documentDigital </td>
-            <td valign="top"> digital representation of a primarily textual item (can contain illustrations also) </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_PresentationFormCode_documentHardcopy </td>
-            <td valign="top"> representation of a primarily textual item (can contain illustrations also) on paper, photographic material, or other media </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_PresentationFormCode_imageDigital </td>
-            <td valign="top"> likeness of natural or man-made features, objects, and activities acquired through the sensing of visual or any other segment of the electromagnetic spectrum by sensors, such as thermal infrared, and high resolution radar and stored in digital format </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_PresentationFormCode_imageHardcopy </td>
-            <td valign="top"> likeness of natural or man-made features, objects, and activities acquired through the sensing of visual or any other segment of the electromagnetic spectrum by sensors, such as thermal infrared, and high resolution radar and reproduced on paper, photographic material, or other media for use directly by the human user </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_PresentationFormCode_mapDigital </td>
-            <td valign="top"> map represented in raster or vector form </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_PresentationFormCode_mapHardcopy </td>
-            <td valign="top"> map printed on paper, photographic material, or other media for use directly by the human user </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_PresentationFormCode_modelDigital </td>
-            <td valign="top"> multi-dimensional digital representation of a feature, process, etc. </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_PresentationFormCode_modelHardcopy </td>
-            <td valign="top"> 3-dimensional, physical model </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_PresentationFormCode_profileDigital </td>
-            <td valign="top"> vertical cross-section in digital form </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_PresentationFormCode_profileHardcopy </td>
-            <td valign="top"> vertical cross-section printed on paper, etc. </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_PresentationFormCode_tableDigital </td>
-            <td valign="top"> digital representation of facts or figures systematically displayed, especially in columns </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_PresentationFormCode_tableHardcopy </td>
-            <td valign="top"> representation of facts or figures systematically displayed, especially in columns, printed on paper, photographic material, or other media </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_PresentationFormCode_videoDigital </td>
-            <td valign="top"> digital video recording </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_PresentationFormCode_videoHardcopy </td>
-            <td valign="top"> video recording on film </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_PresentationFormCode_audioDigital </td>
-            <td valign="top"> digital audio recording </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_PresentationFormCode_audioHardcopy </td>
-            <td valign="top"> audio recording delivered by analog media, such as a magnetic tape </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_PresentationFormCode_multimediaDigital </td>
-            <td valign="top"> information representation using simultaneously various digital modes for text, sound, image </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_PresentationFormCode_multimediaHardcopy </td>
-            <td valign="top"> information representation using simultaneously various analog modes for text, sound, image </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_PresentationFormCode_physicalSample </td>
-            <td valign="top"> a physical object, e.g. Rock or mineral sample, microscope slide </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_PresentationFormCode_diagramDigital </td>
-            <td valign="top"> information represented graphically by charts such as pie chart, bar chart, and other type of diagrams and recorded in digital format </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_PresentationFormCode_diagramHardcopy </td>
-            <td valign="top"> information represented graphically by charts such as pie chart, bar chart, and other type of diagrams and printed on paper, phototographic material, or other media </td>
-         </tr>
-      </table><a href="#top">top</a><h2> CI_RoleCode ( CI_RoleCode ): </h2><b>Description: </b> function performed by the responsible party <table width="95%" border="1" cellpadding="2" cellspacing="2">
-         <tr>
-            <th valign="top">Entry</th>
-            <th valign="top">Definition</th>
-         </tr>
-         <tr>
-            <td valign="top"> CI_RoleCode_resourceProvider </td>
-            <td valign="top"> party that supplies the resource </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_RoleCode_custodian </td>
-            <td valign="top"> party that accepts accountability and responsibility for the resource and ensures appropriate care and maintenance of the resource </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_RoleCode_owner </td>
-            <td valign="top"> party that owns the resource </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_RoleCode_user </td>
-            <td valign="top"> party who uses the resource </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_RoleCode_distributor </td>
-            <td valign="top"> party who distributes the resource </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_RoleCode_originator </td>
-            <td valign="top"> party who created the resource </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_RoleCode_pointOfContact </td>
-            <td valign="top"> party who can be contacted for acquiring knowledge about or acquisition of the resource </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_RoleCode_principalInvestigator </td>
-            <td valign="top"> key party responsible for gathering information and conducting research </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_RoleCode_processor </td>
-            <td valign="top"> party who has processed the data in a manner such that the resource has been modified </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_RoleCode_publisher </td>
-            <td valign="top"> party who published the resource </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_RoleCode_author </td>
-            <td valign="top"> party who authored the resource </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_RoleCode_sponsor </td>
-            <td valign="top"> party who speaks for the resource </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_RoleCode_coAuthor </td>
-            <td valign="top"> party who jointly authors the resource </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_RoleCode_collaborator </td>
-            <td valign="top"> party who assists with the generation of the resource other than the principal investigator </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_RoleCode_editor </td>
-            <td valign="top"> party who reviewed or modified the resource to improve the content </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_RoleCode_mediator </td>
-            <td valign="top"> a class of entity that mediates access to the resource and for whom the resource is intended or useful </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_RoleCode_rightsHolder </td>
-            <td valign="top"> party owning or managing rights over the resource </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_RoleCode_contributor </td>
-            <td valign="top"> party contributing to the resource </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_RoleCode_funder </td>
-            <td valign="top"> party providing monetary support for the resource </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_RoleCode_stakeholder </td>
-            <td valign="top"> party who has an interest in the resource or the use of the resource </td>
-         </tr>
-      </table><a href="#top">top</a><h2> CI_TelephoneTypeCode ( CI_TelephoneTypeCode ): </h2><b>Description: </b> type of telephone <table width="95%" border="1" cellpadding="2" cellspacing="2">
-         <tr>
-            <th valign="top">Entry</th>
-            <th valign="top">Definition</th>
-         </tr>
-         <tr>
-            <td valign="top"> CI_TelephoneTypeCode_voice </td>
-            <td valign="top"> telephone provides voice service </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_TelephoneTypeCode_fax </td>
-            <td valign="top"> telephone provides facsimile service </td>
-         </tr>
-         <tr>
-            <td valign="top"> CI_TelephoneTypeCode_sms </td>
-            <td valign="top"> telephone provides sms service </td>
-         </tr>
-      </table><a href="#top">top</a><hr /><i>Stylesheet: CT_CodelistHTML.xsl Version: 2015-04-17</i></body>
-</html>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/codelists.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/codelists.xml
deleted file mode 100644
index 921d8a154..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/codelists.xml
+++ /dev/null
@@ -1,963 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cat:CT_CodelistCatalogue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/cat/1.0 ../../../-3/cat/1.0/cat.xsd"
- xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0"
- xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:gml="http://www.opengis.net/gml/3.2">
-   <!--=====Catalogue description=====-->
-   <cat:name>
-      <gco:CharacterString>Codelists from the Citation (cit) Namespace</gco:CharacterString>
-   </cat:name>
-   <cat:scope>
-      <gco:CharacterString>Codelists related to Citation (cit) Namespace</gco:CharacterString>
-   </cat:scope>
-   <cat:fieldOfApplication>
-      <gco:CharacterString>ISO TC211 Metadata Standards</gco:CharacterString>
-   </cat:fieldOfApplication>
-   <cat:versionNumber>
-      <gco:CharacterString>1.0</gco:CharacterString>
-   </cat:versionNumber>
-   <cat:versionDate>
-      <gco:Date>2015-04-18</gco:Date>
-   </cat:versionDate>
-   <cat:locale>
-      <lan:PT_Locale>
-         <lan:language>
-            <lan:LanguageCode codeList="standards.iso.org/19115/-3/lan/1.0/codelists.xml#LanguageCode" codeListValue="eng">eng</lan:LanguageCode>
-         </lan:language>
-         <lan:characterEncoding>
-            <lan:MD_CharacterSetCode codeList="standards.iso.org/19115/-3/lan/1.0/codelists.xml#MD_CharacterSetCode" codeListValue="UTF-8">UTF-8</lan:MD_CharacterSetCode>
-         </lan:characterEncoding>
-      </lan:PT_Locale>
-   </cat:locale>
-   <!--============================= Codelists =======================================-->
-   <!--=== CI_DateTypeCode ===-->
-   <cat:codelistItem>
-      <cat:CT_Codelist id="CI_DateTypeCode">
-         <cat:identifier>
-            <gco:ScopedName codeSpace="isotc211">CI_DateTypeCode</gco:ScopedName>
-         </cat:identifier>
-         <cat:name>
-            <gco:ScopedName codeSpace="isotc211">CI_DateTypeCode</gco:ScopedName>
-         </cat:name>
-         <cat:definition>
-            <gco:CharacterString>identification of when a given event occurred</gco:CharacterString>
-         </cat:definition>
-         <cat:description>
-            <gco:CharacterString>identification of when a given event occurred</gco:CharacterString>
-         </cat:description>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_DateTypeCode_creation">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="isotc211">CI_DateTypeCode_creation</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>date identifies when the resource was brought into
-                     existence</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_DateTypeCode_publication">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_DateTypeCode_publication</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>date identifies when the resource was
-                     issued</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_DateTypeCode_revision">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_DateTypeCode_revision</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>date identifies when the resource was examined or re-examined
-                     and improved or amended</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_DateTypeCode_expiry">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_DateTypeCode_expiry</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>date identifies when resource expires </gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_DateTypeCode_lastUpdate">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_DateTypeCode_lastUpdate</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>date identifies when resource was last
-                     updated</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_DateTypeCode_lastRevision">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_DateTypeCode_lastRevision</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>date identifies when resource was last
-                     reviewed</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_DateTypeCode_nextUpdate">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_DateTypeCode_nextUpdate</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>date identifies when resource will be next
-                     updated</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_DateTypeCode_unavailable">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_DateTypeCode_unavailable</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>date identifies when resource became not available or
-                     obtainable</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_DateTypeCode_inForce">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_DateTypeCode_inForce</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>date identifies when resource became in
-                     force</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_DateTypeCode_adopted">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_DateTypeCode_adopted</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>date identifies when resource was
-                     adopted</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_DateTypeCode_deprecated">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_DateTypeCode_deprecated</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>date identifies when resource was
-                     deprecated</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_DateTypeCode_superseded">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_DateTypeCode_superseded</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>date identifies when resource was superseded or replaced by
-                     another resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_DateTypeCode_validityBegins">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_DateTypeCode_validityBegins</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>time at which the data are considered to become valid. NOTE:
-                     There could be quite a delay between creation and validity
-                     begins</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_DateTypeCode_validityExpires">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_DateTypeCode_validityExpires</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>time at which the data are no longer considered to be
-                     valid</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_DateTypeCode_released">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_DateTypeCode_released</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>the date that the resource shall be released for public
-                     access</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_DateTypeCode_distribution">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_DateTypeCode_distribution</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>date identifies when an instance of the resource was
-                     distributed</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-      </cat:CT_Codelist>
-   </cat:codelistItem>
-   <!-- CI_OnLineFunctionCode  -->
-   <cat:codelistItem>
-      <cat:CT_Codelist id="CI_OnLineFunctionCode">
-         <cat:identifier>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >CI_OnLineFunctionCode</gco:ScopedName>
-         </cat:identifier>
-         <cat:name>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >CI_OnLineFunctionCode</gco:ScopedName>
-         </cat:name>
-         <cat:definition>
-            <gco:CharacterString>function performed by the resource</gco:CharacterString>
-         </cat:definition>
-         <cat:description>
-            <gco:CharacterString>function performed by the resource</gco:CharacterString>
-         </cat:description>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_OnLineFunctionCode_download">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_OnLineFunctionCode_download</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>online instructions for transferring data from one storage
-                     device or system to another</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_OnLineFunctionCode_information">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_OnLineFunctionCode_information</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>online information about the resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_OnLineFunctionCode_offlineAccess">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_OnLineFunctionCode_offlineAccess</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>online instructions for requesting the resource from the
-                     provider</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_OnLineFunctionCode_order">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_OnLineFunctionCode_order</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>online order process for obtaining the
-                     resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_OnLineFunctionCode_search">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_OnLineFunctionCode_search</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>online search interface for seeking out information about the
-                     resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_OnLineFunctionCode_completeMetadata">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_OnLineFunctionCode_completeMetadata</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>complete metadata provided</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_OnLineFunctionCode_browseGraphic">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_OnLineFunctionCode_browseGraphic</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>browse graphic provided</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_OnLineFunctionCode_upload">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_OnLineFunctionCode_upload</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>online resource upload capability
-                     provided</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_OnLineFunctionCode_emailService">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_OnLineFunctionCode_emailService</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>online email service provided</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_OnLineFunctionCode_browsing">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_OnLineFunctionCode_browsing</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>online browsing provided</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_OnLineFunctionCode_fileAccess">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_OnLineFunctionCode_fileAccess</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>online file access provided</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-      </cat:CT_Codelist>
-   </cat:codelistItem>
-   <!-- CI_PresentationFormCode  -->
-   <cat:codelistItem>
-      <cat:CT_Codelist id="CI_PresentationFormCode">
-         <cat:identifier>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >CI_PresentationFormCode</gco:ScopedName>
-         </cat:identifier>
-         <cat:name>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >CI_PresentationFormCode</gco:ScopedName>
-         </cat:name>
-         <cat:definition>
-            <gco:CharacterString>mode in which the data are represented</gco:CharacterString>
-         </cat:definition>
-         <cat:description>
-            <gco:CharacterString>mode in which the data are represented</gco:CharacterString>
-         </cat:description>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_PresentationFormCode_documentDigital">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_PresentationFormCode_documentDigital</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>digital representation of a primarily textual item (can
-                     contain illustrations also)</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_PresentationFormCode_documentHardcopy">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_PresentationFormCode_documentHardcopy</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>representation of a primarily textual item (can contain
-                     illustrations also) on paper, photographic material, or other
-                     media</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_PresentationFormCode_imageDigital">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_PresentationFormCode_imageDigital</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>likeness of natural or man-made features, objects, and
-                     activities acquired through the sensing of visual or any other segment of the
-                     electromagnetic spectrum by sensors, such as thermal infrared, and high
-                     resolution radar and stored in digital format</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_PresentationFormCode_imageHardcopy">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_PresentationFormCode_imageHardcopy</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>likeness of natural or man-made features, objects, and
-                     activities acquired through the sensing of visual or any other segment of the
-                     electromagnetic spectrum by sensors, such as thermal infrared, and high
-                     resolution radar and reproduced on paper, photographic material, or other media
-                     for use directly by the human user</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_PresentationFormCode_mapDigital">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_PresentationFormCode_mapDigital</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>map represented in raster or vector
-                     form</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_PresentationFormCode_mapHardcopy">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_PresentationFormCode_mapHardcopy</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>map printed on paper, photographic material, or other media
-                     for use directly by the human user</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_PresentationFormCode_modelDigital">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_PresentationFormCode_modelDigital</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>multi-dimensional digital representation of a feature,
-                     process, etc.</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_PresentationFormCode_modelHardcopy">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_PresentationFormCode_modelHardcopy</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>3-dimensional, physical model</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_PresentationFormCode_profileDigital">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_PresentationFormCode_profileDigital</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>vertical cross-section in digital form</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_PresentationFormCode_profileHardcopy">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_PresentationFormCode_profileHardcopy</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>vertical cross-section printed on paper,
-                     etc.</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_PresentationFormCode_tableDigital">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_PresentationFormCode_tableDigital</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>digital representation of facts or figures systematically
-                     displayed, especially in columns</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_PresentationFormCode_tableHardcopy">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_PresentationFormCode_tableHardcopy</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>representation of facts or figures systematically displayed,
-                     especially in columns, printed on paper, photographic material, or other
-                     media</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_PresentationFormCode_videoDigital">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_PresentationFormCode_videoDigital</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>digital video recording</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_PresentationFormCode_videoHardcopy">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_PresentationFormCode_videoHardcopy</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>video recording on film</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_PresentationFormCode_audioDigital">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_PresentationFormCode_audioDigital</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>digital audio recording</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_PresentationFormCode_audioHardcopy">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_PresentationFormCode_audioHardcopy</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>audio recording delivered by analog media, such as a magnetic
-                     tape</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_PresentationFormCode_multimediaDigital">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_PresentationFormCode_multimediaDigital</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>information representation using simultaneously various
-                     digital modes for text, sound, image</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_PresentationFormCode_multimediaHardcopy">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_PresentationFormCode_multimediaHardcopy</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>information representation using simultaneously various
-                     analog modes for text, sound, image</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_PresentationFormCode_physicalSample">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_PresentationFormCode_physicalSample</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>a physical object, e.g. Rock or mineral sample, microscope
-                     slide</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_PresentationFormCode_diagramDigital">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_PresentationFormCode_diagramDigital</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>information represented graphically by charts such as pie
-                     chart, bar chart, and other type of diagrams and recorded in digital
-                     format</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_PresentationFormCode_diagramHardcopy">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_PresentationFormCode_diagramHardcopy</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>information represented graphically by charts such as pie
-                     chart, bar chart, and other type of diagrams and printed on paper,
-                     phototographic material, or other media</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-      </cat:CT_Codelist>
-   </cat:codelistItem>
-   <!-- CI_RoleCode  -->
-   <cat:codelistItem>
-      <cat:CT_Codelist id="CI_RoleCode">
-         <cat:identifier>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">CI_RoleCode</gco:ScopedName>
-         </cat:identifier>
-         <cat:name>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">CI_RoleCode</gco:ScopedName>
-         </cat:name>
-         <cat:definition>
-            <gco:CharacterString>function performed by the responsible party</gco:CharacterString>
-         </cat:definition>
-         <cat:description>
-            <gco:CharacterString>function performed by the responsible party</gco:CharacterString>
-         </cat:description>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_RoleCode_resourceProvider">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_RoleCode_resourceProvider</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>party that supplies the resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_RoleCode_custodian">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_RoleCode_custodian</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>party that accepts accountability and responsibility for the
-                     resource and ensures appropriate care and maintenance of the
-                     resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_RoleCode_owner">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_RoleCode_owner</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>party that owns the resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_RoleCode_user">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_RoleCode_user</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>party who uses the resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_RoleCode_distributor">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_RoleCode_distributor</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>party who distributes the resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_RoleCode_originator">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_RoleCode_originator</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>party who created the resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_RoleCode_pointOfContact">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_RoleCode_pointOfContact</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>party who can be contacted for acquiring knowledge about or
-                     acquisition of the resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_RoleCode_principalInvestigator">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_RoleCode_principalInvestigator</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>key party responsible for gathering information and
-                     conducting research</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_RoleCode_processor">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_RoleCode_processor</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>party who has processed the data in a manner such that the
-                     resource has been modified</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_RoleCode_publisher">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_RoleCode_publisher</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>party who published the resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_RoleCode_author">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_RoleCode_author</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>party who authored the resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_RoleCode_sponsor">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_RoleCode_sponsor</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>party who speaks for the resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_RoleCode_coAuthor">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_RoleCode_coAuthor</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>party who jointly authors the resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_RoleCode_collaborator">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_RoleCode_collaborator</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>party who assists with the generation of the resource other
-                     than the principal investigator</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_RoleCode_editor">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_RoleCode_editor</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>party who reviewed or modified the resource to improve the
-                     content</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_RoleCode_mediator">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_RoleCode_mediator</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>a class of entity that mediates access to the resource and
-                     for whom the resource is intended or useful</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_RoleCode_rightsHolder">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_RoleCode_rightsHolder</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>party owning or managing rights over the
-                     resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_RoleCode_contributor">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_RoleCode_contributor</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>party contributing to the resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_RoleCode_funder">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_RoleCode_funder</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>party providing monetary support for the
-                     resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_RoleCode_stakeholder">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_RoleCode_stakeholder</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>party who has an interest in the resource or the use of the
-                     resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-      </cat:CT_Codelist>
-   </cat:codelistItem>
-   <!-- CI_TelephoneTypeCode  -->
-   <cat:codelistItem>
-      <cat:CT_Codelist id="CI_TelephoneTypeCode">
-         <cat:identifier>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >CI_TelephoneTypeCode</gco:ScopedName>
-         </cat:identifier>
-         <cat:name>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >CI_TelephoneTypeCode</gco:ScopedName>
-         </cat:name>
-         <cat:definition>
-            <gco:CharacterString>type of telephone</gco:CharacterString>
-         </cat:definition>
-         <cat:description>
-            <gco:CharacterString>type of telephone</gco:CharacterString>
-         </cat:description>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_TelephoneTypeCode_voice">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_TelephoneTypeCode_voice</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>telephone provides voice service</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_TelephoneTypeCode_fax">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_TelephoneTypeCode_fax</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>telephone provides facsimile service</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="CI_TelephoneTypeCode_sms">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >CI_TelephoneTypeCode_sms</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>telephone provides sms service</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-      </cat:CT_Codelist>
-   </cat:codelistItem>
-   <!--=== EOF ===-->
-</cat:CT_CodelistCatalogue>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/index.html
deleted file mode 100644
index 2c52e3bfe..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/cit/1.0/index.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Citation and responsible party information (CIT) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Citation and responsible party information (CIT) Version: 1.0</h1><img src="cit.png"><h2>Description</h2>
-      <p>CIT 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.6.3.  It includes utility elements for citation, identification, and web linkage of resources. The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>Sample XML files for cit 1.0</h2><a href="cit_invalid.xml">cit_invalid.xml</a> <a href="cit_valid.xml">cit_valid.xml</a> 
-      <h2>CodeLists for cit 1.0</h2><a href="codelists.html">codelists.html</a> <a href="codelists.xml">codelists.xml</a> 
-      <h2>XML Namespace for cit 1.0</h2>
-      <p>The namespace URI for cit 1.0 is <b>http://standards.iso.org/iso/19115/-3/cit/1.0</b>.
-      </p>
-      <h2>XML Schema for cit 1.0</h2>
-      <p><b><a href="cit.xsd">cit.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the cit 1.0 namespace or by XML Schema documents importing the cit 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the cit namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for cit 1.0 are available <a href="cit.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for cit 1.0</h2>
-      <p><b><a href="citation.xsd">citation.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.6.3. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): CI_Address, CI_Citation, CI_Contact, CI_Date, <b>CI_DateTypeCode</b>, CI_Individual, <b>CI_OnLineFunctionCode</b>, CI_OnlineResource, CI_Organisation, AbstractCI_Party, <b>CI_PresentationFormCode</b>, CI_Responsibility, <b>CI_RoleCode</b>, CI_Series, CI_Telephone, and <b>CI_TelephoneTypeCode</b></p>
-      <h2>Related XML Namespaces for cit 1.0</h2> The cit 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Geographic COmmon</td>
-            <td>gco</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gco/1.0">http://standards.iso.org/iso/19115/-3/gco/1.0</a></td>
-            <td>../../../../19115/-3/gco/1.0/gco.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata Common Classes</td>
-            <td>mcc</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mcc/1.0">http://standards.iso.org/iso/19115/-3/mcc/1.0</a></td>
-            <td>../../../../19115/-3/mcc/1.0/mcc.xsd</td>
-         </tr>
-      </table>
-      <h2>Schematron Validation Rules for cit 1.0</h2> Schematron rules for validating instance documents of the cit 1.0 namespace are in <a href="cit.sch">cit.sch</a>. Other schematron rule sets that are
-      required for a complete validation are: gco.sch, and mcc.sch
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gco/1.0/baseTypes2014.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gco/1.0/baseTypes2014.xsd
deleted file mode 100644
index f8a6e28fe..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gco/1.0/baseTypes2014.xsd
+++ /dev/null
@@ -1,530 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
-	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink"
-	targetNamespace="http://standards.iso.org/iso/19115/-3/gco/1.0"
-	elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic COmmon (GCO) extensible markup language is a component of the XML Schema Implementation of Geographic
-Information Metadata documented in ISO/TS 19115-3, based on the implementation patterns defined and utilized in ISO19139.
-This gcoBase.xsd schema provides:
-		1. tools to handle specific objects like "code lists" and "record";
-		2. Some XML types that do not follow the general encoding rules specified in ISO19139.
-		*** SMR 2014-12-22.  Refactor gco, gts, gsr, gss to separate gml dependencies.  
-		All element or attribute types in this schema are either types defined by this schema, or are datatypes defined by 
-		the XML schema namespace (http://www.w3.org/2001/XMLSchema)
-		To remove the dependency between gml and the base datatypes in ISO19115-3:
-			1. The nilReason attribute is defined here instead of extending the gml type. 
-			2. The definition of MeasureType is copied here from gml 3.2 basic Types. The only
-			difference this will introduce in instance documents is that the uom attribute on a measure value
-			(or one of its substitutions) will be gco:uom, not gml:uom.
-		</xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.w3.org/1999/xlink"
-		schemaLocation="http://www.w3.org/1999/xlink.xsd"/>
-
-	<!-- ########################################################################### -->
-	<!-- =========================================================================== -->
-	<!-- ========================= IM_Object: abstract Root ============================= -->
-	<!--================= Type ===================-->
-	<xs:complexType name="AbstractObject_Type" abstract="true">
-		<xs:sequence/>
-		<xs:attributeGroup ref="gco:ObjectIdentification"/>
-	</xs:complexType>
-	<!--================= Element =================-->
-	<xs:element name="AbstractObject" type="gco:AbstractObject_Type" abstract="true"/>
-	<!-- ========================================================================== -->
-	<!-- ====================== Reference of a resource =============================== -->
-	<!--The following attributeGroup 'extends' the GML  gml:AssociationAttributeGroup-->
-	<xs:attributeGroup name="ObjectReference">
-		<xs:attributeGroup ref="xlink:simpleAttrs"/>
-		<xs:attribute name="uuidref" type="xs:string"/>
-	</xs:attributeGroup>
-	<!--================== NULL ====================-->
-	<xs:attribute name="nilReason" type="gco:NilReasonType"/>
-
-	<xs:simpleType name="NilReasonType">
-		<xs:annotation>
-			<xs:documentation>copied from gml32:NilReasonType. This Type defines a content model that allows recording of an 
-				explanation for a void value or other exception.
-				gml:NilReasonType is a union of the following enumerated values:
-				-	inapplicable- there is no value
-				-	missing- the correct value is not readily available to the sender of this data. Furthermore, a correct value may not exist
-				-	template- the value will be available later
-				-	unknown- the correct value is not known to, and not computable by, the sender of this data. However, a correct value probably exists
-				-	withheld- the value is not divulged
-				-	other:text - other brief explanation, where text is a string of two or more characters with no included spaces
-				and
-				-	xs:anyURI which should refer to a resource which describes the reason for the exception
-				A particular community may choose to assign more detailed semantics to the standard values provided. Alternatively, the URI method enables a specific or more complete explanation for the absence of a value to be provided elsewhere and indicated by-reference in an instance document.
-				gml:NilReasonType is used as a member of a union in a number of simple content types where it is necessary to permit a value from the NilReasonType union as an alternative to the primary type.</xs:documentation>
-		</xs:annotation>
-		<xs:union memberTypes="gco:NilReasonEnumeration xs:anyURI"/>
-	</xs:simpleType>
-	<xs:simpleType name="NilReasonEnumeration">
-		<xs:union>
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="inapplicable"/>
-					<xs:enumeration value="missing"/>
-					<xs:enumeration value="template"/>
-					<xs:enumeration value="unknown"/>
-					<xs:enumeration value="withheld"/>
-				</xs:restriction>
-			</xs:simpleType>
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:pattern value="other:\w{2,}"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:union>
-	</xs:simpleType>
-	<!--=============== PropertyType =================-->
-	<xs:complexType name="ObjectReference_PropertyType">
-		<xs:sequence/>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- ====================== Identification of a resource ============================== -->
-	<xs:attributeGroup name="ObjectIdentification">
-		<xs:attribute name="id" type="xs:ID"/>
-		<xs:attribute name="uuid" type="xs:string"/>
-	</xs:attributeGroup>
-	<!-- ========================================================================== -->
-
-	<!-- ====================== The CodeList prototype ================================= -->
-	<!--It is used to refer to a specific codeListValue in a register-->
-	<!--================= Type ==================-->
-	<xs:complexType name="CodeListValue_Type">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="codeList" type="xs:anyURI" use="required"/>
-				<xs:attribute name="codeListValue" type="xs:anyURI" use="required"/>
-				<xs:attribute name="codeSpace" type="xs:anyURI"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- ========================== The isoType attribute ============================== -->
-	<xs:attribute name="isoType" type="xs:string"/>
-
-	<!-- moved from 19139 basicTypes.xsd -->
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<!-- =========================================================================== -->
-	<xs:complexType name="TypeName_Type">
-		<xs:annotation>
-			<xs:documentation>A TypeName is a LocalName that references either a recordType or object type in some form of schema. The stored value "aName" is the returned value for the "aName()" operation. This is the types name.  - For parsing from types (or objects) the parsible name normally uses a "." navigation separator, so that it is of the form  [class].[member].[memberOfMember]. ...)</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="aName" type="gco:CharacterString_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="TypeName" type="gco:TypeName_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="TypeName_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:TypeName"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MemberName_Type">
-		<xs:annotation>
-			<xs:documentation>A MemberName is a LocalName that references either an attribute slot in a record or  recordType or an attribute, operation, or association role in an object instance or  type description in some form of schema. The stored value "aName" is the returned value for the "aName()" operation.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="aName" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="attributeType" type="gco:TypeName_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MemberName" type="gco:MemberName_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MemberName_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:MemberName"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="Multiplicity_Type">
-		<xs:annotation>
-			<xs:documentation>Use to represent the possible cardinality of a relation. Represented by a set of simple multiplicity ranges.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="range" type="gco:MultiplicityRange_PropertyType"
-						maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="Multiplicity" type="gco:Multiplicity_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Multiplicity_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Multiplicity"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MultiplicityRange_Type">
-		<xs:annotation>
-			<xs:documentation>A component of a multiplicity, consisting of an non-negative lower bound, and a potentially infinite upper bound.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="lower" type="gco:Integer_PropertyType"/>
-					<xs:element name="upper" type="gco:UnlimitedInteger_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MultiplicityRange" type="gco:MultiplicityRange_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MultiplicityRange_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:MultiplicityRange"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-
-	<!-- ........................................................................ -->
-	<xs:element name="CharacterString" type="xs:string"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CharacterString_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:CharacterString"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Boolean" type="xs:boolean"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Boolean_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Boolean"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-
-	<!-- =========================== Date & DateTime ================================= -->
-	<!--=============================================-->
-	<xs:element name="DateTime" type="xs:dateTime"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DateTime_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:DateTime"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:simpleType name="Date_Type">
-		<xs:union memberTypes="xs:date xs:gYearMonth xs:gYear"/>
-	</xs:simpleType>
-	<!-- ........................................................................ -->
-	<xs:element name="Date" type="gco:Date_Type" nillable="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Date_PropertyType">
-		<xs:choice minOccurs="0">
-			<xs:element ref="gco:Date"/>
-			<xs:element ref="gco:DateTime"/>
-		</xs:choice>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- =========================== Number basic type =============================== -->
-	<!--=======================================================-->
-	<xs:complexType name="Number_PropertyType">
-		<xs:choice minOccurs="0">
-			<xs:element ref="gco:Real"/>
-			<xs:element ref="gco:Decimal"/>
-			<xs:element ref="gco:Integer"/>
-		</xs:choice>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Decimal" type="xs:decimal"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Decimal_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Decimal"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Real" type="xs:double"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Real_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Real"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Integer" type="xs:integer"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Integer_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Integer"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- ============================= UnlimitedInteger ================================ -->
-	<!--NB: The encoding mechanism below is based on the use of XCPT (see the usage of xsi:nil in XML instance).-->
-	<!--================= Type ==================-->
-	<xs:complexType name="UnlimitedInteger_Type">
-		<xs:simpleContent>
-			<xs:extension base="xs:nonNegativeInteger">
-				<xs:attribute name="isInfinite" type="xs:boolean"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="UnlimitedInteger" type="gco:UnlimitedInteger_Type" nillable="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="UnlimitedInteger_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:UnlimitedInteger"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- ========================= Record & RecordType ============================== -->
-	<!--================= Record ==================-->
-	<xs:element name="Record"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Record_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Record"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!--================= RecordType ==================-->
-	<xs:complexType name="RecordType_Type">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attributeGroup ref="xlink:simpleAttrs"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="RecordType" type="gco:RecordType_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="RecordType_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:RecordType"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- =========================== Binary basic type ================================ -->
-	<!--NB: this type is not declared in 19103 but used in 19115. -->
-	<!--================= Type ==================-->
-	<xs:complexType name="Binary_Type">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="src" type="xs:anyURI"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="Binary" type="gco:Binary_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Binary_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Binary"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!--================================================-->
-	<!--================================================-->
-	<!-- ================== Measure and the Measure substitution group===================== -->
-	<!-- ........................................................................ -->
-	<!--================= Type ===================-->
-	<xs:complexType name="MeasureType">
-		<xs:annotation>
-			<xs:documentation>Copied from gml32:MeasureType, which supports recording an amount encoded as a value of XML Schema double, together with a units of measure indicated by an attribute uom, short for "units Of measure". The value of the uom attribute identifies a reference system for the amount, usually a ratio or interval scale. Namespace changed to gco</xs:documentation>
-		</xs:annotation>
-		<xs:simpleContent>
-			<xs:extension base="xs:double">
-				<xs:attribute name="uom" type="gco:UomIdentifierType" use="required"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- SMR handcraft UomIdentifier to implement 19103:2015 interface; this will allow
-	reducing dependencies on GML for elements using measures with a separate unit of measurement element-->
-	<!--================= Element =================-->
-	<xs:element name="UomIdentifier" type="gco:UomIdentifierType"/>
-	<!--================= Type ===================-->
-	<xs:simpleType name="UomIdentifierType">
-		<xs:annotation>
-			<xs:documentation>The simple type gml:UomIdentifer defines the syntax and value space of the unit of measure identifier.</xs:documentation>
-		</xs:annotation>
-		<xs:union memberTypes="gco:UomSymbol gco:UomURI"/>
-	</xs:simpleType>
-	<xs:simpleType name="UomSymbol">
-		<xs:annotation>
-			<xs:documentation>This type specifies a character string of length at least one, and restricted such that it must not contain any of the following characters: ":" (colon), " " (space), (newline), (carriage return), (tab). This allows values corresponding to familiar abbreviations, such as "kg", "m/s", etc. 
-				It is recommended that the symbol be an identifier for a unit of measure as specified in the "Unified Code of Units of Measure" (UCUM) (http://aurora.regenstrief.org/UCUM). This provides a set of symbols and a grammar for constructing identifiers for units of measure that are unique, and may be easily entered with a keyboard supporting the limited character set known as 7-bit ASCII. ISO 2955 formerly provided a specification with this scope, but was withdrawn in 2001. UCUM largely follows ISO 2955 with modifications to remove ambiguities and other problems.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[^: \n\r\t]+"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="UomURI">
-		<xs:annotation>
-			<xs:documentation>This type specifies a URI, restricted such that it must start with one of the following sequences: "#", "./", "../", or a string of characters followed by a ":". These patterns ensure that the most common URI forms are supported, including absolute and relative URIs and URIs that are simple fragment identifiers, but prohibits certain forms of relative URI that could be mistaken for unit of measure symbol . 
-				NOTE	It is possible to re-write such a relative URI to conform to the restriction (e.g. "./m/s").
-				In an instance document, on elements of type gml:MeasureType the mandatory uom attribute shall carry a value corresponding to either 
-				-	a conventional unit of measure symbol,
-				-	a link to a definition of a unit of measure that does not have a conventional symbol, or when it is desired to indicate a precise or variant definition.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:anyURI">
-			<xs:pattern value="([a-zA-Z][a-zA-Z0-9\-\+\.]*:|\.\./|\./|#).*"/>
-		</xs:restriction>
-	</xs:simpleType>
-	
-	
-	<!-- ============ UomIdentifier Property =================== -->
-	<!-- implementing interface defined in ISO19103:2015 -->
-	<xs:complexType name="UomIdentifier_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:UomIdentifier"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-
-
-	<!--================= Element =================-->
-	<xs:element name="Measure" type="gco:MeasureType"/>
-	<!-- ============ Property =================== -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="Measure_PropertyType">
-		<!-- used in spatialRepresentation.xsd, msr:resolution -->
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Measure"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ============Substitutions for measure ==================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Length" type="gco:MeasureType" substitutionGroup="gco:Measure"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Length_PropertyType">
-		<!-- not used in schema 19115-3; 
-			Distance, in substitution group for length, is used (see below) -->
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Length"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- Substitution for Measure.Length ================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Distance" type="gco:MeasureType" substitutionGroup="gco:Length"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Distance_PropertyType">
-		<!-- used in identification.xsd mri:distance and mri:vertical properties
-			used in lineageImagery.xsd mrl:scanningResolution and mrl:groundResolution -->
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Distance"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="Angle" type="gco:MeasureType" substitutionGroup="gco:Measure"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Angle_PropertyType">
-		<!-- used in identification.xsd mri:angularDistance-->
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Angle"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractGenericName" type="gco:CodeType" abstract="true"/>
-	<!-- defines substitution group for elements that have a gco:codeSpace attribute -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="CodeType">
-		<xs:annotation>
-			<xs:documentation>gml:CodeType is a generalized type to be used for a term, keyword or name. It adds a XML attribute codeSpace to a term, where the value of the codeSpace attribute (if present) shall indicate a dictionary, thesaurus, classification scheme, authority, or pattern for the term.</xs:documentation>
-		</xs:annotation>
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="codeSpace" type="xs:anyURI"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-
-	<xs:complexType name="GenericName_PropertyType">
-		<!-- used in catalogues.xsd cat:identifier
-			used in metadataTransfer.xsd mdt:featureTypes
-			used in content.xsd mrc:featureTypeName
-			used in serviceInformation.xsd srv:serviceType -->
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:AbstractGenericName"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ScopedName" type="gco:CodeType" substitutionGroup="gco:AbstractGenericName"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ScopedName_PropertyType">
-		<!-- used in serviceInformation.xsd srv:scopedName property -->
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:ScopedName"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-
-	<!-- =========================================================================== -->
-	<!-- ......move from gmw because it has no dependency on gml ................... -->
-	<xs:element name="TM_PeriodDuration" type="xs:duration"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="TM_PeriodDuration_PropertyType">
-		<!-- used in maintenance.xsd mmi:userDefinedMaintenanceFrequency
-			used in distribution.xsd mrd:transferFrequency
-			used in identification.xsd mri:temporalResolution.  all of these properties
-			are optional. -->
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:TM_PeriodDuration"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-
-	<!--==============End================-->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gco/1.0/gco.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gco/1.0/gco.xsd
deleted file mode 100644
index 7db0f2145..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gco/1.0/gco.xsd
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-	xmlns:xlink="http://www.w3.org/1999/xlink" 
-	xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" 
-	targetNamespace="http://standards.iso.org/iso/19115/-3/gco/1.0" 
-	elementFormDefault="qualified">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This is the root document of the The Geographic COmmon (GCO) http://standards.iso.org/iso/19115/-3/gco/1.0 namespace, a component of the XML Schema Implementation of Geographic Information Metadata (ISO19115-1). Original implementation documented in ISO/TS 19139:2007 is refactored in this implementation for ISO19115-3 to remove dependency of base data types on GML (the only gml element used was the enumeration of nilReasons). GCO includes all the definitions of http://standards.iso.org/iso/19115/-3/gco/1.0 namespace. Elements that are extensions of GML elements are defined in the gmw namespace in ISO19115-3. </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:include schemaLocation="baseTypes2014.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gco/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gco/1.0/index.html
deleted file mode 100644
index 874b69ca1..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gco/1.0/index.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Geographic COmmon (GCO) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Geographic COmmon (GCO) Version: 1.0</h1><img src="gco.png"><h2>Description</h2>
-      <p>GCO 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, ISO/TS 19139 Geographic information - Metadata - XML schema implementation,
-         Clause .  It includes elements for describing basic types from ISO/TS 19103 and conceptual elements from
-         ISO 19118 required in XML implementations of ISO metadata standards. The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>XML Namespace for gco 1.0</h2>
-      <p>The namespace URI for gco 1.0 is <b>http://standards.iso.org/iso/19115/-3/gco/1.0</b>.
-      </p>
-      <h2>XML Schema for gco 1.0</h2>
-      <p><b><a href="gco.xsd">gco.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the gco 1.0 namespace or by XML Schema documents importing the gco 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the gco namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for gco 1.0 are available <a href="gco.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for gco 1.0</h2>
-      <p><b><a href="baseTypes2014.xsd">baseTypes2014.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, ISO/TS 19139 Geographic information - Metadata - XML schema implementation,
-         Clause . It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): AbstractObject, TypeName, MemberName, Multiplicity, MultiplicityRange, CharacterString, Boolean, DateTime, Date, Decimal, Real, Integer, UnlimitedInteger, Record, RecordType, Binary, Measure, Length, Distance, Angle, AbstractGenericName, ScopedName, and TM_PeriodDuration
-      </p>
-      <h2>Related XML Namespaces for gco 1.0</h2> The gco 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>XML Linking Language (XLink) Version 1.0. W3C Recommendation</td>
-            <td>xlink</td>
-            <td><a href="http://www.w3.org/1999/xlink">http://www.w3.org/1999/xlink</a></td>
-            <td>http://www.w3.org/1999/xlink.xsd</td>
-         </tr>
-      </table>
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gcx/1.0/extendedTypes.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gcx/1.0/extendedTypes.xsd
deleted file mode 100644
index 82afc167a..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gcx/1.0/extendedTypes.xsd
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://standards.iso.org/iso/19115/-3/gcx/1.0" elementFormDefault="qualified" version="20140711" 
-  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" 
-  xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 03-14-2005 12:00:20 ====== Handcrafted
-		20130614 SMR updates: 
-		1. schema locations for gco and xlink. 
-		2. change namespace prefix from gmx to gcx, to use for ISO19115-3.  
-		3. change attribute group for gcx:anchor from xlink:simpleLink (old) to xlink:simpleAttrs (new). 
-		
-		20130327 - Ted changed targetNamespace and gcx namespace to http://www.isotc211.org/2005/gcx/1.0/2013-03-28
-		20130624 SMR update namespace version date
-		20140729 SMR update namespace for 07-11 build. The schema generated by ShapeChange from the UML does not work for gcx namespace.
-		</xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-  <!-- Changed schema location to address gml vs. gml/3.2 problem Ted Habermann 2013-12-26 -->
-  <!--<import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>-->
-  <xs:import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-	<xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.w3.org/1999/xlink.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<!-- ======================== Handcrafted types =================================== -->
-	<!-- ========================================================================== -->
-	<!-- ====================== The FileName prototype ================================ -->
-	<!--It is used to point to a source file and is substitutable for CharacterString-->
-	<!--================= Type ==================-->
-	<xs:complexType name="FileName_Type">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="src" type="xs:anyURI"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="FileName" type="gcx:FileName_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="FileName_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gcx:FileName"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- ====================== The MimeFileType prototype ============================= -->
-	<!--It is used to provide information on file types and is substitutable for CharacterString-->
-	<!--================= Type ==================-->
-	<xs:complexType name="MimeFileType_Type">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="type" type="xs:string" use="required"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MimeFileType" type="gcx:MimeFileType_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MimeFileType_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gcx:MimeFileType"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- ======================= The Anchor prototype ================================ -->
-	<!--It is used to point to a registred definition-->
-	<!--================= Type ==================-->
-	<xs:complexType name="Anchor_Type">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<!-- update from xslink:simpleLink to xlink:simpleAttrs with
-					new xlink schema location SMR 20130326 -->
-				<!-- on 2013-06-24 build, simleAttrs doesn't work, but simpleLink does... WTF! -->
-			  <!-- Changed back 2013-12-26 by Ted Habermann trying to get 19157-2 to validate -->
-				<xs:attributeGroup ref="xlink:simpleAttrs"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="Anchor" type="gcx:Anchor_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Anchor_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gcx:Anchor"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!--======= End of Schema ======-->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gcx/1.0/extendedTypes_autoFromShapeChange.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gcx/1.0/extendedTypes_autoFromShapeChange.xsd
deleted file mode 100644
index b26b3cb60..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gcx/1.0/extendedTypes_autoFromShapeChange.xsd
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/gcx/1.0" version="1.0">
-  <annotation>
-    <documentation>Handcrafted</documentation>
-  </annotation>
-  <include schemaLocation="gcx.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="Anchor" substitutionGroup="gco:AbstractObject" type="gcx:Anchor_Type"/>
-  <complexType name="Anchor_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element minOccurs="0" name="href" type="mcc:URI_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="Anchor_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="gcx:Anchor"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="FileName" substitutionGroup="gco:AbstractObject" type="gcx:FileName_Type"/>
-  <complexType name="FileName_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="src" type="mcc:URI_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="FileName_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="gcx:FileName"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MimeFileType" substitutionGroup="gco:AbstractObject" type="gcx:MimeFileType_Type"/>
-  <complexType name="MimeFileType_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="type" type="gco:CharacterString_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MimeFileType_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="gcx:MimeFileType"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gcx/1.0/gcx.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gcx/1.0/gcx.png
deleted file mode 100644
index 12e24528a..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gcx/1.0/gcx.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gcx/1.0/gcx.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gcx/1.0/gcx.xsd
deleted file mode 100644
index 8cd7af1de..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gcx/1.0/gcx.xsd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0"  elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/gcx/1.0" version="1.0">
-  <annotation>
-    <documentation>Elements for xml implementation, from ISO 19139 updated for compatibility with new schema. Anchor, FileName, MimeFileType; all in substitution group for CharacterString to support Web environments.</documentation>
-  </annotation>
-  <include schemaLocation="extendedTypes.xsd"/>
-
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gcx/1.0/gcx.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gcx/1.0/gcx.zip
deleted file mode 100644
index 7b1ddb1f7..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gcx/1.0/gcx.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gcx/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gcx/1.0/index.html
deleted file mode 100644
index 04f097f2e..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gcx/1.0/index.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Geospatial Common eXtension (GCX) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Geospatial Common eXtension (GCX) Version: 1.0</h1><img src="gcx.png"><h2>Description</h2>
-      <p>GCX 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 7.2.  It includes elements for xml implementation, from ISO 19139 updated for compatibility with 19115-3. The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>XML Namespace for gcx 1.0</h2>
-      <p>The namespace URI for gcx 1.0 is <b>http://standards.iso.org/iso/19115/-3/gcx/1.0</b>.
-      </p>
-      <h2>XML Schema for gcx 1.0</h2>
-      <p><b><a href="gcx.xsd">gcx.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the gcx 1.0 namespace or by XML Schema documents importing the gcx 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the gcx namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for gcx 1.0 are available <a href="gcx.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for gcx 1.0</h2>
-      <p><b><a href="extendedTypes.xsd">extendedTypes.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 7.2. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): FileName, MimeFileType, and Anchor
-      </p>
-      <h2>Related XML Namespaces for gcx 1.0</h2> The gcx 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Geographic COmmon</td>
-            <td>gco</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gco/1.0">http://standards.iso.org/iso/19115/-3/gco/1.0</a></td>
-            <td>../../../../19115/-3/gco/1.0/gco.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata Common Classes</td>
-            <td>mcc</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mcc/1.0">http://standards.iso.org/iso/19115/-3/mcc/1.0</a></td>
-            <td>../../../../19115/-3/mcc/1.0/mcc.xsd</td>
-         </tr>
-         <tr>
-            <td>XML Linking Language (XLink) Version 1.0. W3C Recommendation</td>
-            <td>xlink</td>
-            <td><a href="http://www.w3.org/1999/xlink">http://www.w3.org/1999/xlink</a></td>
-            <td>http://www.w3.org/1999/xlink.xsd</td>
-         </tr>
-      </table>
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/extent.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/extent.xsd
deleted file mode 100644
index 99e560ba5..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/extent.xsd
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" 
-  xmlns:gex="http://standards.iso.org/iso/19115/-3/gex/1.0" xmlns:gmw="http://standards.iso.org/iso/19115/-3/gmw/1.0" 
-  xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" 
-  elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/gex/1.0" version="1.0">
-  <!-- deprecated namespaces:
-  xmlns:gts="http://www.isotc211.org/2005/gts"
-  xmlns:rce="http://standards.iso.org/iso/19111/rce/1.0" -->
-  <!-- <include schemaLocation="gex.xsd"/>-->
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gmw/1.0" schemaLocation="../../../../19115/-3/gmw/1.0/gmw.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--  <import namespace="http://standards.iso.org/iso/19111/rce/1.0" schemaLocation="../../../../19111/rce/1.0/rce.xsd"/>-->
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="EX_BoundingPolygon" substitutionGroup="gex:AbstractEX_GeographicExtent" type="gex:EX_BoundingPolygon_Type">
-    <annotation>
-      <documentation>enclosing geometric object which locates the resource, expressed as a set of (x,y) coordinate (s) NOTE: If a polygon is used it should be closed (last point replicates first point)</documentation>
-    </annotation>
-  </element>
-  <complexType name="EX_BoundingPolygon_Type">
-    <complexContent>
-      <extension base="gex:AbstractEX_GeographicExtent_Type">
-        <sequence>
-          <element maxOccurs="unbounded" name="polygon" type="gmw:GM_Object_PropertyType">
-            <annotation>
-              <documentation>sets of points defining the bounding polygon or any other GM_Object geometry (point, line or polygon)</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="EX_BoundingPolygon_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="gex:EX_BoundingPolygon"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="EX_Extent" substitutionGroup="mcc:Abstract_Extent" type="gex:EX_Extent_Type">
-    <annotation>
-      <documentation>extent of the resource</documentation>
-    </annotation>
-  </element>
-  <complexType name="EX_Extent_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_Extent_Type">
-        <sequence>
-          <element minOccurs="0" name="description" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>sets of points defining the bounding polygon or any other GM_Object geometry (point, line or polygon)</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="geographicElement" type="gex:AbstractEX_GeographicExtent_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="temporalElement" type="gex:EX_TemporalExtent_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="verticalElement" type="gex:EX_VerticalExtent_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="EX_Extent_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="gex:EX_Extent"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="EX_GeographicBoundingBox" substitutionGroup="gex:AbstractEX_GeographicExtent" type="gex:EX_GeographicBoundingBox_Type">
-    <annotation>
-      <documentation>geographic position of the resource NOTE: This is only an approximate reference so specifying the coordinate reference system is unnecessary and need only be provided with a precision of up to two decimal places</documentation>
-    </annotation>
-  </element>
-  <complexType name="EX_GeographicBoundingBox_Type">
-    <complexContent>
-      <extension base="gex:AbstractEX_GeographicExtent_Type">
-        <sequence>
-          <element name="westBoundLongitude" type="gco:Decimal_PropertyType">
-            <annotation>
-              <documentation>western-most coordinate of the limit of the resource extent, expressed in longitude in decimal degrees (positive east)</documentation>
-            </annotation>
-          </element>
-          <element name="eastBoundLongitude" type="gco:Decimal_PropertyType">
-            <annotation>
-              <documentation>eastern-most coordinate of the limit of the resource extent, expressed in longitude in decimal degrees (positive east)</documentation>
-            </annotation>
-          </element>
-          <element name="southBoundLatitude" type="gco:Decimal_PropertyType">
-            <annotation>
-              <documentation>southern-most coordinate of the limit of the resource extent, expressed in latitude in decimal degrees (positive north)</documentation>
-            </annotation>
-          </element>
-          <element name="northBoundLatitude" type="gco:Decimal_PropertyType">
-            <annotation>
-              <documentation>northern-most, coordinate of the limit of the resource extent expressed in latitude in decimal degrees (positive north)</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="EX_GeographicBoundingBox_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="gex:EX_GeographicBoundingBox"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="EX_GeographicDescription" substitutionGroup="gex:AbstractEX_GeographicExtent" type="gex:EX_GeographicDescription_Type">
-    <annotation>
-      <documentation>description of the geographic area using identifiers</documentation>
-    </annotation>
-  </element>
-  <complexType name="EX_GeographicDescription_Type">
-    <complexContent>
-      <extension base="gex:AbstractEX_GeographicExtent_Type">
-        <sequence>
-          <element name="geographicIdentifier" type="mcc:MD_Identifier_PropertyType">
-            <annotation>
-              <documentation>identifier used to represent a geographic area e.g. a geographic identifier as described in ISO 19112</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="EX_GeographicDescription_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="gex:EX_GeographicDescription"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="AbstractEX_GeographicExtent" substitutionGroup="gco:AbstractObject" type="gex:AbstractEX_GeographicExtent_Type">
-    <annotation>
-      <documentation>spatial area of the resource</documentation>
-    </annotation>
-  </element>
-  <complexType abstract="true" name="AbstractEX_GeographicExtent_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element minOccurs="0" name="extentTypeCode" type="gco:Boolean_PropertyType">
-            <annotation>
-              <documentation>indication of whether the geographic element encompasses an area covered by the data or an area where data is not present</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="AbstractEX_GeographicExtent_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="gex:AbstractEX_GeographicExtent"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="EX_SpatialTemporalExtent" substitutionGroup="gex:EX_TemporalExtent" type="gex:EX_SpatialTemporalExtent_Type">
-    <annotation>
-      <documentation>extent with respect to date/time and spatial boundaries</documentation>
-    </annotation>
-  </element>
-  <complexType name="EX_SpatialTemporalExtent_Type">
-    <complexContent>
-      <extension base="gex:EX_TemporalExtent_Type">
-        <sequence>
-          <element minOccurs="0" name="verticalExtent" type="gex:EX_VerticalExtent_PropertyType">
-            <annotation>
-              <documentation>vertical extent component</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" name="spatialExtent" type="gex:AbstractEX_GeographicExtent_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="EX_SpatialTemporalExtent_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="gex:EX_SpatialTemporalExtent"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="EX_TemporalExtent" substitutionGroup="gco:AbstractObject" type="gex:EX_TemporalExtent_Type">
-    <annotation>
-      <documentation>time period covered by the content of the resource</documentation>
-    </annotation>
-  </element>
-  <complexType name="EX_TemporalExtent_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="extent" type="gmw:TM_Primitive_PropertyType">
-            <annotation>
-              <documentation>period for the content of the resource</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="EX_TemporalExtent_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="gex:EX_TemporalExtent"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="EX_VerticalExtent" substitutionGroup="gco:AbstractObject" type="gex:EX_VerticalExtent_Type">
-    <annotation>
-      <documentation>vertical domain of resource</documentation>
-    </annotation>
-  </element>
-  <complexType name="EX_VerticalExtent_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="minimumValue" type="gco:Real_PropertyType">
-            <annotation>
-              <documentation>lowest vertical extent contained in the resource</documentation>
-            </annotation>
-          </element>
-          <element name="maximumValue" type="gco:Real_PropertyType">
-            <annotation>
-              <documentation>highest vertical extent contained in the resource</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="verticalCRSId" type="mcc:Abstract_ReferenceSystem_PropertyType"/>
-          <element minOccurs="0" name="verticalCRS" type="gmw:SC_CRS_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="EX_VerticalExtent_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="gex:EX_VerticalExtent"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/gex-Extent.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/gex-Extent.png
deleted file mode 100644
index 1c2f4dae8..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/gex-Extent.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/gex.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/gex.png
deleted file mode 100644
index c9e9f6e86..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/gex.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/gex.sch b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/gex.sch
deleted file mode 100644
index 55d22b432..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/gex.sch
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron">
-  <sch:ns prefix="cit" uri="http://standards.iso.org/iso/19115/-3/cit/1.0"/>
-  <sch:ns prefix="gex" uri="http://standards.iso.org/iso/19115/-3/gex/1.0"/>
-  <sch:ns prefix="gco" uri="http://standards.iso.org/iso/19115/-3/gco/1.0"/>
-  <!--
-    ISO 19115-3 base requirements for metadata instance documents
-    
-    See ISO19115-1:2014(E) page 24, Figure 19 Extent information classes
-  -->
-  
-  <!-- 
-    Rule: EX_Extent
-    Ref: {count(description + 
-                geographicElement + 
-                temporalElement + 
-                verticalElement) >0}
-    -->
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.gex.extenthasoneelement-failure-en"
-      xml:lang="en">The extent does not contain a description or a geographicElement.</sch:diagnostic>
-    <sch:diagnostic id="rule.gex.extenthasoneelement-failure-fr"
-      xml:lang="fr">L'étendue ne contient aucun élement.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.gex.extenthasoneelement-desc-success-en"
-      xml:lang="en">The extent contains a description.</sch:diagnostic>
-    <sch:diagnostic id="rule.gex.extenthasoneelement-desc-success-fr"
-      xml:lang="fr">L'étendue contient une description.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.gex.extenthasoneelement-id-success-en"
-      xml:lang="en">The extent contains a geographic identifier.</sch:diagnostic>
-    <sch:diagnostic id="rule.gex.extenthasoneelement-id-success-fr"
-      xml:lang="fr">L'étendue contient un identifiant géographique.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.gex.extenthasoneelement-box-success-en"
-      xml:lang="en">The extent contains a bounding box element.</sch:diagnostic>
-    <sch:diagnostic id="rule.gex.extenthasoneelement-box-success-fr"
-      xml:lang="fr">L'étendue contient une emprise géographique.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.gex.extenthasoneelement-poly-success-en"
-      xml:lang="en">The extent contains a bounding polygon.</sch:diagnostic>
-    <sch:diagnostic id="rule.gex.extenthasoneelement-poly-success-fr"
-      xml:lang="fr">L'étendue contient un polygone englobant.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.gex.extenthasoneelement-vertical-success-en"
-      xml:lang="en">The extent contains a vertical element.</sch:diagnostic>
-    <sch:diagnostic id="rule.gex.extenthasoneelement-vertical-success-fr"
-      xml:lang="fr">L'étendue contient une étendue verticale.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.gex.extenthasoneelement-temporal-success-en"
-      xml:lang="en">The extent contains a temporal element.</sch:diagnostic>
-    <sch:diagnostic id="rule.gex.extenthasoneelement-temporal-success-fr"
-      xml:lang="fr">L'étendue contient une étendue temporelle.</sch:diagnostic>
-    
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.gex.extenthasoneelement">
-    <sch:title xml:lang="en">Extent MUST have one description or one geographic, temporal or vertical element</sch:title>
-    <sch:title xml:lang="fr">Une étendue DOIT avoir une description ou un élément géographique, temporel ou vertical</sch:title>
-    
-    <sch:rule context="//gex:EX_Extent">
-      
-      <!-- Check that element exist and is not empty ones.
-      TODO improve nonEmpty checks -->
-      <sch:let name="description" 
-               value="gex:description[text() != '']"/>
-      <sch:let name="geographicId" 
-               value="gex:geographicElement/gex:EX_GeographicDescription/
-                         gex:geographicIdentifier[normalize-space(*) != '']"/>
-      <sch:let name="geographicBox" 
-               value="gex:geographicElement/
-                         gex:EX_GeographicBoundingBox[
-                         normalize-space(gex:westBoundLongitude/gco:Decimal) != '' and
-                         normalize-space(gex:eastBoundLongitude/gco:Decimal) != '' and
-                         normalize-space(gex:southBoundLatitude/gco:Decimal) != '' and
-                         normalize-space(gex:northBoundLatitude/gco:Decimal) != ''
-                         ]"/>
-      <sch:let name="geographicPoly" 
-               value="gex:geographicElement/gex:EX_BoundingPolygon[
-                         normalize-space(gex:polygon) != '']"/>
-      <sch:let name="temporal" 
-               value="gex:temporalElement/gex:EX_TemporalExtent[
-                         normalize-space(gex:extent) != '']"/>
-      <sch:let name="vertical" 
-               value="gex:verticalElement/gex:EX_VerticalExtent[
-                         normalize-space(gex:minimumValue) != '' and
-                         normalize-space(gex:maximumValue) != '']"/>
-      
-      
-      <sch:let name="hasAtLeastOneElement" 
-        value="count($description) +
-        count($geographicId) +
-        count($geographicBox) +
-        count($geographicPoly) +
-        count($temporal) +
-        count($vertical) > 0
-        "/>
-      
-      <sch:assert test="$hasAtLeastOneElement"
-        diagnostics="rule.gex.extenthasoneelement-failure-en 
-                     rule.gex.extenthasoneelement-failure-fr"/>
-      
-      <sch:report test="count($description)"
-        diagnostics="rule.gex.extenthasoneelement-desc-success-en 
-                     rule.gex.extenthasoneelement-desc-success-fr"/>
-      <sch:report test="count($geographicId)"
-        diagnostics="rule.gex.extenthasoneelement-id-success-en 
-                     rule.gex.extenthasoneelement-id-success-fr"/>
-      <sch:report test="count($geographicBox)"
-        diagnostics="rule.gex.extenthasoneelement-box-success-en 
-                     rule.gex.extenthasoneelement-box-success-fr"/>
-      <sch:report test="count($geographicPoly)"
-        diagnostics="rule.gex.extenthasoneelement-poly-success-en 
-                     rule.gex.extenthasoneelement-poly-success-fr"/>
-      <sch:report test="count($temporal)"
-        diagnostics="rule.gex.extenthasoneelement-temporal-success-en 
-                     rule.gex.extenthasoneelement-temporal-success-fr"/>
-      <sch:report test="count($vertical)"
-        diagnostics="rule.gex.extenthasoneelement-vertical-success-en 
-                     rule.gex.extenthasoneelement-vertical-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
-  
-  
-  <!-- 
-    Rule: EX_VerticalExtent
-    Ref: {count(verticalCRS + verticalCRSId) > 0)}
-  -->
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.gex.verticalhascrsorcrsid-failure-en"
-      xml:lang="en">The vertical extent does not contains CRS or CRS identifier.</sch:diagnostic>
-    <sch:diagnostic id="rule.gex.verticalhascrsorcrsid-failure-fr"
-      xml:lang="fr">L'étendue verticale ne contient pas de CRS ou d'identifiant de CRS.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.gex.verticalhascrsorcrsid-success-en"
-      xml:lang="en">The vertical extent contains CRS information.</sch:diagnostic>
-    <sch:diagnostic id="rule.gex.verticalhascrsorcrsid-success-fr"
-      xml:lang="fr">L'étendue verticale contient les informations sur le CRS.</sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.gex.verticalhascrsorcrsid">
-    <sch:title xml:lang="en">Vertical element MUST contains a CRS or CRS identifier</sch:title>
-    <sch:title xml:lang="fr">Une étendue verticale DOIT contenir un CRS ou un identifiant de CRS</sch:title>
-    
-    <sch:rule context="//gex:EX_VerticalExtent">
-      
-      <sch:let name="crs" value="gex:verticalCRS"/>
-      <sch:let name="crsId" value="gex:verticalCRSId"/>
-      <sch:let name="hasCrsOrCrsId" 
-        value="count($crs) + count($crsId) > 0"/>
-      
-      <sch:assert test="$hasCrsOrCrsId"
-        diagnostics="rule.gex.verticalhascrsorcrsid-failure-en 
-                     rule.gex.verticalhascrsorcrsid-failure-fr"/>
-      
-      <sch:report test="$hasCrsOrCrsId"
-        diagnostics="rule.gex.verticalhascrsorcrsid-success-en 
-                     rule.gex.verticalhascrsorcrsid-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
-  
-  
-</sch:schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/gex.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/gex.xsd
deleted file mode 100644
index d743b92d8..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/gex.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gex="http://standards.iso.org/iso/19115/-3/gex/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:rce="http://standards.iso.org/iso/19111/rce/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/gex/1.0" version="1.0">
-  <annotation>
-    <documentation>Namespace for XML elements used to specify spatial and temporal extents.</documentation>
-  </annotation>
-  <include schemaLocation="extent.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/gex.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/gex.zip
deleted file mode 100644
index 9b8330acc..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/gex.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/gex_invalid.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/gex_invalid.xml
deleted file mode 100644
index 3a6c8d15b..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/gex_invalid.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mdb/1.0 ../../mdb/1.0/mdb.xsd"
-   xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0"
-   xmlns:gex="http://standards.iso.org/iso/19115/-3/gex/1.0" xmlns:gml="http://www.opengis.net/gml/3.2">
-   <mdb:metadataIdentifier/>
-   <mdb:metadataScope/>
-   <mdb:contact/>
-   <mdb:dateInfo/>
-   <mdb:identificationInfo>
-      <mri:MD_DataIdentification>
-         <mri:citation/>
-         <mri:abstract/>
-         <!-- invalid for rule.gex.extenthasoneelement -->
-         <mri:extent>
-            <gex:EX_Extent>
-               <gex:description/>
-            </gex:EX_Extent>
-         </mri:extent>
-         <mri:extent>
-            <gex:EX_Extent>
-               <gex:description>
-                  <gco:CharacterString>description</gco:CharacterString>
-               </gex:description>
-               <gex:verticalElement>
-                  <!-- invalid for rule.gex.verticalhascrsorcrsid -->
-                  <gex:EX_VerticalExtent>
-                     <gex:minimumValue/>
-                     <gex:maximumValue/>
-                  </gex:EX_VerticalExtent>
-               </gex:verticalElement>
-            </gex:EX_Extent>
-         </mri:extent>
-      </mri:MD_DataIdentification>
-   </mdb:identificationInfo>
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/gex_valid.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/gex_valid.xml
deleted file mode 100644
index e34ca5b31..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/gex_valid.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-   xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mdb/1.0 ../../mdb/1.0/mdb.xsd"
-   xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0" 
-   xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" 
-   xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0"
-   xmlns:gex="http://standards.iso.org/iso/19115/-3/gex/1.0" 
-   xmlns:gml="http://www.opengis.net/gml/3.2">
-   <mdb:metadataIdentifier/>
-   <mdb:metadataScope/>
-   <mdb:contact/>
-   <mdb:dateInfo/>
-   <mdb:identificationInfo>
-      <mri:MD_DataIdentification>
-         <mri:citation/>
-         <mri:abstract/>
-         <!-- Valid for rule.gex.extenthasoneelement -->
-         <mri:extent>
-            <gex:EX_Extent>
-               <gex:description>
-                  <gco:CharacterString>description</gco:CharacterString>
-               </gex:description>
-            </gex:EX_Extent>
-         </mri:extent>
-         <mri:extent>
-            <gex:EX_Extent>
-               <gex:geographicElement>
-                  <gex:EX_GeographicDescription>
-                     <gex:geographicIdentifier/>
-                  </gex:EX_GeographicDescription>
-               </gex:geographicElement>
-               <gex:geographicElement>
-                  <gex:EX_GeographicBoundingBox>
-                     <gex:westBoundLongitude>
-                        <gco:Decimal>9</gco:Decimal>
-                     </gex:westBoundLongitude>
-                     <gex:eastBoundLongitude>
-                        <gco:Decimal>10</gco:Decimal>
-                     </gex:eastBoundLongitude>
-                     <gex:southBoundLatitude>
-                        <gco:Decimal>-14</gco:Decimal>
-                     </gex:southBoundLatitude>
-                     <gex:northBoundLatitude>
-                        <gco:Decimal>-13</gco:Decimal>
-                     </gex:northBoundLatitude>
-                  </gex:EX_GeographicBoundingBox>
-               </gex:geographicElement>
-               <gex:geographicElement>
-                  <gex:EX_BoundingPolygon>
-                     <gex:polygon>
-                        <gml:Polygon gml:id="A1">
-                           <gml:exterior>
-                              <gml:LinearRing>
-                                 <gml:posList> 1 1 1 2 2 2 0 4 1 1 </gml:posList>
-                              </gml:LinearRing>
-                           </gml:exterior>
-                        </gml:Polygon>
-                     </gex:polygon>
-                  </gex:EX_BoundingPolygon>
-               </gex:geographicElement>
-            </gex:EX_Extent>
-         </mri:extent>
-         <mri:extent>
-            <gex:EX_Extent>
-               <gex:verticalElement>
-                  <gex:EX_VerticalExtent>
-                     <gex:minimumValue>
-                        <gco:Real>-1000</gco:Real>
-                     </gex:minimumValue>
-                     <gex:maximumValue>
-                        <gco:Real>0</gco:Real>
-                     </gex:maximumValue>
-                     <gex:verticalCRSId gco:nilReason="inapplicable"/>
-                  </gex:EX_VerticalExtent>
-               </gex:verticalElement>
-            </gex:EX_Extent>
-         </mri:extent>
-         <mri:extent>
-            <gex:EX_Extent>
-               <gex:temporalElement>
-                  <gex:EX_TemporalExtent>
-                     <gex:extent>
-                        <gml:TimeInstant gml:id="Atime">
-                           <gml:timePosition> 2014-12-25T12:00:00 </gml:timePosition>
-                        </gml:TimeInstant>
-                     </gex:extent>
-                  </gex:EX_TemporalExtent>
-               </gex:temporalElement>
-            </gex:EX_Extent>
-         </mri:extent>
-         <mri:extent>
-            <gex:EX_Extent>
-               <gex:description>
-                  <gco:CharacterString>description</gco:CharacterString>
-               </gex:description>
-               <gex:geographicElement>
-                  <gex:EX_GeographicDescription>
-                     <gex:geographicIdentifier/>
-                  </gex:EX_GeographicDescription>
-               </gex:geographicElement>
-               <gex:temporalElement>
-                  <gex:EX_TemporalExtent>
-                     <gex:extent/>
-                  </gex:EX_TemporalExtent>
-               </gex:temporalElement>
-               <gex:verticalElement>
-                  <gex:EX_VerticalExtent>
-                     <gex:minimumValue>
-                        <gco:Real>-1000</gco:Real>
-                     </gex:minimumValue>
-                     <gex:maximumValue>
-                        <gco:Real>0</gco:Real>
-                     </gex:maximumValue>
-                     <gex:verticalCRSId gco:nilReason="inapplicable"/>                     
-                  </gex:EX_VerticalExtent>
-               </gex:verticalElement>
-            </gex:EX_Extent>
-         </mri:extent>
-         <mri:extent>
-            <gex:EX_Extent>
-               <gex:description>
-                  <gco:CharacterString>description</gco:CharacterString>
-               </gex:description>
-               <gex:verticalElement>
-                  <!-- valid for rule.gex.verticalhascrsorcrsid -->
-                  <gex:EX_VerticalExtent>
-                     <gex:minimumValue/>
-                     <gex:maximumValue/>
-                     <gex:verticalCRS>
-                        <gml:GeographicCRS gml:id="epsg4326">
-                           <gml:identifier codeSpace="epsg">4326</gml:identifier>
-                           <gml:scope/>
-                           <gml:usesEllipsoidalCS/>
-                           <gml:usesGeodeticDatum/>
-                        </gml:GeographicCRS>
-                     </gex:verticalCRS>
-                  </gex:EX_VerticalExtent>
-               </gex:verticalElement>
-            </gex:EX_Extent>
-         </mri:extent>
-      </mri:MD_DataIdentification>
-   </mdb:identificationInfo>
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/index.html
deleted file mode 100644
index f842fdfce..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gex/1.0/index.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Geospatial EXtent (GEX) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Geospatial EXtent (GEX) Version: 1.0</h1><img src="gex.png"><h2>Description</h2>
-      <p>GEX 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.6.1.  It includes elements for specifying geospatial properties of a resource, including extent and
-         spatial reference systems. The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>Sample XML files for gex 1.0</h2><a href="gex_invalid.xml">gex_invalid.xml</a> <a href="gex_valid.xml">gex_valid.xml</a> 
-      <h2>XML Namespace for gex 1.0</h2>
-      <p>The namespace URI for gex 1.0 is <b>http://standards.iso.org/iso/19115/-3/gex/1.0</b>.
-      </p>
-      <h2>XML Schema for gex 1.0</h2>
-      <p><b><a href="gex.xsd">gex.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the gex 1.0 namespace or by XML Schema documents importing the gex 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the gex namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for gex 1.0 are available <a href="gex.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for gex 1.0</h2>
-      <p><b><a href="extent.xsd">extent.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.6.1. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): EX_BoundingPolygon, EX_Extent, EX_GeographicBoundingBox, EX_GeographicDescription, AbstractEX_GeographicExtent, EX_SpatialTemporalExtent, EX_TemporalExtent, and EX_VerticalExtent
-      </p>
-      <h2>Related XML Namespaces for gex 1.0</h2> The gex 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Geographic COmmon</td>
-            <td>gco</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gco/1.0">http://standards.iso.org/iso/19115/-3/gco/1.0</a></td>
-            <td>../../../../19115/-3/gco/1.0/gco.xsd</td>
-         </tr>
-         <tr>
-            <td>Geographic Markup Wrappers</td>
-            <td>gmw</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gmw/1.0">http://standards.iso.org/iso/19115/-3/gmw/1.0</a></td>
-            <td>../../../../19115/-3/gmw/1.0/gmw.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata Common Classes</td>
-            <td>mcc</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mcc/1.0">http://standards.iso.org/iso/19115/-3/mcc/1.0</a></td>
-            <td>../../../../19115/-3/mcc/1.0/mcc.xsd</td>
-         </tr>
-      </table>
-      <h2>Schematron Validation Rules for gex 1.0</h2> Schematron rules for validating instance documents of the gex 1.0 namespace are in <a href="gex.sch">gex.sch</a>. Other schematron rule sets that are
-      required for a complete validation are: gco.sch, gmw.sch, mcc.sch, and mcc.sch
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gmw/1.0/gmlWrapperTypes2014.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gmw/1.0/gmlWrapperTypes2014.xsd
deleted file mode 100644
index ba18b2886..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gmw/1.0/gmlWrapperTypes2014.xsd
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink"
-	xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmw="http://standards.iso.org/iso/19115/-3/gmw/1.0"
-	xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
-	targetNamespace="http://standards.iso.org/iso/19115/-3/gmw/1.0" elementFormDefault="qualified"
-	version="2014-12-25">
-
-	<!-- smr 2014-12-27 refactor gco, gsr, gts, gss to put all gml dependencies in this namespace for base data types -->
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic COmmon (GCO) extensible markup language is a component of the XML Schema Implementation of Geographic
-Information Metadata documented in ISO/TS 19139:2007. GCO includes all the definitions of http://standards.iso.org/iso/19115/-3/gco/1.0" namespace. The root document of this namespace is the file gco.xsd. This basicTypes.xsd schema implements concepts from the "basic types" package of ISO/TS 19103.</xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.opengis.net/gml/3.2"
-		schemaLocation="http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19136_Schemas/gml.xsd"/>
-	<xs:import namespace="http://www.w3.org/1999/xlink"
-		schemaLocation="http://www.w3.org/1999/xlink.xsd"/>
-	<!--	<xs:include schemaLocation="gco.xsd"/>-->
-	<xs:import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0"
-		schemaLocation="../../gco/1.0/baseTypes2014.xsd"/>
-
-
-	<!-- ============================= Units of Measure ============================ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="UnitOfMeasure_PropertyType">
-		<!-- used by content.xsd, mrc:MD_SampleDimenstion.units -->
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<!--<xs:complexType name="UomAngle_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>-->
-
-	<!-- ........................................................................ -->
-	<xs:complexType name="UomLength_PropertyType">
-		<!-- used by content.xsd mrc:MD_Band.boundUnits -->
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-
-	<!-- .............................not used.................................... -->
-	<!--	<xs:complexType name="UomScale_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>-->
-
-	<!-- .........................not used ..................................... -->
-	<!--<xs:complexType name="UomArea_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>-->
-
-	<!-- ............................not used.................................... -->
-	<!--<xs:complexType name="UomVelocity_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>-->
-
-	<!-- ........................not used........................................ -->
-	<!--	<xs:complexType name="UomTime_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>-->
-
-	<!-- ...............................not used.................................. -->
-	<!--	<xs:complexType name="UomVolume_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>-->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<!-- ========================================================================== -->
-
-	<!-- ###  from gts temporalObjects.xsd ######################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<!-- ........................................................................ -->
-	<!--==XCGE: gml:AbstractTimePrimitive==-->
-	<!-- ........................................................................ -->
-	<xs:complexType name="TM_Primitive_PropertyType">
-		<!-- used in gex, mri, mrl -->
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:AbstractTimePrimitive"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-
-	<!--================================================-->
-
-	<!-- ### from gss  geometry.xsd ################################################ -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<!-- ........................................................................ -->
-	<!--==XCGE: gml:Point==-->
-	<!-- ........................................................................ -->
-	<xs:complexType name="GM_Point_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:Point"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!--==XCGE: gml:AbstractGeometry==-->
-	<!-- ........................................................................ -->
-	<xs:complexType name="GM_Object_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:AbstractGeometry"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-
-	<!-- ######  from gsr spatialrepresentation.xsd  ############################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================ -->
-	<!-- ........................................................................... -->
-	<!--==XCGE: gml:AbstractCRS==-->
-	<!-- ........................................................................... -->
-	<xs:complexType name="SC_CRS_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:AbstractCRS"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gmw/1.0/gmw.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gmw/1.0/gmw.xsd
deleted file mode 100644
index 9cb459762..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gmw/1.0/gmw.xsd
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" 
-  xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:gmw="http://standards.iso.org/iso/19115/-3/gmw/1.0" 
-  targetNamespace="http://standards.iso.org/iso/19115/-3/gmw/1.0" elementFormDefault="qualified">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This is the root document of the The GMl Wrapper type (GMW) http://standards.iso.org/iso/19115/-3/gmw/1.0 namespace, a component of the XML Schema Implementation of Geographic Information Metadata (ISO19115-1). Original implementation documented in ISO/TS 19139:2007 is refactored in this implementation for ISO19115-3 to put type definitions that wrap GML elements in property types with optional gco:ObjectProperties and gco:nilReason attributes as originally specified in ISO19139 in the gco, gss, gsr and gts namespaces. Elements from the ISO19139 gco namespace that do not have dependencies on gml are specified in the http://standards.iso.org/iso/19115/-3/gco/1.0 namespace in the ISO19115-3 implementation </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:include schemaLocation="gmlWrapperTypes2014.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gmw/1.0/gmw.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gmw/1.0/gmw.zip
deleted file mode 100644
index 9ff6b0b1c..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gmw/1.0/gmw.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gmw/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gmw/1.0/index.html
deleted file mode 100644
index c11d3107c..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/gmw/1.0/index.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Geographic Markup Wrappers (GMW) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Geographic Markup Wrappers (GMW) Version: 1.0</h1><img src="gmw.png"><h2>Description</h2>
-      <p>GMW 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause .  It includes wrappers for gml dependencies. The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>XML Namespace for gmw 1.0</h2>
-      <p>The namespace URI for gmw 1.0 is <b>http://standards.iso.org/iso/19115/-3/gmw/1.0</b>.
-      </p>
-      <h2>XML Schema for gmw 1.0</h2>
-      <p><b><a href="gmw.xsd">gmw.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the gmw 1.0 namespace or by XML Schema documents importing the gmw 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the gmw namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for gmw 1.0 are available <a href="gmw.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for gmw 1.0</h2>
-      <p><b><a href="gmlWrapperTypes2014.xsd">gmlWrapperTypes2014.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause . It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): 
-      </p>
-      <h2>Related XML Namespaces for gmw 1.0</h2> The gmw 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td></td>
-            <td>baseTypes2014</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gco/1.0">http://standards.iso.org/iso/19115/-3/gco/1.0</a></td>
-            <td>../../gco/1.0/baseTypes2014.xsd</td>
-         </tr>
-         <tr>
-            <td>Geography Markup Language</td>
-            <td>gml</td>
-            <td><a href="http://www.opengis.net/gml/3.2">http://www.opengis.net/gml/3.2</a></td>
-            <td>http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19136_Schemas/gml.xsd</td>
-         </tr>
-         <tr>
-            <td>XML Linking Language (XLink) Version 1.0. W3C Recommendation</td>
-            <td>xlink</td>
-            <td><a href="http://www.w3.org/1999/xlink">http://www.w3.org/1999/xlink</a></td>
-            <td>http://www.w3.org/1999/xlink.xsd</td>
-         </tr>
-      </table>
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/lan/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/lan/1.0/index.html
deleted file mode 100644
index 6fcf44e5b..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/lan/1.0/index.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Language localization (LAN) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Language localization (LAN) Version: 1.0</h1><img src="lan.png"><h2>Description</h2>
-      <p>LAN 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 7.3.  It includes elements for cultural and linguistic adapatiblity. The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>XML Namespace for lan 1.0</h2>
-      <p>The namespace URI for lan 1.0 is <b>http://standards.iso.org/iso/19115/-3/lan/1.0</b>.
-      </p>
-      <h2>XML Schema for lan 1.0</h2>
-      <p><b><a href="lan.xsd">lan.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the lan 1.0 namespace or by XML Schema documents importing the lan 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the lan namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for lan 1.0 are available <a href="lan.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for lan 1.0</h2>
-      <p><b><a href="language.xsd">language.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 7.3. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): <b>CountryCode</b>, <b>LanguageCode</b>, LocalisedCharacterString, <b>MD_CharacterSetCode</b>, PT_FreeText, PT_Locale, and PT_LocaleContainer
-      </p>
-      <h2>Related XML Namespaces for lan 1.0</h2> The lan 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Citation and responsible party information</td>
-            <td>cit</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/cit/1.0">http://standards.iso.org/iso/19115/-3/cit/1.0</a></td>
-            <td>../../../../19115/-3/cit/1.0/cit.xsd</td>
-         </tr>
-         <tr>
-            <td>Geographic COmmon</td>
-            <td>gco</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gco/1.0">http://standards.iso.org/iso/19115/-3/gco/1.0</a></td>
-            <td>../../../../19115/-3/gco/1.0/gco.xsd</td>
-         </tr>
-      </table>
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/lan/1.0/lan.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/lan/1.0/lan.png
deleted file mode 100644
index 70dff585e..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/lan/1.0/lan.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/lan/1.0/lan.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/lan/1.0/lan.xsd
deleted file mode 100644
index 6fba1f705..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/lan/1.0/lan.xsd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0" xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/lan/1.0" version="1.0">
-  <annotation>
-    <documentation>Namespace for XML elements used to implement cultural and linguistic adaptability, i.e. different character set and language encoding of metadata content. Originally defined in ISO 19139.</documentation>
-  </annotation>
-  <include schemaLocation="language.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/cit/1.0" schemaLocation="../../../../19115/-3/cit/1.0/cit.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/lan/1.0/lan.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/lan/1.0/lan.zip
deleted file mode 100644
index b0266625c..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/lan/1.0/lan.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/lan/1.0/language.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/lan/1.0/language.xsd
deleted file mode 100644
index 28589b923..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/lan/1.0/language.xsd
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-  xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0"
-  xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
-  xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" elementFormDefault="qualified"
-  targetNamespace="http://standards.iso.org/iso/19115/-3/lan/1.0" version="1.0">
-  <include schemaLocation="lan.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0"
-    schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/cit/1.0"
-    schemaLocation="../../../../19115/-3/cit/1.0/cit.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <!-- hand-craft adjustments starting at line 29 and 71. ShapeChange does not have rules for 
-  implementing language localisation according to ISO19139  -->
-  <element name="CountryCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type"/>
-  <complexType name="CountryCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="lan:CountryCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="LanguageCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type"/>
-  <complexType name="LanguageCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="lan:LanguageCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  
-  <!-- hand craft, copy from gmd freeText.xsd, following ISO 19139 -->
-  <!-- =========================================================================== -->
-  <complexType name="LocalisedCharacterString_Type">
-    <simpleContent>
-      <extension base="string">
-        <attribute name="id" type="ID"/>
-        <attribute name="locale" type="anyURI"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-  <!-- ........................................................................ -->
-  <element name="LocalisedCharacterString" type="lan:LocalisedCharacterString_Type" substitutionGroup="gco:CharacterString"/>
-  <!-- ........................................................................ -->
-<!--  <element name="LocalisedCharacterString" substitutionGroup="gco:AbstractObject" type="lan:LocalisedCharacterString_Type"/>
-  <complexType name="LocalisedCharacterString_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="locale" type="lan:PT_Locale_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>-->
-  <complexType name="LocalisedCharacterString_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="lan:LocalisedCharacterString"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  
-  <!-- ........................................................................ -->
-  
-  <element name="MD_CharacterSetCode" substitutionGroup="gco:CharacterString"
-    type="gco:CodeListValue_Type"/>
-  <complexType name="MD_CharacterSetCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="lan:MD_CharacterSetCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-
-  <!-- Hand crafted.  MAKE FIXES BASED ON gmd freeText.xsd  2014-08-21 SMR -->
-  <element name="PT_FreeText" substitutionGroup="gco:AbstractObject" type="lan:PT_FreeText_Type"/>
-  <complexType name="PT_FreeText_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element maxOccurs="unbounded" name="textGroup"
-            type="lan:LocalisedCharacterString_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="PT_FreeText_PropertyType">
-    <!-- PT_FreeText can't substitute for CharacterString because that is a simple type; have to extend the property type
-      so that instance docs will still have a CharacterString Element, and a textGroup with localisedCharacterStrings-->
-    <complexContent>
-      <extension base="gco:CharacterString_PropertyType">
-        <sequence minOccurs="0">
-          <element ref="lan:PT_FreeText"/>
-        </sequence>
-        <!--   <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>-->
-      </extension>
-    </complexContent>
-  </complexType>
-  <element name="PT_Locale" substitutionGroup="gco:AbstractObject" type="lan:PT_Locale_Type"/>
-  <complexType name="PT_Locale_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="language" type="lan:LanguageCode_PropertyType"/>
-          <element minOccurs="0" name="country" type="lan:CountryCode_PropertyType"/>
-          <element name="characterEncoding" type="lan:MD_CharacterSetCode_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="PT_Locale_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="lan:PT_Locale"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="PT_LocaleContainer" substitutionGroup="lan:PT_Locale"
-    type="lan:PT_LocaleContainer_Type"/>
-  <complexType name="PT_LocaleContainer_Type">
-    <complexContent>
-      <extension base="lan:PT_Locale_Type">
-        <sequence>
-          <element name="description" type="gco:CharacterString_PropertyType"/>
-          <element name="locale" type="lan:PT_Locale_PropertyType"/>
-          <element maxOccurs="unbounded" name="date" type="cit:CI_Date_PropertyType"/>
-          <element maxOccurs="unbounded" name="responsibleParty"
-            type="cit:CI_Responsibility_PropertyType"/>
-          <element maxOccurs="unbounded" name="localisedString"
-            type="lan:LocalisedCharacterString_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="PT_LocaleContainer_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="lan:PT_LocaleContainer"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mac/1.0/acquisitionInformationImagery.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mac/1.0/acquisitionInformationImagery.xsd
deleted file mode 100644
index ac7775d4b..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mac/1.0/acquisitionInformationImagery.xsd
+++ /dev/null
@@ -1,622 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" 
-  xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" 
-  xmlns:gmw="http://standards.iso.org/iso/19115/-3/gmw/1.0" 
-  xmlns:mac="http://standards.iso.org/iso/19115/-3/mac/1.0" 
-  xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mac/1.0" version="1.0">
-<!--  <include schemaLocation="mac.xsd"/>-->
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gmw/1.0" schemaLocation="../../../../19115/-3/gmw/1.0/gmw.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="MI_AcquisitionInformation" substitutionGroup="mcc:Abstract_AcquisitionInformation" type="mac:MI_AcquisitionInformation_Type">
-    <annotation>
-      <documentation>Description: Designations for the measuring instruments and their bands, the platform carrying them, and the mission to which the data contributes
-FGDC: Platform_and_Instrument_Identification, Mission_Information
-shortName: PltfrmInstId</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_AcquisitionInformation_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_AcquisitionInformation_Type">
-        <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="instrument" type="mac:MI_Instrument_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="operation" type="mac:MI_Operation_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="platform" type="mac:MI_Platform_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="acquisitionPlan" type="mac:MI_Plan_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="objective" type="mac:MI_Objective_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="acquisitionRequirement" type="mac:MI_Requirement_PropertyType"/>
-          <element minOccurs="0" name="environmentalConditions" type="mac:MI_EnvironmentalRecord_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MI_AcquisitionInformation_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mac:MI_AcquisitionInformation"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_ContextCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>Description: context of activation
-shortName: CntxtCode</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_ContextCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mac:MI_ContextCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_EnvironmentalRecord" substitutionGroup="gco:AbstractObject" type="mac:MI_EnvironmentalRecord_Type"/>
-  <complexType name="MI_EnvironmentalRecord_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="averageAirTemperature" type="gco:Real_PropertyType"/>
-          <element name="maxRelativeHumidity" type="gco:Real_PropertyType"/>
-          <element name="maxAltitude" type="gco:Real_PropertyType"/>
-          <element name="meterologicalConditions" type="gco:CharacterString_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MI_EnvironmentalRecord_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mac:MI_EnvironmentalRecord"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_Event" substitutionGroup="gco:AbstractObject" type="mac:MI_Event_Type">
-    <annotation>
-      <documentation>Description: identification of a significant collection point within an operation
-shortName: Event</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_Event_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="identifier" type="mcc:MD_Identifier_PropertyType">
-            <annotation>
-              <documentation>Description: Event name or number
-shortName: evtId</documentation>
-            </annotation>
-          </element>
-          <element name="trigger" type="mac:MI_TriggerCode_PropertyType">
-            <annotation>
-              <documentation>Description: Initiator of the event
-shortName: evtTrig</documentation>
-            </annotation>
-          </element>
-          <element name="context" type="mac:MI_ContextCode_PropertyType">
-            <annotation>
-              <documentation>Description: Meaning of the event
-shortName: evtCntxt</documentation>
-            </annotation>
-          </element>
-          <element name="sequence" type="mac:MI_SequenceCode_PropertyType">
-            <annotation>
-              <documentation>Description: Relative time ordering of the event
-shortName: evtSeq</documentation>
-            </annotation>
-          </element>
-          <element name="time" type="gco:DateTime_PropertyType">
-            <annotation>
-              <documentation>Description: Time the event occured
-shortName: evtTime</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="relatedPass" type="mac:MI_PlatformPass_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="relatedSensor" type="mac:MI_Instrument_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="expectedObjective" type="mac:MI_Objective_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MI_Event_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mac:MI_Event"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_GeometryTypeCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>Description: geometric description of collection
-shortName: GeoTypeCode</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_GeometryTypeCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mac:MI_GeometryTypeCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_Instrument" substitutionGroup="gco:AbstractObject" type="mac:MI_Instrument_Type">
-    <annotation>
-      <documentation>Description: Designations for the measuring instruments
-FGDC: Platform_and_Instrument_Identification
-shortName: PltfrmInstId</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_Instrument_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="citation" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>Description: complete citation of the instrument
-FGDC: Instrument_Full_Name
-Position: 1
-shortName: instNam
-Conditional: if shortName not specified</documentation>
-            </annotation>
-          </element>
-          <element name="identifier" type="mcc:MD_Identifier_PropertyType">
-            <annotation>
-              <documentation>Description: complete citation of the instrument
-FGDC: Instrument_Full_Name
-Position: 1
-shortName: instNam
-Conditional: if shortName not specified</documentation>
-            </annotation>
-          </element>
-          <element name="type" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>Description: Code describing the type of instrument
-shortName: instType</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="description" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>Description: Textual description of the instrument
-shortName: instDesc</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="mountedOn" type="mac:MI_Platform_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MI_Instrument_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mac:MI_Instrument"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_Objective" substitutionGroup="gco:AbstractObject" type="mac:MI_Objective_Type">
-    <annotation>
-      <documentation>Description: Describes the characteristics, spatial and temportal extent of the intended object to be observed 
-shortName: TargetId</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_Objective_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element maxOccurs="unbounded" name="identifier" type="mcc:MD_Identifier_PropertyType">
-            <annotation>
-              <documentation>Description: Registered code used to identify the objective
-Postion: 1
-shortName: targetId</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="priority" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>Description: priority applied to the target
-Position: 3
-shortName: trgtPriority</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="type" type="mac:MI_ObjectiveTypeCode_PropertyType">
-            <annotation>
-              <documentation>Description: collection technique for the objective
-Position: 4
-shortName: trgtType</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="function" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>Description: function performed by or at the objective
-Position: 5
-shortName: trgtFunct</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="extent" type="mcc:Abstract_Extent_PropertyType">
-            <annotation>
-              <documentation>Description: extent information including the bounding box, bounding polygon, vertical and temporal extent of the objective
-Position: 6
-shortName: trgtExtent</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="sensingInstrument" type="mac:MI_Instrument_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="pass" type="mac:MI_PlatformPass_PropertyType"/>
-          <element maxOccurs="unbounded" name="objectiveOccurence" type="mac:MI_Event_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MI_Objective_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mac:MI_Objective"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_ObjectiveTypeCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>Description: temporal persistence of collection objective
-shortName: ObjTypeCode</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_ObjectiveTypeCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mac:MI_ObjectiveTypeCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_Operation" substitutionGroup="gco:AbstractObject" type="mac:MI_Operation_Type">
-    <annotation>
-      <documentation>Description: Designations for the operation used to acquire the dataset
-shortName: MssnId</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_Operation_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element minOccurs="0" name="description" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>Description: Description of the mission on which the platform observations are part and the objectives of that mission
-FGDC: Mission_Description
-Position: 3
-shortName: mssnDesc</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="citation" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>Description: character string by which the mission is known
-FGDC: Mission_Name
-Position: 1
-shortName: pltMssnNam
-NITF_ACFTA:AC_MSN_ID</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="identifier" type="mcc:MD_Identifier_PropertyType">
-            <annotation>
-              <documentation>Description: character string by which the mission is known
-FGDC: Mission_Name
-Position: 1
-shortName: pltMssnNam
-NITF_ACFTA:AC_MSN_ID</documentation>
-            </annotation>
-          </element>
-          <element name="status" type="mcc:MD_ProgressCode_PropertyType">
-            <annotation>
-              <documentation>Description: status of the data acquisition
-FGDC: Mission_Start_Date
-Position: 4
-shortName: mssnStatus</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="type" type="mac:MI_OperationTypeCode_PropertyType">
-            <annotation>
-              <documentation>Description: status of the data acquisition
-FGDC: Mission_Start_Date
-Position: 4
-shortName: mssnStatus</documentation>
-            </annotation>
-          </element>
-          <element name="parentOperation" type="mac:MI_Operation_PropertyType" minOccurs="0"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="childOperation" type="mac:MI_Operation_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="platform" type="mac:MI_Platform_PropertyType">
-            <annotation>
-              <documentation>Description: Platform (or platforms) used in the operation.</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="objective" type="mac:MI_Objective_PropertyType"/>
-          <element minOccurs="0" name="plan" type="mac:MI_Plan_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="significantEvent" type="mac:MI_Event_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MI_Operation_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mac:MI_Operation"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_OperationTypeCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type"/>
-  <complexType name="MI_OperationTypeCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mac:MI_OperationTypeCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_Plan" substitutionGroup="gco:AbstractObject" type="mac:MI_Plan_Type">
-    <annotation>
-      <documentation>Description: Designations for the planning information related to meeting requirements
-shortName: PlanId</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_Plan_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element minOccurs="0" name="type" type="mac:MI_GeometryTypeCode_PropertyType">
-            <annotation>
-              <documentation>Description: manner of sampling geometry the planner expects for collection of the objective data
-Postion: 2
-shortName: planType</documentation>
-            </annotation>
-          </element>
-          <element name="status" type="mcc:MD_ProgressCode_PropertyType">
-            <annotation>
-              <documentation>Description: current status of the plan (pending, completed, etc.)
-shortName: planStatus</documentation>
-            </annotation>
-          </element>
-          <element name="citation" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>Description: Identification of authority requesting target collection
-Postion: 1
-shortName: planReqId</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="operation" type="mac:MI_Operation_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="satisfiedRequirement" type="mac:MI_Requirement_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MI_Plan_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mac:MI_Plan"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_Platform" substitutionGroup="mcc:Abstract_Platform" type="mac:MI_Platform_Type">
-    <annotation>
-      <documentation>Description: Designations for the platform used to acquire the dataset
-shortName: PltfrmId</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_Platform_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_Platform_Type">
-        <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="citation" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>Description: complete citation of the platform
-FGDC: Platform_Full_Name
-Position: 3
-shortName: pltNam
-Conditional: if shortName not specified</documentation>
-            </annotation>
-          </element>
-          <element name="identifier" type="mcc:MD_Identifier_PropertyType">
-            <annotation>
-              <documentation>Description: Unique identification of the platform
-shortName: pltId</documentation>
-            </annotation>
-          </element>
-          <element name="description" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>Description: Narrative description of the platform supporting the instrument
-FGDC: Platform_Description
-Position: 2
-shortName: pltfrmDesc</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="sponsor" type="mcc:Abstract_Responsibility_PropertyType">
-            <annotation>
-              <documentation>Description: organization responsible for building, launch, or operation of the platform
-FGDC: Platform_Sponsor
-Position: 6
-shortName: pltfrmSpnsr</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" name="instrument" type="mac:MI_Instrument_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MI_Platform_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mac:MI_Platform"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_PlatformPass" substitutionGroup="gco:AbstractObject" type="mac:MI_PlatformPass_Type">
-    <annotation>
-      <documentation>Description: identification of collection coverage
-shortName: PlatformPass</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_PlatformPass_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="identifier" type="mcc:MD_Identifier_PropertyType">
-            <annotation>
-              <documentation>Description: unique name of the pass
-shortName: passId</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="extent" type="gmw:GM_Object_PropertyType">
-            <annotation>
-              <documentation>Description: Area covered by the pass
-shortName: passExt</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="relatedEvent" type="mac:MI_Event_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MI_PlatformPass_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mac:MI_PlatformPass"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_PriorityCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>Description: ordered list of priorities
-shortName: PriCode</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_PriorityCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mac:MI_PriorityCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_RequestedDate" substitutionGroup="gco:AbstractObject" type="mac:MI_RequestedDate_Type">
-    <annotation>
-      <documentation>Description: range of date validity
-shortName: ReqstDate</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_RequestedDate_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="requestedDateOfCollection" type="gco:DateTime_PropertyType">
-            <annotation>
-              <documentation>Description: preferred date and time of collection
-shortName: collectDate</documentation>
-            </annotation>
-          </element>
-          <element name="latestAcceptableDate" type="gco:DateTime_PropertyType">
-            <annotation>
-              <documentation>Description: latest date and time collection must be completed
-shortName: latestDate</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MI_RequestedDate_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mac:MI_RequestedDate"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_Requirement" substitutionGroup="gco:AbstractObject" type="mac:MI_Requirement_Type">
-    <annotation>
-      <documentation>Description: requirement to be satisfied by the planned data acquisition
-shortName: Requirement</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_Requirement_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element minOccurs="0" name="citation" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>Description: identification of reference or guidance material for the requirement
-shortName: reqRef</documentation>
-            </annotation>
-          </element>
-          <element name="identifier" type="mcc:MD_Identifier_PropertyType">
-            <annotation>
-              <documentation>Description: unique name, or code, for the requirement
-shortName: reqId</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" name="requestor" type="mcc:Abstract_Responsibility_PropertyType">
-            <annotation>
-              <documentation>Description: origin of requirement
-shortName: requestor</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" name="recipient" type="mcc:Abstract_Responsibility_PropertyType">
-            <annotation>
-              <documentation>Description: person(s), or body(ies), to recieve results of requirement
-shortName: recipient</documentation>
-            </annotation>
-          </element>
-          <element name="priority" type="mac:MI_PriorityCode_PropertyType">
-            <annotation>
-              <documentation>Description: relative ordered importance, or urgency, of the requirement
-shortName: reqPri</documentation>
-            </annotation>
-          </element>
-          <element name="requestedDate" type="mac:MI_RequestedDate_PropertyType">
-            <annotation>
-              <documentation>Description:  required or preferred acquisition date and time
-shortName: reqDate</documentation>
-            </annotation>
-          </element>
-          <element name="expiryDate" type="gco:DateTime_PropertyType">
-            <annotation>
-              <documentation>Description: date and time after which collection is no longer valid
-shortName: reqExpire</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="satisifiedPlan" type="mac:MI_Plan_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MI_Requirement_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mac:MI_Requirement"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_SensorTypeCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>&lt;UsedBy&gt;
-&lt;NameSpace&gt;ISO 19115-2 Metadata - Imagery&lt;/NameSpace&gt;
-&lt;Class&gt;MI_Instrument&lt;/Class&gt;
-&lt;Package&gt;Acquisition information - Imagery&lt;/Package&gt;
-&lt;Attribute&gt;type&lt;/Attribute&gt;
-&lt;Type&gt;MI_SensorTypeCode&lt;/Type&gt;
-&lt;UsedBy&gt;</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_SensorTypeCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mac:MI_SensorTypeCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_SequenceCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>Description: temporal relation of activation
-shortName: SeqCode</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_SequenceCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mac:MI_SequenceCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_TriggerCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>Description: mechanism of activation
-shortName: TriggerCode</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_TriggerCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mac:MI_TriggerCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mac/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mac/1.0/index.html
deleted file mode 100644
index 07be8a1c4..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mac/1.0/index.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Metadata for Acquisition (MAC) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Metadata for Acquisition (MAC) Version: 1.0</h1><img src="mac.png"><h2>Description</h2>
-      <p>MAC 1.0 is an XML Schema implementation derived from ISO ISO 19115-2, Geographic Information - Metadata - Part 2: Extensions for imagery and
-         gridded data, Clause A.2.5.  It includes information related to acquisition platforms, instruments, operations and other details. The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>XML Namespace for mac 1.0</h2>
-      <p>The namespace URI for mac 1.0 is <b>http://standards.iso.org/iso/19115/-3/mac/1.0</b>.
-      </p>
-      <h2>XML Schema for mac 1.0</h2>
-      <p><b><a href="mac.xsd">mac.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the mac 1.0 namespace or by XML Schema documents importing the mac 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the mac namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for mac 1.0 are available <a href="mac.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for mac 1.0</h2>
-      <p><b><a href="acquisitionInformationImagery.xsd">acquisitionInformationImagery.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-2, Geographic Information - Metadata - Part 2: Extensions for imagery and
-         gridded data, Clause A.2.5. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): MI_AcquisitionInformation, <b>MI_ContextCode</b>, MI_EnvironmentalRecord, MI_Event, <b>MI_GeometryTypeCode</b>, MI_Instrument, MI_Objective, <b>MI_ObjectiveTypeCode</b>, MI_Operation, <b>MI_OperationTypeCode</b>, MI_Plan, MI_Platform, MI_PlatformPass, <b>MI_PriorityCode</b>, MI_RequestedDate, MI_Requirement, <b>MI_SensorTypeCode</b>, <b>MI_SequenceCode</b>, and <b>MI_TriggerCode</b></p>
-      <h2>Related XML Namespaces for mac 1.0</h2> The mac 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Geographic COmmon</td>
-            <td>gco</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gco/1.0">http://standards.iso.org/iso/19115/-3/gco/1.0</a></td>
-            <td>../../../../19115/-3/gco/1.0/gco.xsd</td>
-         </tr>
-         <tr>
-            <td>Geographic Markup Wrappers</td>
-            <td>gmw</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gmw/1.0">http://standards.iso.org/iso/19115/-3/gmw/1.0</a></td>
-            <td>../../../../19115/-3/gmw/1.0/gmw.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata Common Classes</td>
-            <td>mcc</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mcc/1.0">http://standards.iso.org/iso/19115/-3/mcc/1.0</a></td>
-            <td>../../../../19115/-3/mcc/1.0/mcc.xsd</td>
-         </tr>
-      </table>
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mac/1.0/mac.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mac/1.0/mac.png
deleted file mode 100644
index b44fd0620..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mac/1.0/mac.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mac/1.0/mac.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mac/1.0/mac.xsd
deleted file mode 100644
index cbeeae50c..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mac/1.0/mac.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-  xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
-  xmlns:gmw="http://standards.iso.org/iso/19115/-3/gmw/1.0"
-  xmlns:mac="http://standards.iso.org/iso/19115/-3/mac/1.0"
-  xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" elementFormDefault="qualified"
-  targetNamespace="http://standards.iso.org/iso/19115/-3/mac/1.0" version="">
-  
-  <include schemaLocation="acquisitionInformationImagery.xsd"/>
-  
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mac/1.0/mac.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mac/1.0/mac.zip
deleted file mode 100644
index 85700c090..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mac/1.0/mac.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mas/1.0/applicationSchema.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mas/1.0/applicationSchema.xsd
deleted file mode 100644
index e40cf7f07..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mas/1.0/applicationSchema.xsd
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:mas="http://standards.iso.org/iso/19115/-3/mas/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mas/1.0" version="1.0">
-  <include schemaLocation="mas.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="MD_ApplicationSchemaInformation" substitutionGroup="mcc:Abstract_ApplicationSchemaInformation" type="mas:MD_ApplicationSchemaInformation_Type">
-    <annotation>
-      <documentation>information about the application schema used to build the dataset</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_ApplicationSchemaInformation_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_ApplicationSchemaInformation_Type">
-        <sequence>
-          <element name="name" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>name of the application schema used</documentation>
-            </annotation>
-          </element>
-          <element name="schemaLanguage" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>identification of the schema language used</documentation>
-            </annotation>
-          </element>
-          <element name="constraintLanguage" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>formal language used in Application Schema</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="schemaAscii" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>full application schema given as an ASCII file</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="graphicsFile" type="mcc:Abstract_OnlineResource_PropertyType">
-            <annotation>
-              <documentation>full application schema given as a graphics file</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="softwareDevelopmentFile" type="mcc:Abstract_OnlineResource_PropertyType">
-            <annotation>
-              <documentation>full application schema given as a software development file</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="softwareDevelopmentFileFormat" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>software dependent format used for the application schema software dependent file</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_ApplicationSchemaInformation_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mas:MD_ApplicationSchemaInformation"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mas/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mas/1.0/index.html
deleted file mode 100644
index c094f4302..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mas/1.0/index.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Metadata for Application Schema (MAS) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Metadata for Application Schema (MAS) Version: 1.0</h1><img src="mas.png"><h2>Description</h2>
-      <p>MAS 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.13.  It includes elements for referencing Application Schema. The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>XML Namespace for mas 1.0</h2>
-      <p>The namespace URI for mas 1.0 is <b>http://standards.iso.org/iso/19115/-3/mas/1.0</b>.
-      </p>
-      <h2>XML Schema for mas 1.0</h2>
-      <p><b><a href="mas.xsd">mas.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the mas 1.0 namespace or by XML Schema documents importing the mas 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the mas namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for mas 1.0 are available <a href="mas.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for mas 1.0</h2>
-      <p><b><a href="applicationSchema.xsd">applicationSchema.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.13. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): MD_ApplicationSchemaInformation
-      </p>
-      <h2>Related XML Namespaces for mas 1.0</h2> The mas 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Citation and responsible party information</td>
-            <td>cit</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/cit/1.0">http://standards.iso.org/iso/19115/-3/cit/1.0</a></td>
-            <td>../../../../19115/-3/cit/1.0/cit.xsd</td>
-         </tr>
-         <tr>
-            <td>Geographic COmmon</td>
-            <td>gco</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gco/1.0">http://standards.iso.org/iso/19115/-3/gco/1.0</a></td>
-            <td>../../../../19115/-3/gco/1.0/gco.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata Common Classes</td>
-            <td>mcc</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mcc/1.0">http://standards.iso.org/iso/19115/-3/mcc/1.0</a></td>
-            <td>../../../../19115/-3/mcc/1.0/mcc.xsd</td>
-         </tr>
-      </table>
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mas/1.0/mas.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mas/1.0/mas.png
deleted file mode 100644
index 5cf405fd0..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mas/1.0/mas.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mas/1.0/mas.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mas/1.0/mas.xsd
deleted file mode 100644
index 8e569326c..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mas/1.0/mas.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0" xmlns:mas="http://standards.iso.org/iso/19115/-3/mas/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mas/1.0" version="1.0">
-  <annotation>
-    <documentation>Namespace for XML elements &lt;font color="#1f497d"&gt;to specify the application schema associated with a resource&lt;/font&gt;</documentation>
-  </annotation>
-  <include schemaLocation="applicationSchema.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/cit/1.0" schemaLocation="../../../../19115/-3/cit/1.0/cit.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mas/1.0/mas.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mas/1.0/mas.zip
deleted file mode 100644
index 358f6444f..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mas/1.0/mas.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mcc/1.0/AbstractCommonClasses.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mcc/1.0/AbstractCommonClasses.xsd
deleted file mode 100644
index e48519f89..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mcc/1.0/AbstractCommonClasses.xsd
+++ /dev/null
@@ -1,341 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" version="1.0">
-  <include schemaLocation="mcc.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element abstract="true" name="Abstract_AcquisitionInformation" substitutionGroup="gco:AbstractObject" type="mcc:Abstract_AcquisitionInformation_Type"/>
-  <complexType abstract="true" name="Abstract_AcquisitionInformation_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="Abstract_AcquisitionInformation_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:Abstract_AcquisitionInformation"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="Abstract_ApplicationSchemaInformation" substitutionGroup="gco:AbstractObject" type="mcc:Abstract_ApplicationSchemaInformation_Type"/>
-  <complexType abstract="true" name="Abstract_ApplicationSchemaInformation_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="Abstract_ApplicationSchemaInformation_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:Abstract_ApplicationSchemaInformation"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="Abstract_Citation" substitutionGroup="gco:AbstractObject" type="mcc:Abstract_Citation_Type"/>
-  <complexType abstract="true" name="Abstract_Citation_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="Abstract_Citation_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:Abstract_Citation"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="Abstract_Constraints" substitutionGroup="gco:AbstractObject" type="mcc:Abstract_Constraints_Type"/>
-  <complexType abstract="true" name="Abstract_Constraints_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="Abstract_Constraints_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:Abstract_Constraints"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="Abstract_ContentInformation" substitutionGroup="gco:AbstractObject" type="mcc:Abstract_ContentInformation_Type"/>
-  <complexType abstract="true" name="Abstract_ContentInformation_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="Abstract_ContentInformation_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:Abstract_ContentInformation"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="Abstract_Distribution" substitutionGroup="gco:AbstractObject" type="mcc:Abstract_Distribution_Type"/>
-  <complexType abstract="true" name="Abstract_Distribution_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="Abstract_Distribution_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:Abstract_Distribution"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="Abstract_Extent" substitutionGroup="gco:AbstractObject" type="mcc:Abstract_Extent_Type"/>
-  <complexType abstract="true" name="Abstract_Extent_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="Abstract_Extent_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:Abstract_Extent"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="Abstract_Format" substitutionGroup="gco:AbstractObject" type="mcc:Abstract_Format_Type">
-    <annotation>
-      <documentation>&lt;ul&gt;
-	&lt;li&gt;&lt;/li&gt;
-&lt;/ul&gt;</documentation>
-    </annotation>
-  </element>
-  <complexType abstract="true" name="Abstract_Format_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="Abstract_Format_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:Abstract_Format"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="Abstract_LineageInformation" substitutionGroup="gco:AbstractObject" type="mcc:Abstract_LineageInformation_Type"/>
-  <complexType abstract="true" name="Abstract_LineageInformation_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="Abstract_LineageInformation_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:Abstract_LineageInformation"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="Abstract_MaintenanceInformation" substitutionGroup="gco:AbstractObject" type="mcc:Abstract_MaintenanceInformation_Type"/>
-  <complexType abstract="true" name="Abstract_MaintenanceInformation_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="Abstract_MaintenanceInformation_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:Abstract_MaintenanceInformation"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="Abstract_Metadata" substitutionGroup="gco:AbstractObject" type="mcc:Abstract_Metadata_Type"/>
-  <complexType abstract="true" name="Abstract_Metadata_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="Abstract_Metadata_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:Abstract_Metadata"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="Abstract_MetadataExtension" substitutionGroup="gco:AbstractObject" type="mcc:Abstract_MetadataExtension_Type"/>
-  <complexType abstract="true" name="Abstract_MetadataExtension_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="Abstract_MetadataExtension_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:Abstract_MetadataExtension"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="Abstract_OnlineResource" substitutionGroup="gco:AbstractObject" type="mcc:Abstract_OnlineResource_Type"/>
-  <complexType abstract="true" name="Abstract_OnlineResource_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="Abstract_OnlineResource_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:Abstract_OnlineResource"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="Abstract_Platform" substitutionGroup="gco:AbstractObject" type="mcc:Abstract_Platform_Type"/>
-  <complexType abstract="true" name="Abstract_Platform_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="Abstract_Platform_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:Abstract_Platform"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="Abstract_PortrayalCatalogueInformation" substitutionGroup="gco:AbstractObject" type="mcc:Abstract_PortrayalCatalogueInformation_Type"/>
-  <complexType abstract="true" name="Abstract_PortrayalCatalogueInformation_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="Abstract_PortrayalCatalogueInformation_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:Abstract_PortrayalCatalogueInformation"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="Abstract_ReferenceSystem" substitutionGroup="gco:AbstractObject" type="mcc:Abstract_ReferenceSystem_Type"/>
-  <complexType abstract="true" name="Abstract_ReferenceSystem_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="Abstract_ReferenceSystem_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:Abstract_ReferenceSystem"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="Abstract_ResourceDescription" substitutionGroup="gco:AbstractObject" type="mcc:Abstract_ResourceDescription_Type"/>
-  <complexType abstract="true" name="Abstract_ResourceDescription_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="Abstract_ResourceDescription_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:Abstract_ResourceDescription"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="Abstract_Responsibility" substitutionGroup="gco:AbstractObject" type="mcc:Abstract_Responsibility_Type"/>
-  <complexType abstract="true" name="Abstract_Responsibility_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="Abstract_Responsibility_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:Abstract_Responsibility"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="Abstract_SpatialRepresentation" substitutionGroup="gco:AbstractObject" type="mcc:Abstract_SpatialRepresentation_Type"/>
-  <complexType abstract="true" name="Abstract_SpatialRepresentation_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="Abstract_SpatialRepresentation_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:Abstract_SpatialRepresentation"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="Abstract_SpatialResolution" substitutionGroup="gco:AbstractObject" type="mcc:Abstract_SpatialResolution_Type"/>
-  <complexType abstract="true" name="Abstract_SpatialResolution_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="Abstract_SpatialResolution_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:Abstract_SpatialResolution"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="Abstract_StandardOrderProcess" substitutionGroup="gco:AbstractObject" type="mcc:Abstract_StandardOrderProcess_Type"/>
-  <complexType abstract="true" name="Abstract_StandardOrderProcess_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="Abstract_StandardOrderProcess_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:Abstract_StandardOrderProcess"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="Abstract_TypedDate" substitutionGroup="gco:AbstractObject" type="mcc:Abstract_TypedDate_Type"/>
-  <complexType abstract="true" name="Abstract_TypedDate_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="Abstract_TypedDate_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:Abstract_TypedDate"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mcc/1.0/commonClasses.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mcc/1.0/commonClasses.xsd
deleted file mode 100644
index 6b706d06f..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mcc/1.0/commonClasses.xsd
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" version="1.0">
-  <include schemaLocation="mcc.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="MD_BrowseGraphic" substitutionGroup="gco:AbstractObject" type="mcc:MD_BrowseGraphic_Type">
-    <annotation>
-      <documentation>graphic that provides an illustration of the dataset (should include a legend for the graphic, if applicable)</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_BrowseGraphic_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="fileName" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>name of the file that contains a graphic that provides an illustration of the dataset</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="fileDescription" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>text description of the illustration</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="fileType" type="gco:CharacterString_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="imageConstraints" type="mcc:Abstract_Constraints_PropertyType">
-            <annotation>
-              <documentation>restriction on access and/or use of browse graphic</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="linkage" type="mcc:Abstract_OnlineResource_PropertyType">
-            <annotation>
-              <documentation>link to browse graphic</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_BrowseGraphic_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:MD_BrowseGraphic"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_Identifier" substitutionGroup="gco:AbstractObject" type="mcc:MD_Identifier_Type">
-    <annotation>
-      <documentation>value uniquely identifying an object within a namespace</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_Identifier_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element minOccurs="0" name="authority" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>Citation for the code namespace and optionally the person or party responsible for maintenance of that namespace</documentation>
-            </annotation>
-          </element>
-          <element name="code" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>alphanumeric value identifying an instance in the namespace e.g. EPSG::4326</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="codeSpace" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>Identifier or namespace in which the code is valid</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="version" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>version identifier for the namespace</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="description" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>natural language description of the meaning of the code value E.G for codeSpace = EPSG, code = 4326: description = WGS-84" to "for codeSpace = EPSG, code = EPSG::4326: description = WGS-84</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_Identifier_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:MD_Identifier"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_ProgressCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>status of the resource</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_ProgressCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:MD_ProgressCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_Scope" substitutionGroup="gco:AbstractObject" type="mcc:MD_Scope_Type">
-    <annotation>
-      <documentation>new: information about the scope of the resource</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_Scope_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="level" type="mcc:MD_ScopeCode_PropertyType">
-            <annotation>
-              <documentation>description of the scope</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="extent" type="mcc:Abstract_Extent_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="levelDescription" type="mcc:MD_ScopeDescription_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_Scope_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:MD_Scope"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_ScopeCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>class of information to which the referencing entity applies</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_ScopeCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:MD_ScopeCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_ScopeDescription" substitutionGroup="gco:AbstractObject" type="mcc:MD_ScopeDescription_Type">
-    <annotation>
-      <documentation>description of the class of information covered by the information</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_ScopeDescription_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <choice>
-          <element name="attributes" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>instances of attribute types to which the information applies</documentation>
-            </annotation>
-          </element>
-          <element name="features" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>instances of feature types to which the information applies</documentation>
-            </annotation>
-          </element>
-          <element name="featureInstances" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>feature instances to which the information applies</documentation>
-            </annotation>
-          </element>
-          <element name="attributeInstances" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>attribute instances to which the information applies</documentation>
-            </annotation>
-          </element>
-          <element name="dataset" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>dataset to which the information applies</documentation>
-            </annotation>
-          </element>
-          <element name="other" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>class of information that does not fall into the other categories to which the information applies</documentation>
-            </annotation>
-          </element>
-        </choice>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_ScopeDescription_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:MD_ScopeDescription"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_SpatialRepresentationTypeCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>method used to represent geographic information in the resource</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_SpatialRepresentationTypeCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:MD_SpatialRepresentationTypeCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="URI" substitutionGroup="gco:AbstractObject" type="mcc:URI_Type">
-    <annotation>
-      <documentation>Uniform Resource Identifier (URI), is a compact string of characters used to identify or name a resource</documentation>
-    </annotation>
-  </element>
-  <complexType name="URI_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="URI_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mcc:URI"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mcc/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mcc/1.0/index.html
deleted file mode 100644
index da4bb96c6..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mcc/1.0/index.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Metadata Common Classes (MCC) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Metadata Common Classes (MCC) Version: 1.0</h1><img src="mcc.png"><h2>Description</h2>
-      <p>MCC 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.6.4.  It includes abstract classes shared by multiple namespaces and is required in order to enable
-         modularization of the XML implementation. The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>XML Namespace for mcc 1.0</h2>
-      <p>The namespace URI for mcc 1.0 is <b>http://standards.iso.org/iso/19115/-3/mcc/1.0</b>.
-      </p>
-      <h2>XML Schema for mcc 1.0</h2>
-      <p><b><a href="mcc.xsd">mcc.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the mcc 1.0 namespace or by XML Schema documents importing the mcc 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the mcc namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for mcc 1.0 are available <a href="mcc.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for mcc 1.0</h2>
-      <p><b><a href="AbstractCommonClasses.xsd">AbstractCommonClasses.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.6.4. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): Abstract_AcquisitionInformation, Abstract_ApplicationSchemaInformation, Abstract_Citation, Abstract_Constraints, Abstract_ContentInformation, Abstract_Distribution, Abstract_Extent, Abstract_Format, Abstract_LineageInformation, Abstract_MaintenanceInformation, Abstract_Metadata, Abstract_MetadataExtension, Abstract_OnlineResource, Abstract_Platform, Abstract_PortrayalCatalogueInformation, Abstract_ReferenceSystem, Abstract_ResourceDescription, Abstract_Responsibility, Abstract_SpatialRepresentation, Abstract_SpatialResolution, Abstract_StandardOrderProcess, and Abstract_TypedDate
-      </p>
-      <p><b><a href="commonClasses.xsd">commonClasses.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.6.4. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): MD_BrowseGraphic, MD_Identifier, <b>MD_ProgressCode</b>, MD_Scope, <b>MD_ScopeCode</b>, MD_ScopeDescription, <b>MD_SpatialRepresentationTypeCode</b>, and URI
-      </p>
-      <h2>Related XML Namespaces for mcc 1.0</h2> The mcc 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Geographic COmmon</td>
-            <td>gco</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gco/1.0">http://standards.iso.org/iso/19115/-3/gco/1.0</a></td>
-            <td>../../../../19115/-3/gco/1.0/gco.xsd</td>
-         </tr>
-      </table>
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mcc/1.0/mcc.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mcc/1.0/mcc.png
deleted file mode 100644
index 74a2afdfd..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mcc/1.0/mcc.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mcc/1.0/mcc.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mcc/1.0/mcc.xsd
deleted file mode 100644
index 54f60e820..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mcc/1.0/mcc.xsd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" version="1.0">
-  <annotation>
-    <documentation>Abstract classes for linking to elements in the metadata implementation from external schema to loosely couple the external schema for smoother handling of version changes in components. Classes used by all components in ISO19115 metadata application.</documentation>
-  </annotation>
-  <include schemaLocation="AbstractCommonClasses.xsd"/>
-  <include schemaLocation="commonClasses.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mcc/1.0/mcc.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mcc/1.0/mcc.zip
deleted file mode 100644
index 5680f6cdc..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mcc/1.0/mcc.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/codelists.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/codelists.html
deleted file mode 100644
index 0d17c788c..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/codelists.html
+++ /dev/null
@@ -1,346 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0" xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>
-         Codelists from the Metadata for Constraints (mco) Namespace
-         
-      </title>
-   </head>
-   <body><a name="top"></a><h1>ISO 19115-3 Codelist Report</h1>
-      <h2>
-         Codelists from the Metadata for Constraints (mco) Namespace
-         
-      </h2>
-      <table>
-         <tr><b>
-               <td>Scope</td></b><td>
-               Codelists related to Metadata for Constraints (mco) Namespace
-               
-            </td>
-         </tr>
-         <tr><b>
-               <td>Field of Application</td></b><td>
-               ISO TC211 Metadata Standards
-               
-            </td>
-         </tr>
-         <tr><b>
-               <td>Version (Date)</td></b><td>
-               1.0
-                ()
-            </td>
-         </tr>
-      </table>
-      <h2>
-         MD_ClassificationCode
-          (
-         MD_ClassificationCode
-         ):
-      </h2><b>Description: </b>
-      name of the handling restrictions on the
-      resource
-      
-      <table width="95%" border="1" cellpadding="2" cellspacing="2">
-         <tr>
-            <th valign="top">Entry</th>
-            <th valign="top">Definition</th>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_ClassificationCode_unclassified
-               
-            </td>
-            <td valign="top">
-               available for general disclosure
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_ClassificationCode_restricted
-               
-            </td>
-            <td valign="top">
-               not for general disclosure
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_ClassificationCode_confidential
-               
-            </td>
-            <td valign="top">
-               available for someone who can be entrusted with
-               information
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_ClassificationCode_secret
-               
-            </td>
-            <td valign="top">
-               kept or meant to be kept private, unknown, or hidden from all
-               but a select group of people
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_ClassificationCode_topSecret
-               
-            </td>
-            <td valign="top">
-               of the highest secrecy
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_ClassificationCode_SBU
-               
-            </td>
-            <td valign="top">
-               although unclassified, requires strict controls over its
-               distribution
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_ClassificationCode_forOfficialUseOnly
-               
-            </td>
-            <td valign="top">
-               unclassified information that is to be used only for official
-               purposes determined by the designating body
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_ClassificationCode_protected
-               
-            </td>
-            <td valign="top">
-               compromise of the information could cause
-               damage
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_ClassificationCode_limitedDistribution
-               
-            </td>
-            <td valign="top">
-               desimination limited by designating
-               body
-               
-            </td>
-         </tr>
-      </table><a href="#top">top</a><h2>
-         MD_RestrictionCode
-          (
-         MD_RestrictionCode
-         ):
-      </h2><b>Description: </b>
-      limitation(s) placed upon the access or use of the
-      data
-      
-      <table width="95%" border="1" cellpadding="2" cellspacing="2">
-         <tr>
-            <th valign="top">Entry</th>
-            <th valign="top">Definition</th>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_RestrictionCode_copyright
-               
-            </td>
-            <td valign="top">
-               exclusive right to the publication, production, or sale of
-               the rights to a literary, dramatic, musical, or artistic work, or to the use of
-               a commercial print or label, granted by law for a specified period of time to
-               an author, composer, artist, distributor
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_RestrictionCode_patent
-               
-            </td>
-            <td valign="top">
-               government has granted exclusive right to make, sell, use or
-               license an invention or discovery
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_RestrictionCode_patentPending
-               
-            </td>
-            <td valign="top">
-               produced or sold information awaiting a
-               patent
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_RestrictionCode_trademark
-               
-            </td>
-            <td valign="top">
-               a name, symbol, or other device identifying a product,
-               officially registered and legally restricted to the use of the owner or
-               manufacturer
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_RestrictionCode_licence
-               
-            </td>
-            <td valign="top">
-               formal permission to do something
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_RestrictionCode_intellectualPropertyRights
-               
-            </td>
-            <td valign="top">
-               rights to financial benefit from and control of distribution
-               of non-tangible property that is a result of creativity
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_RestrictionCode_restricted
-               
-            </td>
-            <td valign="top">
-               withheld from general circulation or
-               disclosure
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_RestrictionCode_otherRestrictions
-               
-            </td>
-            <td valign="top">
-               limitation not listed
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_RestrictionCode_unrestricted
-               
-            </td>
-            <td valign="top">
-               no constraints exist
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_RestrictionCode_licenceUnrestricted
-               
-            </td>
-            <td valign="top">
-               formal permission not required to use the
-               resource
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_RestrictionCode_licenceEndUser
-               
-            </td>
-            <td valign="top">
-               formal permission required for a person or an entity to use
-               the resource and that may differ from the person that orders or purchases
-               it
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_RestrictionCode_licenceDistributor
-               
-            </td>
-            <td valign="top">
-               formal permission required for a person or an entity to
-               commercialize or distribute the resource
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_RestrictionCode_private
-               
-            </td>
-            <td valign="top">
-               protects rights of individual or organisations from
-               observation, intrusion, or attention of others 
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_RestrictionCode_statutory
-               
-            </td>
-            <td valign="top">
-               prescribed by law
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_RestrictionCode_confidential
-               
-            </td>
-            <td valign="top">
-               not available to the public contains information that could
-               be prejudicial to a commercial, industrial, or national
-               interest
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_RestrictionCode_SBU
-               
-            </td>
-            <td valign="top">
-               although unclassified, requires strict controls over its
-               distribution. 
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_RestrictionCode_in-confidence
-               
-            </td>
-            <td valign="top">
-               with trust
-               
-            </td>
-         </tr>
-      </table><a href="#top">top</a><hr/><i>Stylesheet: CT_CodelistHTML.xsl Version: 2015-04-17</i></body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/codelists.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/codelists.xml
deleted file mode 100644
index 171bb2ea2..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/codelists.xml
+++ /dev/null
@@ -1,386 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cat:CT_CodelistCatalogue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/cat/1.0 ../../../-3/cat/1.0/cat.xsd"
- xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0"
- xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:gml="http://www.opengis.net/gml/3.2">
-   <!--=====Catalogue description=====-->
-   <cat:name>
-      <gco:CharacterString>Codelists from the Metadata for Constraints (mco) Namespace</gco:CharacterString>
-   </cat:name>
-   <cat:scope>
-      <gco:CharacterString>Codelists related to Metadata for Constraints (mco) Namespace</gco:CharacterString>
-   </cat:scope>
-   <cat:fieldOfApplication>
-      <gco:CharacterString>ISO TC211 Metadata Standards</gco:CharacterString>
-   </cat:fieldOfApplication>
-   <cat:versionNumber>
-      <gco:CharacterString>1.0</gco:CharacterString>
-   </cat:versionNumber>
-   <cat:versionDate>
-      <gco:Date>2015-04-18</gco:Date>
-   </cat:versionDate>
-   <cat:locale>
-      <lan:PT_Locale>
-         <lan:language>
-            <lan:LanguageCode codeList="standards.iso.org/19115/-3/lan/1.0/codelists.xml#LanguageCode" codeListValue="eng">eng</lan:LanguageCode>
-         </lan:language>
-         <lan:characterEncoding>
-            <lan:MD_CharacterSetCode codeList="standards.iso.org/19115/-3/lan/1.0/codelists.xml#MD_CharacterSetCode" codeListValue="UTF-8">UTF-8</lan:MD_CharacterSetCode>
-         </lan:characterEncoding>
-      </lan:PT_Locale>
-   </cat:locale>
-   <!--============================= Codelists =======================================-->
-   <!-- MD_ClassificationCode  -->
-   <cat:codelistItem>
-      <cat:CT_Codelist id="MD_ClassificationCode">
-         <cat:identifier>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >MD_ClassificationCode</gco:ScopedName>
-         </cat:identifier>
-         <cat:name>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >MD_ClassificationCode</gco:ScopedName>
-         </cat:name>
-         <cat:definition>
-            <gco:CharacterString>name of the handling restrictions on the
-               resource</gco:CharacterString>
-         </cat:definition>
-         <cat:description>
-            <gco:CharacterString>name of the handling restrictions on the
-               resource</gco:CharacterString>
-         </cat:description>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ClassificationCode_unclassified">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ClassificationCode_unclassified</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>available for general disclosure</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ClassificationCode_restricted">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ClassificationCode_restricted</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>not for general disclosure</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ClassificationCode_confidential">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ClassificationCode_confidential</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>available for someone who can be entrusted with
-                     information</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ClassificationCode_secret">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ClassificationCode_secret</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>kept or meant to be kept private, unknown, or hidden from all
-                     but a select group of people</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ClassificationCode_topSecret">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ClassificationCode_topSecret</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>of the highest secrecy</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ClassificationCode_SBU">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ClassificationCode_SBU</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>although unclassified, requires strict controls over its
-                     distribution</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ClassificationCode_forOfficialUseOnly">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ClassificationCode_forOfficialUseOnly</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>unclassified information that is to be used only for official
-                     purposes determined by the designating body</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ClassificationCode_protected">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ClassificationCode_protected</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>compromise of the information could cause
-                     damage</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ClassificationCode_limitedDistribution">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ClassificationCode_limitedDistribution</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>desimination limited by designating
-                     body</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-      </cat:CT_Codelist>
-   </cat:codelistItem>
-   <!-- MD_RestrictionCode  -->
-   <cat:codelistItem>
-      <cat:CT_Codelist id="MD_RestrictionCode">
-         <cat:identifier>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >MD_RestrictionCode</gco:ScopedName>
-         </cat:identifier>
-         <cat:name>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >MD_RestrictionCode</gco:ScopedName>
-         </cat:name>
-         <cat:definition>
-            <gco:CharacterString>limitation(s) placed upon the access or use of the
-               data</gco:CharacterString>
-         </cat:definition>
-         <cat:description>
-            <gco:CharacterString>limitation(s) placed upon the access or use of the
-               data</gco:CharacterString>
-         </cat:description>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_RestrictionCode_copyright">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_RestrictionCode_copyright</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>exclusive right to the publication, production, or sale of
-                     the rights to a literary, dramatic, musical, or artistic work, or to the use of
-                     a commercial print or label, granted by law for a specified period of time to
-                     an author, composer, artist, distributor</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_RestrictionCode_patent">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_RestrictionCode_patent</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>government has granted exclusive right to make, sell, use or
-                     license an invention or discovery</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_RestrictionCode_patentPending">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_RestrictionCode_patentPending</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>produced or sold information awaiting a
-                     patent</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_RestrictionCode_trademark">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_RestrictionCode_trademark</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>a name, symbol, or other device identifying a product,
-                     officially registered and legally restricted to the use of the owner or
-                     manufacturer</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_RestrictionCode_licence">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_RestrictionCode_licence</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>formal permission to do something</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_RestrictionCode_intellectualPropertyRights">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_RestrictionCode_intellectualPropertyRights</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>rights to financial benefit from and control of distribution
-                     of non-tangible property that is a result of creativity</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_RestrictionCode_restricted">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_RestrictionCode_restricted</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>withheld from general circulation or
-                     disclosure</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_RestrictionCode_otherRestrictions">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_RestrictionCode_otherRestrictions</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>limitation not listed</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_RestrictionCode_unrestricted">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_RestrictionCode_unrestricted</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>no constraints exist</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_RestrictionCode_licenceUnrestricted">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_RestrictionCode_licenceUnrestricted</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>formal permission not required to use the
-                     resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_RestrictionCode_licenceEndUser">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_RestrictionCode_licenceEndUser</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>formal permission required for a person or an entity to use
-                     the resource and that may differ from the person that orders or purchases
-                     it</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_RestrictionCode_licenceDistributor">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_RestrictionCode_licenceDistributor</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>formal permission required for a person or an entity to
-                     commercialize or distribute the resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_RestrictionCode_private">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_RestrictionCode_private</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>protects rights of individual or organisations from
-                     observation, intrusion, or attention of others </gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_RestrictionCode_statutory">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_RestrictionCode_statutory</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>prescribed by law</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_RestrictionCode_confidential">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_RestrictionCode_confidential</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>not available to the public contains information that could
-                     be prejudicial to a commercial, industrial, or national
-                     interest</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_RestrictionCode_SBU">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_RestrictionCode_SBU</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>although unclassified, requires strict controls over its
-                     distribution. </gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_RestrictionCode_in-confidence">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_RestrictionCode_in-confidence</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>with trust</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-      </cat:CT_Codelist>
-   </cat:codelistItem>
-   <!--=== EOF ===-->
-</cat:CT_CodelistCatalogue>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/constraints.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/constraints.xsd
deleted file mode 100644
index ece30689f..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/constraints.xsd
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:mco="http://standards.iso.org/iso/19115/-3/mco/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mco/1.0" version="1.0">
-  <include schemaLocation="mco.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="MD_ClassificationCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>name of the handling restrictions on the resource</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_ClassificationCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mco:MD_ClassificationCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_Constraints" substitutionGroup="mcc:Abstract_Constraints" type="mco:MD_Constraints_Type">
-    <annotation>
-      <documentation>restrictions on the access and use of a resource or metadata</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_Constraints_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_Constraints_Type">
-        <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="useLimitation" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>limitation affecting the fitness for use of the resource or metadata. Example, "not to be used for navigation"</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="constraintApplicationScope" type="mcc:MD_Scope_PropertyType">
-            <annotation>
-              <documentation>Spatial and temporal extent of the application of the constraint restrictions</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="graphic" type="mcc:MD_BrowseGraphic_PropertyType">
-            <annotation>
-              <documentation>graphic /symbol indicating the constraint Eg.</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="reference" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>citation/URL for the limitation or constraint, e.g. copyright statement, license agreement, etc</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="releasability" type="mco:MD_Releasability_PropertyType">
-            <annotation>
-              <documentation>information concerning the parties to whom the resource can or cannot be released and the party responsible for determining the releasibility</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="responsibleParty" type="mcc:Abstract_Responsibility_PropertyType">
-            <annotation>
-              <documentation>party responsible for the resource constraints</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_Constraints_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mco:MD_Constraints"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_LegalConstraints" substitutionGroup="mco:MD_Constraints" type="mco:MD_LegalConstraints_Type">
-    <annotation>
-      <documentation>restrictions and legal prerequisites for accessing and using the resource or metadata</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_LegalConstraints_Type">
-    <complexContent>
-      <extension base="mco:MD_Constraints_Type">
-        <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="accessConstraints" type="mco:MD_RestrictionCode_PropertyType">
-            <annotation>
-              <documentation>access constraints applied to assure the protection of privacy or intellectual property, and any special restrictions or limitations on obtaining the resource or metadata</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="useConstraints" type="mco:MD_RestrictionCode_PropertyType">
-            <annotation>
-              <documentation>constraints applied to assure the protection of privacy or intellectual property, and any special restrictions or limitations or warnings on using the resource or metadata</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="otherConstraints" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>other restrictions and legal prerequisites for accessing and using the resource or metadata</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_LegalConstraints_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mco:MD_LegalConstraints"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_Releasability" substitutionGroup="gco:AbstractObject" type="mco:MD_Releasability_Type">
-    <annotation>
-      <documentation>state, nation or organization to which resource can be released to e.g. NATO unclassified releasable to PfP</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_Releasability_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="addressee" type="mcc:Abstract_Responsibility_PropertyType">
-            <annotation>
-              <documentation>party responsible for the Release statement</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="statement" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>release statement</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="disseminationConstraints" type="mco:MD_RestrictionCode_PropertyType">
-            <annotation>
-              <documentation>component in determining releasability</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_Releasability_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mco:MD_Releasability"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_RestrictionCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>limitation(s) placed upon the access or use of the data</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_RestrictionCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mco:MD_RestrictionCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_SecurityConstraints" substitutionGroup="mco:MD_Constraints" type="mco:MD_SecurityConstraints_Type">
-    <annotation>
-      <documentation>handling restrictions imposed on the resource or metadata for national security or similar security concerns</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_SecurityConstraints_Type">
-    <complexContent>
-      <extension base="mco:MD_Constraints_Type">
-        <sequence>
-          <element name="classification" type="mco:MD_ClassificationCode_PropertyType">
-            <annotation>
-              <documentation>name of the handling restrictions on the resource or metadata</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="userNote" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>explanation of the application of the legal constraints or other restrictions and legal prerequisites for obtaining and using the resource or metadata</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="classificationSystem" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>name of the classification system</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="handlingDescription" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>additional information about the restrictions on handling the resource or metadata</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_SecurityConstraints_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mco:MD_SecurityConstraints"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/index.html
deleted file mode 100644
index b2b65a7bf..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/index.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Metadata for Constraints (MCO) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Metadata for Constraints (MCO) Version: 1.0</h1><img src="mco.png"><h2>Description</h2>
-      <p>MCO 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.4.  It includes elements for describing resource and metadata constraints. The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>Sample XML files for mco 1.0</h2><a href="mco_invalid.xml">mco_invalid.xml</a> <a href="mco_valid.xml">mco_valid.xml</a> 
-      <h2>CodeLists for mco 1.0</h2><a href="codelists.html">codelists.html</a> <a href="codelists.xml">codelists.xml</a> 
-      <h2>XML Namespace for mco 1.0</h2>
-      <p>The namespace URI for mco 1.0 is <b>http://standards.iso.org/iso/19115/-3/mco/1.0</b>.
-      </p>
-      <h2>XML Schema for mco 1.0</h2>
-      <p><b><a href="mco.xsd">mco.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the mco 1.0 namespace or by XML Schema documents importing the mco 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the mco namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for mco 1.0 are available <a href="mco.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for mco 1.0</h2>
-      <p><b><a href="constraints.xsd">constraints.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.4. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): <b>MD_ClassificationCode</b>, MD_Constraints, MD_LegalConstraints, MD_Releasability, <b>MD_RestrictionCode</b>, and MD_SecurityConstraints
-      </p>
-      <h2>Related XML Namespaces for mco 1.0</h2> The mco 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Geographic COmmon</td>
-            <td>gco</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gco/1.0">http://standards.iso.org/iso/19115/-3/gco/1.0</a></td>
-            <td>../../../../19115/-3/gco/1.0/gco.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata Common Classes</td>
-            <td>mcc</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mcc/1.0">http://standards.iso.org/iso/19115/-3/mcc/1.0</a></td>
-            <td>../../../../19115/-3/mcc/1.0/mcc.xsd</td>
-         </tr>
-      </table>
-      <h2>Schematron Validation Rules for mco 1.0</h2> Schematron rules for validating instance documents of the mco 1.0 namespace are in <a href="mco.sch">mco.sch</a>. Other schematron rule sets that are
-      required for a complete validation are: gco.sch, mcc.sch, and mcc.sch
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/mco.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/mco.png
deleted file mode 100644
index 44d5a5624..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/mco.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/mco.sch b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/mco.sch
deleted file mode 100644
index 26f5720c0..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/mco.sch
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron">
-  <sch:ns prefix="mco" uri="http://standards.iso.org/iso/19115/-3/mco/1.0"/>
-  <!--
-    ISO 19115-3 base requirements for metadata instance documents
-    
-    See ISO19115-1:2014(E) page 13, Figure 8 Constraint information classes
-  -->
-  
-  <!-- 
-    Rule: MD_Releasability
-    Ref: {count(addressee + statement) > 0}
-    -->
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.mco-releasability-failure-en"
-      xml:lang="en">
-      The releasabilty does not define addresse or statement.</sch:diagnostic>
-    <sch:diagnostic id="rule.mco-releasability-failure-fr"
-      xml:lang="fr">
-      La possibilité de divulgation ne définit pas de 
-      destinataire ou d'indication.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.mco-releasability-success-en"
-      xml:lang="en">
-      The releasability addressee is defined: 
-      "<sch:value-of select="normalize-space($addressee)"/>".
-    </sch:diagnostic>
-    <sch:diagnostic id="rule.mco-releasability-success-fr"
-      xml:lang="fr">
-      Le destinataire dans le cas de possibilité de divulgation 
-      est défini "<sch:value-of select="normalize-space($addressee)"/>".
-    </sch:diagnostic>
-    
-    <sch:diagnostic id="rule.mco-releasability-statement-success-en"
-      xml:lang="en">
-      The releasability statement is
-      "<sch:value-of select="normalize-space($statement)"/>".
-    </sch:diagnostic>
-    <sch:diagnostic id="rule.mco-releasability-statement-success-fr"
-      xml:lang="fr">
-      L'indication concernant la possibilité de divulgation est 
-      "<sch:value-of select="normalize-space($statement)"/>".
-    </sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.mco-releasability">
-    <sch:title xml:lang="en">Releasability MUST
-    specified an addresse or a statement</sch:title>
-    <sch:title xml:lang="fr">La possibilité de divulgation 
-      DOIT définir un destinataire ou une indication</sch:title>
-    
-    <sch:rule context="//mco:MD_Releasability">
-      
-      <sch:let name="addressee" 
-        value="mco:addressee[normalize-space(.) != '']"/>
-      
-      <sch:let name="statement" 
-        value="mco:statement/*[normalize-space(.) != '']"/>
-      
-      <sch:let name="hasAddresseeOrStatement" 
-        value="count($addressee) + 
-               count($statement) > 0"/>
-      
-      <sch:assert test="$hasAddresseeOrStatement"
-        diagnostics="rule.mco-releasability-failure-en 
-                     rule.mco-releasability-failure-fr"/>
-      
-      <sch:report test="count($addressee)"
-        diagnostics="rule.mco-releasability-success-en 
-                     rule.mco-releasability-success-fr"/>
-      
-      <sch:report test="count($statement)"
-        diagnostics="rule.mco-releasability-statement-success-en 
-                     rule.mco-releasability-statement-success-fr"/>
-      
-    </sch:rule>
-  </sch:pattern>
-  
-  
-  <!--
-    Rule: MD_LegalConstraints
-    Ref: {If MD_LegalConstraints used then 
-          count of (accessConstraints +
-                    useConstraints + 
-                    otherConstraints + 
-                    useLimitation + 
-                    releasability) > 0}
-         -->
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.mco-legalconstraintdetails-failure-en"
-      xml:lang="en">
-      The legal constraint is incomplete.</sch:diagnostic>
-    <sch:diagnostic id="rule.mco-legalconstraintdetails-failure-fr"
-      xml:lang="fr">
-      La contrainte légale est incomplète.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.mco-legalconstraintdetails-success-en"
-      xml:lang="en">
-      The legal constraint is complete.
-    </sch:diagnostic>
-    <sch:diagnostic id="rule.mco-legalconstraintdetails-success-fr"
-      xml:lang="fr">
-      La contrainte légale est complète.
-    </sch:diagnostic>
-    
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.mco-legalconstraintdetails">
-    <sch:title xml:lang="en">Legal constraint MUST
-      specified an access, use or other constraint or
-      use limitation or releasability</sch:title>
-    <sch:title xml:lang="fr">Une contrainte légale DOIT
-      définir un type de contrainte (d'accès, d'utilisation ou autre)
-      ou bien une limite d'utilisation ou une possibilité de divulgation</sch:title>
-    
-    <sch:rule context="//mco:MD_LegalConstraints">
-      
-      <sch:let name="accessConstraints" 
-        value="mco:accessConstraints[
-                normalize-space(.) != '' or
-                count(.//@codeListValue[. != '']) > 0]"/>
-      
-      <sch:let name="useConstraints" 
-        value="mco:useConstraints/*[
-                 normalize-space(.) != '' or
-                 count(.//@codeListValue[. != '']) > 0]"/>
-      
-      <sch:let name="otherConstraints" 
-        value="mco:otherConstraints/*[
-                 normalize-space(.) != '']"/>
-      
-      <sch:let name="useLimitation" 
-        value="mco:useLimitation/*[
-                 normalize-space(.) != '' or
-                 count(.//@codeListValue[. != '']) > 0]"/>
-      
-      <sch:let name="releasability" 
-        value="mco:releasability/*[
-                 normalize-space(.) != '' or
-                 count(.//@codeListValue[. != '']) > 0]"/>
-      
-      <sch:let name="hasDetails" 
-               value="count($accessConstraints) + 
-                      count($useConstraints) + 
-                      count($otherConstraints) + 
-                      count($useLimitation) + 
-                      count($releasability)
-                      > 0"/>
-      
-      <sch:assert test="$hasDetails"
-        diagnostics="rule.mco-legalconstraintdetails-failure-en 
-                     rule.mco-legalconstraintdetails-failure-fr"/>
-      
-      <sch:report test="$hasDetails"
-        diagnostics="rule.mco-legalconstraintdetails-success-en 
-                     rule.mco-legalconstraintdetails-success-fr"/>
-      
-    </sch:rule>
-  </sch:pattern>
-  
-  <!--
-    Rule: MD_LegalConstraints
-    Ref: {otherConstraints: only documented if accessConstraints or
-      useConstraints = “otherRestrictions”}
-    -->
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.mco-legalconstraint-other-failure-en"
-      xml:lang="en">
-      The legal constraint does not specified other constraints
-      while access and use constraint is set to other restriction.</sch:diagnostic>
-    <sch:diagnostic id="rule.mco-legalconstraint-other-failure-fr"
-      xml:lang="fr">
-      La contrainte légale ne précise pas les autres contraintes
-      bien que les contraintes d'accès ou d'usage indiquent 
-      que d'autres restrictions s'appliquent.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.mco-legalconstraint-other-success-en"
-      xml:lang="en">
-      The legal constraint other constraints is 
-      "<sch:value-of select="$otherConstraints"/>".
-    </sch:diagnostic>
-    <sch:diagnostic id="rule.mco-legalconstraint-other-success-fr"
-      xml:lang="fr">
-      Les autres contraintes de la contrainte légale sont
-      "<sch:value-of select="$otherConstraints"/>".
-    </sch:diagnostic>
-    
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.mco-legalconstraint-other">
-    <sch:title xml:lang="en">Legal constraint defining
-      other restrictions for access or use constraint MUST
-      specified other constraint.</sch:title>
-    <sch:title xml:lang="fr">Une contrainte légale indiquant
-      d'autres restrictions d'utilisation ou d'accès DOIT
-      préciser ces autres restrictions</sch:title>
-    
-    <sch:rule context="//mco:MD_LegalConstraints[
-      mco:accessConstraints/mco:MD_RestrictionCode/@codeListValue = 'otherRestrictions' or
-      mco:useConstraints/mco:MD_RestrictionCode/@codeListValue = 'otherRestrictions'
-      ]">
-      
-      
-      <sch:let name="otherConstraints" 
-               value="mco:otherConstraints/*[normalize-space(.) != '']"/>
-      
-      <sch:let name="hasOtherConstraints" 
-               value="count($otherConstraints) > 0"/>
-      
-      <sch:assert test="$hasOtherConstraints"
-        diagnostics="rule.mco-legalconstraint-other-failure-en 
-                     rule.mco-legalconstraint-other-failure-fr"/>
-      
-      <sch:report test="$hasOtherConstraints"
-        diagnostics="rule.mco-legalconstraint-other-success-en 
-                     rule.mco-legalconstraint-other-success-fr"/>
-      
-    </sch:rule>
-  </sch:pattern>
-  
-</sch:schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/mco.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/mco.xsd
deleted file mode 100644
index 80bdae3c1..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/mco.xsd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:mco="http://standards.iso.org/iso/19115/-3/mco/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mco/1.0" version="1.0">
-  <annotation>
-    <documentation>Namespace for XML elements &lt;font color="#1f497d"&gt;to specify constraints on access to or usage of a resource&lt;/font&gt;</documentation>
-  </annotation>
-  <include schemaLocation="constraints.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/mco.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/mco.zip
deleted file mode 100644
index 30f53906e..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/mco.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/mco_invalid.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/mco_invalid.xml
deleted file mode 100644
index 2001ab61d..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/mco_invalid.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mdb/1.0 ../../mds/1.0/mds.xsd" 
- xmlns:mco="http://standards.iso.org/iso/19115/-3/mco/1.0" 
- xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0"
- xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" 
- xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" 
- xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0"
- xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0">
-   <mdb:metadataIdentifier></mdb:metadataIdentifier>
-   
-   <!-- Some rules applies to dataset only -->
-   <mdb:metadataScope>
-      <mdb:MD_MetadataScope>
-         <mdb:resourceScope>
-            <mcc:MD_ScopeCode codeList="codeListLocation#MD_ScopeCode" 
-               codeListValue="dataset">dataset</mcc:MD_ScopeCode>
-         </mdb:resourceScope>
-      </mdb:MD_MetadataScope>
-   </mdb:metadataScope>
-   
-   <mdb:contact></mdb:contact>
-   <mdb:dateInfo></mdb:dateInfo>
-   <mdb:identificationInfo>
-      <mri:MD_DataIdentification>
-         <mri:citation></mri:citation>
-         <mri:abstract></mri:abstract>
-         <mri:resourceConstraints>
-            <mco:MD_Constraints>
-               <mco:releasability>
-                  <!-- Invalid for rule.mco-releasability -->
-                  <mco:MD_Releasability/>                 
-               </mco:releasability>
-            </mco:MD_Constraints>
-         </mri:resourceConstraints>
-         
-         <!-- Invalid for rule.mco-legalconstraintdetails -->
-         <mri:resourceConstraints>
-            <mco:MD_LegalConstraints>
-            </mco:MD_LegalConstraints>
-         </mri:resourceConstraints>
-         <mri:resourceConstraints>
-            <mco:MD_LegalConstraints>
-               <mco:accessConstraints>
-                  <mco:MD_RestrictionCode codeList="" codeListValue=""/>
-               </mco:accessConstraints>
-            </mco:MD_LegalConstraints>
-         </mri:resourceConstraints>
-         <mri:resourceConstraints>
-            <mco:MD_LegalConstraints>
-               <mco:otherConstraints>
-                  <gco:CharacterString></gco:CharacterString>
-               </mco:otherConstraints>
-            </mco:MD_LegalConstraints>
-         </mri:resourceConstraints>
-         
-         <!-- Invalid for rule.mco-legalconstraint-other -->
-         <mri:resourceConstraints>
-            <mco:MD_LegalConstraints>
-               <mco:accessConstraints>
-                  <mco:MD_RestrictionCode codeList="" codeListValue="topSecret"/>
-               </mco:accessConstraints>
-               <mco:accessConstraints>
-                  <mco:MD_RestrictionCode codeList="" codeListValue="otherRestrictions"/>
-               </mco:accessConstraints>
-               
-               <mco:useConstraints>
-                  <mco:MD_RestrictionCode codeList="" codeListValue="otherRestrictions"/>
-               </mco:useConstraints>
-               
-               <mco:otherConstraints>
-                  <gco:CharacterString></gco:CharacterString>
-               </mco:otherConstraints>
-               
-            </mco:MD_LegalConstraints>
-         </mri:resourceConstraints>
-         
-      </mri:MD_DataIdentification>
-   </mdb:identificationInfo>
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/mco_valid.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/mco_valid.xml
deleted file mode 100644
index 21e58f235..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mco/1.0/mco_valid.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mdb/1.0 ../../mds/1.0/mds.xsd" 
- xmlns:mco="http://standards.iso.org/iso/19115/-3/mco/1.0" 
- xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0"
- xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" 
- xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" 
- xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0"
- xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0">
-   <mdb:metadataIdentifier></mdb:metadataIdentifier>
-   
-   <!-- Some rules applies to dataset only -->
-   <mdb:metadataScope>
-      <mdb:MD_MetadataScope>
-         <mdb:resourceScope>
-            <mcc:MD_ScopeCode codeList="codeListLocation#MD_ScopeCode" 
-               codeListValue="dataset">dataset</mcc:MD_ScopeCode>
-         </mdb:resourceScope>
-      </mdb:MD_MetadataScope>
-   </mdb:metadataScope>
-   
-   <mdb:contact></mdb:contact>
-   <mdb:dateInfo></mdb:dateInfo>
-   <mdb:identificationInfo>
-      <mri:MD_DataIdentification>
-         <mri:citation></mri:citation>
-         <mri:abstract></mri:abstract>
-         <mri:resourceConstraints>
-            <mco:MD_Constraints>
-               <mco:releasability>
-                  <!-- Valid for rule.mco-releasability -->
-                  <mco:MD_Releasability>
-                     <mco:addressee>
-                        <cit:CI_Responsibility>
-                           <cit:role></cit:role>
-                           <cit:party>
-                              <cit:CI_Organisation>
-                                 <cit:name>
-                                    <gco:CharacterString>orgName</gco:CharacterString>
-                                 </cit:name>
-                              </cit:CI_Organisation>
-                           </cit:party>
-                        </cit:CI_Responsibility>
-                     </mco:addressee>
-                     <mco:statement>
-                        <gco:CharacterString>statement</gco:CharacterString>
-                     </mco:statement>
-                  </mco:MD_Releasability>
-               </mco:releasability>
-            </mco:MD_Constraints>
-         </mri:resourceConstraints>
-         
-         <mri:resourceConstraints>
-            <mco:MD_LegalConstraints>
-               <mco:releasability>
-                  <!-- Valid for rule.mco-releasability -->
-                  <mco:MD_Releasability>
-                     <mco:addressee>
-                        <cit:CI_Responsibility>
-                           <cit:role></cit:role>
-                           <cit:party>
-                              <cit:CI_Organisation>
-                                 <cit:name>
-                                    <gco:CharacterString>orgName</gco:CharacterString>
-                                 </cit:name>
-                              </cit:CI_Organisation>
-                           </cit:party>
-                        </cit:CI_Responsibility>
-                     </mco:addressee>
-                  </mco:MD_Releasability>
-               </mco:releasability>
-            </mco:MD_LegalConstraints>
-         </mri:resourceConstraints>
-         
-         
-         
-         
-         <!-- Valid for rule.mco-legalconstraintdetails -->
-         <mri:resourceConstraints>
-            <mco:MD_LegalConstraints>
-               <mco:accessConstraints>
-                  <mco:MD_RestrictionCode codeList="" codeListValue="topSecret"/>
-               </mco:accessConstraints>
-            </mco:MD_LegalConstraints>
-         </mri:resourceConstraints>
-         
-         <mri:resourceConstraints>
-            <mco:MD_LegalConstraints>
-               <mco:accessConstraints>
-                  <mco:MD_RestrictionCode codeList="" codeListValue="topSecret"/>
-               </mco:accessConstraints>
-               <mco:otherConstraints>
-                  <gco:CharacterString>No condition applies</gco:CharacterString>
-               </mco:otherConstraints>
-            </mco:MD_LegalConstraints>
-         </mri:resourceConstraints>
-         
-         
-         
-         
-         
-         
-         <!-- Valid for rule.mco-legalconstraint-other -->
-         <mri:resourceConstraints>
-            <mco:MD_LegalConstraints>
-               <mco:accessConstraints>
-                  <mco:MD_RestrictionCode codeList="" codeListValue="topSecret"/>
-               </mco:accessConstraints>
-               <mco:accessConstraints>
-                  <mco:MD_RestrictionCode codeList="" codeListValue="otherRestrictions"/>
-               </mco:accessConstraints>
-               
-               <mco:useConstraints>
-                  <mco:MD_RestrictionCode codeList="" codeListValue="otherRestrictions"/>
-               </mco:useConstraints>
-               
-               <mco:otherConstraints>
-                  <gco:CharacterString>No condition applies</gco:CharacterString>
-               </mco:otherConstraints>
-            </mco:MD_LegalConstraints>
-         </mri:resourceConstraints>
-         
-         
-         
-      </mri:MD_DataIdentification>
-   </mdb:identificationInfo>
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md1/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md1/1.0/index.html
deleted file mode 100644
index 33d992516..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md1/1.0/index.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Metadata for Data and Services with Geospatial Common Extensions (MD1) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Metadata for Data and Services with Geospatial Common Extensions (MD1) Version: 1.0</h1><img src="md1.png"><h2>Description</h2>
-      <p>MD1 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause A.2.3.4.  It includes this namespace contains all classes needed for a complete metadata record for any
-         resource and enables the use of FileName, MimeType, and Anchor elements (gex). The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>Sample XML files for md1 1.0</h2><a href="instance1.xml">instance1.xml</a> 
-      <h2>XML Namespace for md1 1.0</h2>
-      <p>The namespace URI for md1 1.0 is <b>http://standards.iso.org/iso/19115/-3/md1/1.0</b>.
-      </p>
-      <h2>XML Schema for md1 1.0</h2>
-      <p><b><a href="md1.xsd">md1.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the md1 1.0 namespace or by XML Schema documents importing the md1 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the md1 namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for md1 1.0 are available <a href="md1.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for md1 1.0</h2>
-      <p><b><a href="metadataWExtendedType.xsd">metadataWExtendedType.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause A.2.3.4. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): 
-      </p>
-      <h2>Related XML Namespaces for md1 1.0</h2> The md1 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Geospatial Common eXtension</td>
-            <td>gcx</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gcx/1.0">http://standards.iso.org/iso/19115/-3/gcx/1.0</a></td>
-            <td>../../../../19115/-3/gcx/1.0/gcx.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata for Data and Services</td>
-            <td>mds</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mds/1.0">http://standards.iso.org/iso/19115/-3/mds/1.0</a></td>
-            <td>../../../../19115/-3/mds/1.0/mds.xsd</td>
-         </tr>
-      </table>
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md1/1.0/md1.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md1/1.0/md1.png
deleted file mode 100644
index 2c9998bf4..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md1/1.0/md1.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md1/1.0/md1.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md1/1.0/md1.xsd
deleted file mode 100644
index 178eb468c..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md1/1.0/md1.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0" xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0" xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:md1="http://standards.iso.org/iso/19115/-3/md1/1.0" xmlns:mds="http://standards.iso.org/iso/19115/-3/mds/1.0" xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/md1/1.0" version="1.0">
-  <annotation>
-    <documentation>Namespace &lt;font color="#1f497d"&gt;that identifies conformance class that allows extended types (gcx) in metadata records&lt;/font&gt;</documentation>
-  </annotation>
-  <include schemaLocation="metadataWExtendedType.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gcx/1.0" schemaLocation="../../../../19115/-3/gcx/1.0/gcx.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mds/1.0" schemaLocation="../../../../19115/-3/mds/1.0/mds.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md1/1.0/md1.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md1/1.0/md1.zip
deleted file mode 100644
index ab00548b5..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md1/1.0/md1.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md1/1.0/metadataWExtendedType.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md1/1.0/metadataWExtendedType.xsd
deleted file mode 100644
index 61ee8782a..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md1/1.0/metadataWExtendedType.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:md1="http://standards.iso.org/iso/19115/-3/md1/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/md1/1.0" version="1.0">
-  <include schemaLocation="md1.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md2/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md2/1.0/index.html
deleted file mode 100644
index e6f5db634..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md2/1.0/index.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Metadata for Data and Services with Geospatial Common Extensions (MD2) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Metadata for Data and Services with Geospatial Common Extensions (MD2) Version: 1.0</h1><img src="md2.png"><h2>Description</h2>
-      <p>MD2 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause A.2.3.5.  It includes this namespace contains all classes needed for a complete metadata record for any
-         resource and enables the description of schema extensions (MD_MetadataExtensionInformation)
-         elements (mex). The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>Sample XML files for md2 1.0</h2><a href="instance1.xml">instance1.xml</a> 
-      <h2>XML Namespace for md2 1.0</h2>
-      <p>The namespace URI for md2 1.0 is <b>http://standards.iso.org/iso/19115/-3/md2/1.0</b>.
-      </p>
-      <h2>XML Schema for md2 1.0</h2>
-      <p><b><a href="md2.xsd">md2.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the md2 1.0 namespace or by XML Schema documents importing the md2 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the md2 namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for md2 1.0 are available <a href="md2.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for md2 1.0</h2>
-      <p><b><a href="metadataWithExtensions.xsd">metadataWithExtensions.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause A.2.3.5. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): 
-      </p>
-      <h2>Related XML Namespaces for md2 1.0</h2> The md2 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Citation and responsible party information</td>
-            <td>cit</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/cit/1.0">http://standards.iso.org/iso/19115/-3/cit/1.0</a></td>
-            <td>../../../../19115/-3/cit/1.0/cit.xsd</td>
-         </tr>
-         <tr>
-            <td>Geospatial Common eXtension</td>
-            <td>gcx</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gcx/1.0">http://standards.iso.org/iso/19115/-3/gcx/1.0</a></td>
-            <td>../../../../19115/-3/gcx/1.0/gcx.xsd</td>
-         </tr>
-         <tr>
-            <td>Language localization</td>
-            <td>lan</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/lan/1.0">http://standards.iso.org/iso/19115/-3/lan/1.0</a></td>
-            <td>../../../../19115/-3/lan/1.0/lan.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata Common Classes</td>
-            <td>mcc</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mcc/1.0">http://standards.iso.org/iso/19115/-3/mcc/1.0</a></td>
-            <td>../../../../19115/-3/mcc/1.0/mcc.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata for Data and Services with Geospatial Common Extensions</td>
-            <td>md1</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/md1/1.0">http://standards.iso.org/iso/19115/-3/md1/1.0</a></td>
-            <td>../../../../19115/-3/md1/1.0/md1.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata with Schema Extensions</td>
-            <td>mex</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mex/1.0">http://standards.iso.org/iso/19115/-3/mex/1.0</a></td>
-            <td>../../../../19115/-3/mex/1.0/mex.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata for Portrayal Catalog</td>
-            <td>mpc</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mpc/1.0">http://standards.iso.org/iso/19115/-3/mpc/1.0</a></td>
-            <td>../../../../19115/-3/mpc/1.0/mpc.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata for Resource Identification</td>
-            <td>mri</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mri/1.0">http://standards.iso.org/iso/19115/-3/mri/1.0</a></td>
-            <td>../../../../19115/-3/mri/1.0/mri.xsd</td>
-         </tr>
-      </table>
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md2/1.0/md2.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md2/1.0/md2.png
deleted file mode 100644
index 790dbad40..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md2/1.0/md2.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md2/1.0/md2.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md2/1.0/md2.xsd
deleted file mode 100644
index c5f0ab20e..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md2/1.0/md2.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0" xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0" xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:md1="http://standards.iso.org/iso/19115/-3/md1/1.0" xmlns:md2="http://standards.iso.org/iso/19115/-3/md2/1.0" xmlns:mex="http://standards.iso.org/iso/19115/-3/mex/1.0" xmlns:mpc="http://standards.iso.org/iso/19115/-3/mpc/1.0" xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/md2/1.0" version="1.0">
-  <annotation>
-    <documentation>Namespace &lt;font color="#1f497d"&gt;that identifies conformance class that includes user-defined metadata extensions in metadata records&lt;/font&gt;</documentation>
-  </annotation>
-  <include schemaLocation="metadataWithExtensions.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/cit/1.0" schemaLocation="../../../../19115/-3/cit/1.0/cit.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gcx/1.0" schemaLocation="../../../../19115/-3/gcx/1.0/gcx.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/lan/1.0" schemaLocation="../../../../19115/-3/lan/1.0/lan.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/md1/1.0" schemaLocation="../../../../19115/-3/md1/1.0/md1.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mex/1.0" schemaLocation="../../../../19115/-3/mex/1.0/mex.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mpc/1.0" schemaLocation="../../../../19115/-3/mpc/1.0/mpc.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mri/1.0" schemaLocation="../../../../19115/-3/mri/1.0/mri.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md2/1.0/md2.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md2/1.0/md2.zip
deleted file mode 100644
index f25dfb386..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md2/1.0/md2.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md2/1.0/metadataWithExtensions.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md2/1.0/metadataWithExtensions.xsd
deleted file mode 100644
index d83d425d5..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/md2/1.0/metadataWithExtensions.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:md2="http://standards.iso.org/iso/19115/-3/md2/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/md2/1.0" version="1.0">
-  <include schemaLocation="md2.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mda/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mda/1.0/index.html
deleted file mode 100644
index d47240c88..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mda/1.0/index.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>MetaData Application (MDA) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>MetaData Application (MDA) Version: 1.0</h1><img src="mda.png"><h2>Description</h2>
-      <p>MDA 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.2.  It includes elements to represent resources that may be aggregated and described by metadata records
-         (DS_*) The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>XML Namespace for mda 1.0</h2>
-      <p>The namespace URI for mda 1.0 is <b>http://standards.iso.org/iso/19115/-3/mda/1.0</b>.
-      </p>
-      <h2>XML Schema for mda 1.0</h2>
-      <p><b><a href="mda.xsd">mda.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the mda 1.0 namespace or by XML Schema documents importing the mda 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the mda namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for mda 1.0 are available <a href="mda.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for mda 1.0</h2>
-      <p><b><a href="metadataApplication.xsd">metadataApplication.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.2. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): AbstractDS_Aggregate, DS_DataSet, DS_Initiative, DS_OtherAggregate, DS_Platform, DS_ProductionSeries, AbstractDS_Resource, DS_Sensor, DS_Series, and SV_Service
-      </p>
-      <h2>Related XML Namespaces for mda 1.0</h2> The mda 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Geographic COmmon</td>
-            <td>gco</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gco/1.0">http://standards.iso.org/iso/19115/-3/gco/1.0</a></td>
-            <td>../../../../19115/-3/gco/1.0/gco.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata for Data and Services with Geospatial Common Extensions</td>
-            <td>md2</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/md2/1.0">http://standards.iso.org/iso/19115/-3/md2/1.0</a></td>
-            <td>../../../../19115/-3/md2/1.0/md2.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata Base</td>
-            <td>mdb</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mdb/1.0">http://standards.iso.org/iso/19115/-3/mdb/1.0</a></td>
-            <td>../../../../19115/-3/mdb/1.0/mdb.xsd</td>
-         </tr>
-      </table>
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mda/1.0/mda.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mda/1.0/mda.png
deleted file mode 100644
index 1e5d36ee6..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mda/1.0/mda.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mda/1.0/mda.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mda/1.0/mda.xsd
deleted file mode 100644
index 86eb7f344..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mda/1.0/mda.xsd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:md2="http://standards.iso.org/iso/19115/-3/md2/1.0" xmlns:mda="http://standards.iso.org/iso/19115/-3/mda/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mda/1.0" version="1.0">
-  <annotation>
-    <documentation>Namespace for XML elements &lt;font color="#1f497d"&gt;for metadata applications describing aggregated resources with linked metadata records&lt;/font&gt;</documentation>
-  </annotation>
-  <include schemaLocation="metadataApplication.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/md2/1.0" schemaLocation="../../../../19115/-3/md2/1.0/md2.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mda/1.0/mda.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mda/1.0/mda.zip
deleted file mode 100644
index 5afb0348d..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mda/1.0/mda.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mda/1.0/metadataApplication.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mda/1.0/metadataApplication.xsd
deleted file mode 100644
index 44795db52..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mda/1.0/metadataApplication.xsd
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:mda="http://standards.iso.org/iso/19115/-3/mda/1.0" xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mda/1.0" version="1.0">
-  <include schemaLocation="mda.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mdb/1.0" schemaLocation="../../../../19115/-3/mdb/1.0/mdb.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element abstract="true" name="AbstractDS_Aggregate" substitutionGroup="mda:AbstractDS_Resource" type="mda:AbstractDS_Aggregate_Type">
-    <annotation>
-      <documentation>collection of resources</documentation>
-    </annotation>
-  </element>
-  <complexType abstract="true" name="AbstractDS_Aggregate_Type">
-    <complexContent>
-      <extension base="mda:AbstractDS_Resource_Type">
-        <sequence>
-          <element maxOccurs="unbounded" name="composedOf" type="mda:AbstractDS_Resource_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="AbstractDS_Aggregate_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mda:AbstractDS_Aggregate"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="DS_DataSet" substitutionGroup="mda:AbstractDS_Resource" type="mda:DS_DataSet_Type">
-    <annotation>
-      <documentation>identifiable collection of data</documentation>
-    </annotation>
-  </element>
-  <complexType name="DS_DataSet_Type">
-    <complexContent>
-      <extension base="mda:AbstractDS_Resource_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="DS_DataSet_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mda:DS_DataSet"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="DS_Initiative" substitutionGroup="mda:AbstractDS_Aggregate" type="mda:DS_Initiative_Type">
-    <annotation>
-      <documentation>collection of associated resources related by their participation in a common initiative</documentation>
-    </annotation>
-  </element>
-  <complexType name="DS_Initiative_Type">
-    <complexContent>
-      <extension base="mda:AbstractDS_Aggregate_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="DS_Initiative_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mda:DS_Initiative"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="DS_OtherAggregate" substitutionGroup="mda:AbstractDS_Aggregate" type="mda:DS_OtherAggregate_Type">
-    <annotation>
-      <documentation>collection of resource associated through inspecified means</documentation>
-    </annotation>
-  </element>
-  <complexType name="DS_OtherAggregate_Type">
-    <complexContent>
-      <extension base="mda:AbstractDS_Aggregate_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="DS_OtherAggregate_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mda:DS_OtherAggregate"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="DS_Platform" substitutionGroup="mda:DS_Series" type="mda:DS_Platform_Type">
-    <annotation>
-      <documentation>collection of associated resources produced from the same sensor platform</documentation>
-    </annotation>
-  </element>
-  <complexType name="DS_Platform_Type">
-    <complexContent>
-      <extension base="mda:DS_Series_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="DS_Platform_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mda:DS_Platform"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="DS_ProductionSeries" substitutionGroup="mda:DS_Series" type="mda:DS_ProductionSeries_Type">
-    <annotation>
-      <documentation>collection of associated resources produced to the same production specification</documentation>
-    </annotation>
-  </element>
-  <complexType name="DS_ProductionSeries_Type">
-    <complexContent>
-      <extension base="mda:DS_Series_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="DS_ProductionSeries_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mda:DS_ProductionSeries"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="AbstractDS_Resource" substitutionGroup="gco:AbstractObject" type="mda:AbstractDS_Resource_Type">
-    <annotation>
-      <documentation>an identifiable asset or means that fulfils a requirement</documentation>
-    </annotation>
-  </element>
-  <complexType abstract="true" name="AbstractDS_Resource_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element maxOccurs="unbounded" name="has" type="mdb:MD_Metadata_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="AbstractDS_Resource_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mda:AbstractDS_Resource"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="DS_Sensor" substitutionGroup="mda:DS_Series" type="mda:DS_Sensor_Type">
-    <annotation>
-      <documentation>collection of associated resources produced by the same sensor</documentation>
-    </annotation>
-  </element>
-  <complexType name="DS_Sensor_Type">
-    <complexContent>
-      <extension base="mda:DS_Series_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="DS_Sensor_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mda:DS_Sensor"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="DS_Series" substitutionGroup="mda:AbstractDS_Aggregate" type="mda:DS_Series_Type">
-    <annotation>
-      <documentation>collection of resource related by a common heritage adhering to a common specification</documentation>
-    </annotation>
-  </element>
-  <complexType name="DS_Series_Type">
-    <complexContent>
-      <extension base="mda:AbstractDS_Aggregate_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="DS_Series_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mda:DS_Series"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="SV_Service" substitutionGroup="mda:AbstractDS_Resource" type="mda:SV_Service_Type">
-    <annotation>
-      <documentation>resource is a service</documentation>
-    </annotation>
-  </element>
-  <complexType name="SV_Service_Type">
-    <complexContent>
-      <extension base="mda:AbstractDS_Resource_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="SV_Service_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mda:SV_Service"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/AppendixD.1MinimalExample.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/AppendixD.1MinimalExample.xml
deleted file mode 100644
index b851e06c0..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/AppendixD.1MinimalExample.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Minimal gmd based instance document -->
-<mdb:MD_Metadata xmlns="http://standards.iso.org/iso/19115/-3/mdb/1.0" 
-    xmlns:dqc="http://standards.iso.org/iso/19157/-2/dqc/1.0" 
-    xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" 
-    xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" 
-    xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" 
-    xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0"
-    xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0"
-    xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0"
-    xmlns:gex="http://standards.iso.org/iso/19115/-3/gex/1.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mdb/1.0 mdb.xsd">
-    <mdb:contact>
-        <cit:CI_Responsibility>
-            <cit:role>
-                <cit:CI_RoleCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codeList.xml#CI_RoleCode" codeListValue="custodian">custodian</cit:CI_RoleCode>
-            </cit:role>
-            <cit:party>
-                <cit:CI_Organisation>
-<!-- name or logo is mandatory by schematron-enforced constraint -->
-                    <cit:name>  
-                        <gco:CharacterString>Department of Primary Industries and Resources SA</gco:CharacterString>
-                    </cit:name>
-                </cit:CI_Organisation>
-            </cit:party>
-        </cit:CI_Responsibility>
-    </mdb:contact>
-    <mdb:dateInfo>
-        <cit:CI_Date>
-            <cit:date>
-                <gco:DateTime>2004-03-12T12:00:00</gco:DateTime>
-            </cit:date>
-            <cit:dateType>
-                <cit:CI_DateTypeCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codeList.xml#creation" codeListValue="Creation"/>
-            </cit:dateType>
-        </cit:CI_Date>
-    </mdb:dateInfo>
-    <mdb:identificationInfo>
-        <mri:MD_DataIdentification>
-            <mri:citation>
-                <cit:CI_Citation>
-                    <cit:title>
-                        <gco:CharacterString>Exploration Licences for Minerals</gco:CharacterString>
-                    </cit:title>
-                    
-<!-- mandatory (dataType= creation) by constraint enforced by schematron rule -->
-                    <cit:date> 
-                        <cit:CI_Date>
-                            <cit:date>
-                                <gco:DateTime>1993-01-01T12:00:00</gco:DateTime>
-                            </cit:date>
-                            <cit:dateType>
-                                <cit:CI_DateTypeCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codeList.xml#CI_DateTypeCode" codeListValue="publication">publication</cit:CI_DateTypeCode>
-                            </cit:dateType>
-                        </cit:CI_Date>
-                    </cit:date>    
-              </cit:CI_Citation>
-            </mri:citation>
-            <mri:abstract>
-                <gco:CharacterString>Location of all current mineral Exploration Licences issued under the Mining Act, 1971. Exploration Licences provide exclusive tenure rights to explore for mineral resources for up to a maximum of 5 years. Comment issought on applications for Exploration Licences from numerous sources before granting. Exploration programs are subject to strict environmental and heritage conditions. Exploitation of identified resources must be made under separate mineral production leases.</gco:CharacterString>
-            </mri:abstract>
-            
- <!-- mandatory since MD_MetadataScope is not specified, and defaults to 'dataset' enforced by schematron rule -->
-            <mri:topicCategory>  
-                <mri:MD_TopicCategoryCode>boundaries</mri:MD_TopicCategoryCode>
-            </mri:topicCategory>
-            
-<!-- a bounding box is required because the mdb:MD_MetadataScope is not specified; enforced by schematron rule-->
-            <mri:extent>
-                <gex:EX_Extent>
-                    <gex:description>
-                        <gco:CharacterString>location description</gco:CharacterString>
-                    </gex:description>
-                    <gex:geographicElement>
-                        <gex:EX_GeographicBoundingBox>
-                            <gex:extentTypeCode>
-                                <gco:Boolean>false</gco:Boolean>
-                            </gex:extentTypeCode>
-                            <gex:westBoundLongitude>
-                                <gco:Decimal>129.0</gco:Decimal>
-                            </gex:westBoundLongitude>
-                            <gex:eastBoundLongitude>
-                                <gco:Decimal>141.0</gco:Decimal>
-                            </gex:eastBoundLongitude>
-                            <gex:southBoundLatitude>
-                                <gco:Decimal>-38.5</gco:Decimal>
-                            </gex:southBoundLatitude>
-                            <gex:northBoundLatitude>
-                                <gco:Decimal>-26.0</gco:Decimal>
-                            </gex:northBoundLatitude>
-                        </gex:EX_GeographicBoundingBox>
-                    </gex:geographicElement>
-                </gex:EX_Extent>
-            </mri:extent>
-<!-- mandatory if resource contains textual content (has to be enforced by inspection) -->
-            <mri:defaultLocale>
-                <lan:PT_Locale>
-                    <lan:language>
-                        <lan:LanguageCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/lan/LanguageCode.xml" codeListValue="eng">English</lan:LanguageCode>
-                    </lan:language>
-                    <lan:characterEncoding>
-                        <lan:MD_CharacterSetCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/lan/CharacterSetCode.xml" codeListValue="utf8">UTF-8</lan:MD_CharacterSetCode>
-                    </lan:characterEncoding>
-                </lan:PT_Locale>
-            </mri:defaultLocale>
-        </mri:MD_DataIdentification>
-    </mdb:identificationInfo>
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/index.html
deleted file mode 100644
index de13fb94d..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/index.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Metadata Base (MDB) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Metadata Base (MDB) Version: 1.0</h1><img src="mdb.png"><h2>Description</h2>
-      <p>MDB 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.2.  It includes mandatory elements for describing resources that are not services. This namespace
-         is used for metadata records that include only mandatory elements. The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>Sample XML files for mdb 1.0</h2><a href="AppendixD.1MinimalExample.xml">AppendixD.1MinimalExample.xml</a> <a href="mdb.xml">mdb.xml</a> <a href="mdb_invalid.xml">mdb_invalid.xml</a> <a href="mdb_valid.xml">mdb_valid.xml</a> 
-      <h2>XML Namespace for mdb 1.0</h2>
-      <p>The namespace URI for mdb 1.0 is <b>http://standards.iso.org/iso/19115/-3/mdb/1.0</b>.
-      </p>
-      <h2>XML Schema for mdb 1.0</h2>
-      <p><b><a href="mdb.xsd">mdb.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the mdb 1.0 namespace or by XML Schema documents importing the mdb 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the mdb namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for mdb 1.0 are available <a href="mdb.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for mdb 1.0</h2>
-      <p><b><a href="metadataBase.xsd">metadataBase.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.2. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): MD_Metadata, and MD_MetadataScope
-      </p>
-      <h2>Related XML Namespaces for mdb 1.0</h2> The mdb 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Citation and responsible party information</td>
-            <td>cit</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/cit/1.0">http://standards.iso.org/iso/19115/-3/cit/1.0</a></td>
-            <td>../../../../19115/-3/cit/1.0/cit.xsd</td>
-         </tr>
-         <tr>
-            <td>Data Quality Common Classes</td>
-            <td>dqc</td>
-            <td><a href="http://standards.iso.org/iso/19157/-2/dqc/1.0">http://standards.iso.org/iso/19157/-2/dqc/1.0</a></td>
-            <td>../../../../19157/-2/dqc/1.0/dqc.xsd</td>
-         </tr>
-         <tr>
-            <td>Geographic COmmon</td>
-            <td>gco</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gco/1.0">http://standards.iso.org/iso/19115/-3/gco/1.0</a></td>
-            <td>../../../../19115/-3/gco/1.0/gco.xsd</td>
-         </tr>
-         <tr>
-            <td>Geospatial EXtent</td>
-            <td>gex</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gex/1.0">http://standards.iso.org/iso/19115/-3/gex/1.0</a></td>
-            <td>../../../../19115/-3/gex/1.0/gex.xsd</td>
-         </tr>
-         <tr>
-            <td>Language localization</td>
-            <td>lan</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/lan/1.0">http://standards.iso.org/iso/19115/-3/lan/1.0</a></td>
-            <td>../../../../19115/-3/lan/1.0/lan.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata Common Classes</td>
-            <td>mcc</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mcc/1.0">http://standards.iso.org/iso/19115/-3/mcc/1.0</a></td>
-            <td>../../../../19115/-3/mcc/1.0/mcc.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata for Resource Identification</td>
-            <td>mri</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mri/1.0">http://standards.iso.org/iso/19115/-3/mri/1.0</a></td>
-            <td>../../../../19115/-3/mri/1.0/mri.xsd</td>
-         </tr>
-      </table>
-      <h2>Schematron Validation Rules for mdb 1.0</h2> Schematron rules for validating instance documents of the mdb 1.0 namespace are in <a href="mdb.sch">mdb.sch</a>. Other schematron rule sets that are
-      required for a complete validation are: cit.sch, dqc.sch, lan.sch, mcc.sch, mri.sch, gex.sch, gco.sch, dqc.sch, lan.sch, and mcc.sch
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/mdb.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/mdb.png
deleted file mode 100644
index 86e3a9aff..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/mdb.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/mdb.sch b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/mdb.sch
deleted file mode 100644
index 84921d174..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/mdb.sch
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron">
-  <sch:ns prefix="cit" uri="http://standards.iso.org/iso/19115/-3/cit/1.0"/>
-  <sch:ns prefix="mri" uri="http://standards.iso.org/iso/19115/-3/mri/1.0"/>
-  <sch:ns prefix="mdb" uri="http://standards.iso.org/iso/19115/-3/mdb/1.0"/>
-  <sch:ns prefix="mcc" uri="http://standards.iso.org/iso/19115/-3/mcc/1.0"/>
-  <sch:ns prefix="lan" uri="http://standards.iso.org/iso/19115/-3/lan/1.0"/>
-  <sch:ns prefix="gco" uri="http://standards.iso.org/iso/19115/-3/gco/1.0"/>
-  <!--
-    ISO 19115-3 base requirements for metadata instance documents
-    
-    See ISO19115-1:2014(E) page 10, Figure 5
-  -->
-  
-  <!-- 
-    Rule: Check root element. 
-    Ref: N/A
-  -->
-  <sch:diagnostics>
-    <sch:diagnostic 
-      id="rule.mdb.root-element-failure-en"
-      xml:lang="en">The root element must be MD_Metadata.</sch:diagnostic>
-    <sch:diagnostic 
-      id="rule.mdb.root-element-failure-fr"
-      xml:lang="fr">Modifier l'élément racine du document pour que ce 
-      soit un élément MD_Metadata.</sch:diagnostic>
-
-    <sch:diagnostic 
-      id="rule.mdb.root-element-success-en"
-      xml:lang="en">Root element MD_Metadata found.</sch:diagnostic>
-    <sch:diagnostic 
-      id="rule.mdb.root-element-success-fr"
-      xml:lang="fr">Élément racine MD_Metadata défini.</sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.mdb.root-element">
-    <sch:title xml:lang="en">Metadata document root element</sch:title>
-    <sch:title xml:lang="fr">Élément racine du document</sch:title>
-    
-    <sch:p xml:lang="en">A metadata instance document conforming to 
-      this specification SHALL have a root MD_Metadata element 
-      defined in the http://standards.iso.org/iso/19115/-3/mdb/1.0 namespace.</sch:p>
-    <sch:p xml:lang="fr">Une fiche de métadonnées conforme au standard
-      ISO19115-1 DOIT avoir un élément racine MD_Metadata (défini dans l'espace
-      de nommage http://standards.iso.org/iso/19115/-3/mdb/1.0).</sch:p>
-    <sch:rule context="/">
-      <sch:let name="hasOneMD_MetadataElement" 
-               value="count(/mdb:MD_Metadata) = 1"/>
-      
-      <sch:assert test="$hasOneMD_MetadataElement"
-      diagnostics="rule.mdb.root-element-failure-en 
-                   rule.mdb.root-element-failure-fr"/>
-      
-      <sch:report test="$hasOneMD_MetadataElement"
-        diagnostics="rule.mdb.root-element-success-en 
-                     rule.mdb.root-element-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
-  
-  
-  
-  
-  <!-- 
-    Rule:  
-    Ref: {defaultLocale documented if not defined by the encoding}
-    This can't be validated because the encoding is part of the default locale ? TODO-QUESTION
-    
-    Ref: {defaultLocale.PT_Locale.characterEncoding default value is UTF-8}
-    Check that encoding is not empty.
-  -->
-  
-  <sch:diagnostics>
-    <sch:diagnostic 
-      id="rule.mdb.defaultlocale-failure-en" 
-      xml:lang="en">The default locale character encoding is "UTF-8". Current value is
-      "<sch:value-of select="$encoding"/>".</sch:diagnostic>
-    <sch:diagnostic 
-      id="rule.mdb.defaultlocale-failure-fr" 
-      xml:lang="fr">L'encodage ne doit pas être vide. La valeur par défaut est 
-      "UTF-8". La valeur actuelle est "<sch:value-of select="$encoding"/>".</sch:diagnostic>
-    
-    
-    <sch:diagnostic 
-      id="rule.mdb.defaultlocale-success-en" 
-      xml:lang="en">The characeter encoding is "<sch:value-of select="$encoding"/>.
-    </sch:diagnostic>
-    <sch:diagnostic 
-      id="rule.mdb.defaultlocale-success-fr" 
-      xml:lang="fr">L'encodage est "<sch:value-of select="$encoding"/>.
-    </sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.mdb.defaultlocale">
-    <sch:title xml:lang="en">Default locale</sch:title>
-    <sch:title xml:lang="fr">Langue du document</sch:title>
-    
-    <sch:p xml:lang="en">The default locale MUST be documented if
-      not defined by the encoding. The default value for the character
-      encoding is "UTF-8".</sch:p>
-    <sch:p xml:lang="fr">La langue doit être documentée
-      si non définie par l'encodage. L'encodage par défaut doit être "UTF-8".</sch:p>
-    
-    <sch:rule context="/mdb:MD_Metadata/mdb:defaultLocale|
-                       /mdb:MD_Metadata/mdb:identificationInfo/*/mri:defaultLocale">
-      
-      <sch:let name="encoding" 
-        value="string(lan:PT_Locale/lan:characterEncoding/
-                  lan:MD_CharacterSetCode/@codeListValue)"/>
-      
-      <sch:let name="hasEncoding" 
-        value="normalize-space($encoding) != ''"/>
-      
-      
-      <sch:assert test="$hasEncoding"
-        diagnostics="rule.mdb.defaultlocale-failure-en
-                     rule.mdb.defaultlocale-failure-fr"/>
-      
-      <sch:report test="$hasEncoding"
-        diagnostics="rule.mdb.defaultlocale-success-en
-                     rule.mdb.defaultlocale-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
- 
- 
-  <!-- 
-    Rule: 
-    Ref: {count(MD_Metadata.parentMetadata) > 0 when there is an higher 
-    level object}
-    Comment: Can't be validated using schematron AFA the existence
-    of an higher level object can't be checked. TODO-QUESTION
-  -->
-  
-  
-  <!--
-    Rule:  
-    Ref: {count(MD_Metadata.metadataScope) > 0 if 
-    MD_Metadata.metadataScope.MD_MetadataScope.resourceScope
-    not equal to "dataset"}
-    
-    Ref: {name is mandatory if resourceScope not equal to "dataset"}
-  -->
-  <sch:diagnostics>
-    <sch:diagnostic 
-      id="rule.mdb.scope-name-failure-en" 
-      xml:lang="en">Specify a name for the metadata scope 
-      (required if the scope code is not "dataset", in that case
-      "<sch:value-of select="$scopeCode"/>").</sch:diagnostic>
-    <sch:diagnostic 
-      id="rule.mdb.scope-name-failure-fr" 
-      xml:lang="fr">Préciser la description du domaine d'application 
-      (car le document décrit une ressource qui n'est pas un "jeu de données",
-      la ressource est de type "<sch:value-of select="$scopeCode"/>").</sch:diagnostic>
-    
-    
-    <sch:diagnostic 
-      id="rule.mdb.scope-name-success-en" 
-      xml:lang="en">Scope name 
-      "<sch:value-of select="$scopeCodeName"/><sch:value-of select="$nilReason"/>"
-      is defined for resource with type "<sch:value-of select="$scopeCode"/>".
-    </sch:diagnostic>
-    <sch:diagnostic 
-      id="rule.mdb.scope-name-success-fr" 
-      xml:lang="fr">La description du domaine d'application 
-      "<sch:value-of select="$scopeCodeName"/><sch:value-of select="$nilReason"/>"
-      est renseignée pour la ressource de type "<sch:value-of select="$scopeCode"/>".
-    </sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.mdb.scope-name">
-    <sch:title xml:lang="en">Metadata scope Name</sch:title>
-    <sch:title xml:lang="fr">Description du domaine d'application</sch:title>
-    
-    <sch:p xml:lang="en">If a MD_MetadataScope element is present, 
-      the name property MUST have a value if resourceScope is not equal to "dataset"</sch:p>
-    <sch:p xml:lang="fr">Si un élément domaine d'application (MD_MetadataScope)
-      est défini, sa description (name) DOIT avoir une valeur
-      si ce domaine n'est pas "jeu de données" (ie. "dataset").</sch:p>
-    
-    <sch:rule context="/mdb:MD_Metadata/mdb:metadataScope/
-                          mdb:MD_MetadataScope[not(mdb:resourceScope/
-                            mcc:MD_ScopeCode/@codeListValue = 'dataset')]">
-      
-      <sch:let name="scopeCode" 
-        value="mdb:resourceScope/mcc:MD_ScopeCode/@codeListValue"/>
-      
-      <sch:let name="scopeCodeName" 
-        value="normalize-space(mdb:name)"/>
-      <sch:let name="hasScopeCodeName" 
-        value="normalize-space($scopeCodeName) != ''"/>
-      
-      <sch:let name="nilReason" 
-        value="mdb:name/@gco:nilReason"/>
-      <sch:let name="hasNilReason" 
-        value="$nilReason != ''"/>
-      
-      <sch:assert test="$hasScopeCodeName or $hasNilReason"
-        diagnostics="rule.mdb.scope-name-failure-en
-                     rule.mdb.scope-name-failure-fr"/>
-      
-      <sch:report test="$hasScopeCodeName or $hasNilReason"
-        diagnostics="rule.mdb.scope-name-success-en
-                     rule.mdb.scope-name-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
-  
-  
-  <!-- 
-    Rule: At least one creation date
-    Ref: {count(MD _Metadata.dateInfo.CI_Date.dateType.CI_DateTypeCode= "creation") > 0}
-  -->
-  <sch:diagnostics>
-    <sch:diagnostic 
-      id="rule.mdb.create-date-failure-en"
-      xml:lang="en">Specify a creation date for the metadata record 
-      in the metadata section.</sch:diagnostic>
-    <sch:diagnostic 
-      id="rule.mdb.create-date-failure-fr"
-      xml:lang="fr">Définir une date de création pour le document
-      dans la section sur les métadonnées.</sch:diagnostic>
-    
-    <sch:diagnostic 
-      id="rule.mdb.create-date-success-en" 
-      xml:lang="en">
-      Metadata creation date: <sch:value-of select="$creationDates"/>.
-    </sch:diagnostic>
-    <sch:diagnostic 
-      id="rule.mdb.create-date-success-fr" 
-      xml:lang="fr">
-      Date de création du document : <sch:value-of select="$creationDates"/>.
-    </sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.mdb.create-date">
-    <sch:title xml:lang="en">Metadata create date</sch:title>
-    <sch:title xml:lang="fr">Date de création du document</sch:title>
-    
-    <sch:p xml:lang="en">A dateInfo property value with data type = "creation" 
-      MUST be present in every MD_Metadata instance.</sch:p>
-    <sch:p xml:lang="fr">Tout document DOIT avoir une date de création 
-      définie (en utilisant un élément dateInfo avec un type de date "creation").</sch:p>
-    
-    <sch:rule context="mdb:MD_Metadata">
-      <sch:let name="creationDates"
-        value="./mdb:dateInfo/cit:CI_Date[
-                    normalize-space(cit:date/gco:DateTime) != '' and 
-                    cit:dateType/cit:CI_DateTypeCode/@codeListValue = 'creation']/
-                  cit:date/gco:DateTime"/>
-      
-      <!-- Check at least one non empty creation date element is defined. -->
-      <sch:let name="hasAtLeastOneCreationDate"
-        value="count(./mdb:dateInfo/cit:CI_Date[
-                    normalize-space(cit:date/gco:DateTime) != '' and 
-                    cit:dateType/cit:CI_DateTypeCode/@codeListValue = 'creation']
-                    ) &gt; 0"/>
-      
-      <sch:assert test="$hasAtLeastOneCreationDate"
-        diagnostics="rule.mdb.create-date-failure-en
-                     rule.mdb.create-date-failure-fr"/>
-      <sch:report test="$hasAtLeastOneCreationDate"
-        diagnostics="rule.mdb.create-date-success-en
-                     rule.mdb.create-date-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
-</sch:schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/mdb.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/mdb.xml
deleted file mode 100644
index 37f9518a5..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/mdb.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0"
- xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
- xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0"
- xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0"
- xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0"
- xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0">
-   <!-- 
-   This is a sample metadata record for the minimal metadata conformance class.
-   It contains required elements from the mdb, mcc (cit, gco), lan, and mri
-   namespaces.
-   -->
-   <mdb:contact>
-      <cit:CI_Responsibility>
-         <cit:role>
-            <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="pointOfContact">pointOfContact</cit:CI_RoleCode>
-         </cit:role>
-         <cit:party>
-            <cit:CI_Organisation>
-               <cit:name>
-                  <gco:CharacterString>Organisation Name</gco:CharacterString>
-               </cit:name>
-            </cit:CI_Organisation>
-         </cit:party>
-      </cit:CI_Responsibility>
-   </mdb:contact>
-   <mdb:dateInfo>
-      <cit:CI_Date>
-         <cit:date>
-            <gco:DateTime>2014-04-03T16:00:00</gco:DateTime>
-         </cit:date>
-         <cit:dateType>
-            <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode" codeListValue="creation">creation</cit:CI_DateTypeCode>
-         </cit:dateType>
-      </cit:CI_Date>
-   </mdb:dateInfo>
-   <mdb:identificationInfo>
-      <mri:MD_DataIdentification>
-         <mri:citation>
-            <cit:CI_Citation>
-               <cit:title>
-                  <gco:CharacterString>Sample Metadata for Minimal Conformance Class</gco:CharacterString>
-               </cit:title>
-            </cit:CI_Citation>
-         </mri:citation>
-         <mri:abstract>
-            <gco:CharacterString>This sample record has all required elements for minimal ISO 19115:2013 metadata</gco:CharacterString>
-         </mri:abstract>
-      </mri:MD_DataIdentification>
-   </mdb:identificationInfo>
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/mdb.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/mdb.xsd
deleted file mode 100644
index d2de970d4..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/mdb.xsd
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0" xmlns:dqc="http://standards.iso.org/iso/19157/-2/dqc/1.0" xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0" xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mdb/1.0" version="1.0">
-  <annotation>
-    <documentation>Wrapper namespace to support Catalog Service implementations</documentation>
-  </annotation>
-  <include schemaLocation="metadataBase.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/cit/1.0" schemaLocation="../../../../19115/-3/cit/1.0/cit.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19157/-2/dqc/1.0" schemaLocation="../../../../19157/-2/dqc/1.0/dqc.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/lan/1.0" schemaLocation="../../../../19115/-3/lan/1.0/lan.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mri/1.0" schemaLocation="../../../../19115/-3/mri/1.0/mri.xsd"/>
-  <!-- need to import gex because bounding box is mandatory if metadataScope is dataset -->
-  <import namespace="http://standards.iso.org/iso/19115/-3/gex/1.0" schemaLocation="../../../../19115/-3/gex/1.0/gex.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/mdb.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/mdb.zip
deleted file mode 100644
index fd8a71e13..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/mdb.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/mdb_invalid.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/mdb_invalid.xml
deleted file mode 100644
index d11097174..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/mdb_invalid.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mdb/1.0 mdb.xsd" 
- xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0" 
- xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
- xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" 
- xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" 
- xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0">
-   
-   <!-- Invalid for rule.mdb.defaultlocale -->
-   <mdb:defaultLocale>
-      <lan:PT_Locale>
-         <lan:language></lan:language>
-         <lan:characterEncoding>
-            <lan:MD_CharacterSetCode codeList="" codeListValue=""/>
-         </lan:characterEncoding>
-      </lan:PT_Locale>
-   </mdb:defaultLocale>
-   
-   
-   
-   <mdb:metadataScope>
-      <mdb:MD_MetadataScope>
-         <mdb:resourceScope>
-            <mcc:MD_ScopeCode codeList="codeListLocation#MD_ScopeCode" 
-               codeListValue="service">service</mcc:MD_ScopeCode>
-         </mdb:resourceScope>
-         <!-- Invalid for rule.mdb.scope-name
-          mdb:name>
-            <gco:CharacterString>/*/gmd:hierarchyLevelName/gco:CharacterString</gco:CharacterString>
-         </mdb:name> -->
-      </mdb:MD_MetadataScope>
-   </mdb:metadataScope>
-   <mdb:metadataScope>
-      <mdb:MD_MetadataScope>
-         <mdb:resourceScope>
-            <mcc:MD_ScopeCode codeList="codeListLocation#MD_ScopeCode" 
-               codeListValue="application">application</mcc:MD_ScopeCode>
-         </mdb:resourceScope>
-         <mdb:name>
-            <!-- Invalid for rule.mdb.scope-name
-               <gco:CharacterString>/*/gmd:hierarchyLevelName/gco:CharacterString</gco:CharacterString>
-               -->
-         </mdb:name>
-      </mdb:MD_MetadataScope>
-   </mdb:metadataScope>
-   <mdb:metadataScope>
-      <mdb:MD_MetadataScope>
-         <mdb:resourceScope>
-            <mcc:MD_ScopeCode codeList="codeListLocation#MD_ScopeCode" 
-               codeListValue="series">series</mcc:MD_ScopeCode>
-         </mdb:resourceScope>
-         <mdb:name>
-            <!-- Invalid for rule.mdb.scope-name -->
-            <gco:CharacterString></gco:CharacterString>
-         </mdb:name>
-      </mdb:MD_MetadataScope>
-   </mdb:metadataScope>
-   
-   
-   <!-- No match for the context -->
-   <mdb:metadataScope>
-      <mdb:MD_MetadataScope>
-         <mdb:resourceScope>
-            <mcc:MD_ScopeCode codeList="codeListLocation#MD_ScopeCode" 
-               codeListValue="dataset">/*/gmd:hierarchyLevel.2/gmd:MD_ScopeCode</mcc:MD_ScopeCode>
-         </mdb:resourceScope>
-         <mdb:name>
-            <!-- Valid for rule.mdb.scope-name -->
-            <gco:CharacterString>/*/gmd:hierarchyLevelName/gco:CharacterString</gco:CharacterString>
-         </mdb:name>
-      </mdb:MD_MetadataScope>
-   </mdb:metadataScope>
-   
-   <!-- mdb:contact required for schema validation -->
-   <mdb:contact gco:nilReason="inapplicable"/>
-   
-   <!-- Invalid for rule.mdb.create-date -->
-   <mdb:dateInfo>
-      <cit:CI_Date>
-         <cit:date>
-            <gco:DateTime>2011-11-11T00:00:00</gco:DateTime>
-         </cit:date>
-         <cit:dateType>
-            <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode" 
-               codeListValue="anyValidURI">nocreationdate</cit:CI_DateTypeCode>
-         </cit:dateType>
-      </cit:CI_Date>
-   </mdb:dateInfo>
-   
-   <!-- Invalid for rule.mdb.create-date : an empty creation date-->
-   <mdb:dateInfo>
-      <cit:CI_Date>
-         <cit:date>
-            <gco:DateTime></gco:DateTime>
-         </cit:date>
-         <cit:dateType>
-            <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode" 
-               codeListValue="creation">creation</cit:CI_DateTypeCode>
-         </cit:dateType>
-      </cit:CI_Date>
-   </mdb:dateInfo>
-   
-   <!-- mdb:identificationInfo required for schema validation -->
-   <mdb:identificationInfo gco:nilReason="inapplicable"/>
-   
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/mdb_valid.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/mdb_valid.xml
deleted file mode 100644
index 658adb64d..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/mdb_valid.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mdb/1.0 mdb.xsd" 
- xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0" 
- xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
- xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" 
- xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" 
- xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0">
- 
-   <mdb:defaultLocale>
-      <lan:PT_Locale>
-         <lan:language></lan:language>
-         <lan:characterEncoding>
-            <lan:MD_CharacterSetCode codeList="" codeListValue="UTF-16"/>
-         </lan:characterEncoding>
-      </lan:PT_Locale>
-   </mdb:defaultLocale>
-   
-   <mdb:metadataScope>
-      <mdb:MD_MetadataScope>
-         <mdb:resourceScope>
-            <mcc:MD_ScopeCode codeList="codeListLocation#MD_ScopeCode" 
-               codeListValue="service">service</mcc:MD_ScopeCode>
-         </mdb:resourceScope>
-         <mdb:name>
-            <!-- Valid for rule.mdb.scope-name -->
-            <gco:CharacterString>Internal service</gco:CharacterString>
-         </mdb:name>
-      </mdb:MD_MetadataScope>
-   </mdb:metadataScope>
-   <mdb:metadataScope>
-      <mdb:MD_MetadataScope>
-         <mdb:resourceScope>
-            <mcc:MD_ScopeCode codeList="codeListLocation#MD_ScopeCode" 
-               codeListValue="series">series</mcc:MD_ScopeCode>
-         </mdb:resourceScope>
-         <!-- Valid for rule.mdb.scope-name due to nilReason -->
-         <mdb:name gco:nilReason="unknown">
-            <gco:CharacterString></gco:CharacterString>
-         </mdb:name>
-      </mdb:MD_MetadataScope>
-   </mdb:metadataScope>
-   <mdb:metadataScope>
-      <mdb:MD_MetadataScope>
-         <mdb:resourceScope>
-            <mcc:MD_ScopeCode codeList="codeListLocation#MD_ScopeCode" 
-               codeListValue="dataset">dataset</mcc:MD_ScopeCode>
-         </mdb:resourceScope>
-      </mdb:MD_MetadataScope>
-   </mdb:metadataScope>
-   
-   <!-- mdb:contact required for schema validation -->
-   <mdb:contact gco:nilReason="inapplicable"/>
-   
-   <!-- Valid for rule.mdb.create-date -->
-   <mdb:dateInfo>
-      <cit:CI_Date>
-         <cit:date>
-            <gco:DateTime>2011-11-11T00:00:00</gco:DateTime>
-         </cit:date>
-         <cit:dateType>
-            <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode" 
-               codeListValue="creation">creation</cit:CI_DateTypeCode>
-         </cit:dateType>
-      </cit:CI_Date>
-   </mdb:dateInfo>
-   <!-- Multiple creation date may be reported ?-->
-   <mdb:dateInfo>
-      <cit:CI_Date>
-         <cit:date>
-            <gco:DateTime>2012-11-11T00:00:00</gco:DateTime>
-         </cit:date>
-         <cit:dateType>
-            <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode" 
-               codeListValue="creation">creation</cit:CI_DateTypeCode>
-         </cit:dateType>
-      </cit:CI_Date>
-   </mdb:dateInfo>
-   
-   <!-- mdb:identificationInfo required for schema validation -->
-   <mdb:identificationInfo gco:nilReason="inapplicable"/>
-
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/metadataBase.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/metadataBase.xsd
deleted file mode 100644
index 6196901a7..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdb/1.0/metadataBase.xsd
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:dqc="http://standards.iso.org/iso/19157/-2/dqc/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mdb/1.0" version="1.0">
-  <include schemaLocation="mdb.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19157/-2/dqc/1.0" schemaLocation="../../../../19157/-2/dqc/1.0/dqc.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/lan/1.0" schemaLocation="../../../../19115/-3/lan/1.0/lan.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="MD_Metadata" substitutionGroup="mcc:Abstract_Metadata" type="mdb:MD_Metadata_Type">
-    <annotation>
-      <documentation>root entity which defines metadata about a resource or resources</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_Metadata_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_Metadata_Type">
-        <sequence>
-          <element minOccurs="0" name="metadataIdentifier" type="mcc:MD_Identifier_PropertyType"/>
-          <element minOccurs="0" name="defaultLocale" type="lan:PT_Locale_PropertyType">
-            <annotation>
-              <documentation>Provides information about an alternatively used localized character string for a linguistic extension</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="parentMetadata" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>Identifier and onlineResource for a parent metadata record</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="metadataScope" type="mdb:MD_MetadataScope_PropertyType"/>
-          <element maxOccurs="unbounded" name="contact" type="mcc:Abstract_Responsibility_PropertyType">
-            <annotation>
-              <documentation>party responsible for the metadata information</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" name="dateInfo" type="mcc:Abstract_TypedDate_PropertyType">
-            <annotation>
-              <documentation>Date(s) other than creation dateEG: expiry date</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="metadataStandard" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>Citation for the standards to which the metadata conforms</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="metadataProfile" type="mcc:Abstract_Citation_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="alternativeMetadataReference" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>unique Identifier and onlineResource for alternative metadata</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="otherLocale" type="lan:PT_Locale_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="metadataLinkage" type="mcc:Abstract_OnlineResource_PropertyType">
-            <annotation>
-              <documentation>online location where the metadata is available</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="spatialRepresentationInfo" type="mcc:Abstract_SpatialRepresentation_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="referenceSystemInfo" type="mcc:Abstract_ReferenceSystem_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="metadataExtensionInfo" type="mcc:Abstract_MetadataExtension_PropertyType"/>
-          <element maxOccurs="unbounded" name="identificationInfo" type="mcc:Abstract_ResourceDescription_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="contentInfo" type="mcc:Abstract_ContentInformation_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="distributionInfo" type="mcc:Abstract_Distribution_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="dataQualityInfo" type="dqc:Abstract_DataQuality_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="resourceLineage" type="mcc:Abstract_LineageInformation_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="portrayalCatalogueInfo" type="mcc:Abstract_PortrayalCatalogueInformation_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="metadataConstraints" type="mcc:Abstract_Constraints_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="applicationSchemaInfo" type="mcc:Abstract_ApplicationSchemaInformation_PropertyType"/>
-          <element minOccurs="0" name="metadataMaintenance" type="mcc:Abstract_MaintenanceInformation_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="acquisitionInformation" type="mcc:Abstract_AcquisitionInformation_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_Metadata_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mdb:MD_Metadata"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_MetadataScope" substitutionGroup="gco:AbstractObject" type="mdb:MD_MetadataScope_Type"/>
-  <complexType name="MD_MetadataScope_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="resourceScope" type="mcc:MD_ScopeCode_PropertyType"/>
-          <element minOccurs="0" name="name" type="gco:CharacterString_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_MetadataScope_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mdb:MD_MetadataScope"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mds/1.0/AppendixD.2VectorSmartMapExample.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mds/1.0/AppendixD.2VectorSmartMapExample.xml
deleted file mode 100644
index b5843e7fc..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mds/1.0/AppendixD.2VectorSmartMapExample.xml
+++ /dev/null
@@ -1,631 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- VMAP 0 gmd based instance document -->
-<mdb:MD_Metadata xmlns="http://standards.iso.org/iso/19115/-3/mds/1.0"
-    xmlns:fcc="http://standards.iso.org/iso/19110/fcc/1.0"
-    xmlns:gex="http://standards.iso.org/iso/19115/-3/gex/1.0"
-    xmlns:mac="http://standards.iso.org/iso/19115/-3/mac/1.0"
-    xmlns:mas="http://standards.iso.org/iso/19115/-3/mas/1.0"
-    xmlns:mco="http://standards.iso.org/iso/19115/-3/mco/1.0"
-    xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0"
-    xmlns:mdq="http://standards.iso.org/iso/19157/-2/mdq/1.0"
-    xmlns:mds="http://standards.iso.org/iso/19115/-3/mds/1.0"
-    xmlns:mmi="http://standards.iso.org/iso/19115/-3/mmi/1.0"
-    xmlns:mpc="http://standards.iso.org/iso/19115/-3/mpc/1.0"
-    xmlns:mrc="http://standards.iso.org/iso/19115/-3/mrc/1.0"
-    xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0"
-    xmlns:mrl="http://standards.iso.org/iso/19115/-3/mrl/1.0"
-    xmlns:mrs="http://standards.iso.org/iso/19115/-3/mrs/1.0"
-    xmlns:msr="http://standards.iso.org/iso/19115/-3/msr/1.0"
-    xmlns:srv="http://standards.iso.org/iso/19115/-3/srv/2.0"
-    xmlns:dqc="http://standards.iso.org/iso/19157/-2/dqc/1.0"
-    xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
-    xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0"
-    xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0"
-    xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0"
-    xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0" 
-    xmlns:gml="http://www.opengis.net/gml/3.2"
-    xmlns:xlink="http://www.w3.org/1999/xlink" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mds/1.0 mds.xsd" 
-    uuid="US_NGA_VPF_VMAP0"
-    id="VMAP0">
-    <mdb:defaultLocale>
-        <lan:PT_Locale>
-            <lan:language>
-                <lan:LanguageCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/lan/LanguageCode.xml" codeListValue="eng">English</lan:LanguageCode>
-            </lan:language>
-            <lan:characterEncoding>
-                <lan:MD_CharacterSetCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/lan/CharacterSetCode.xml" codeListValue="utf8">UTF-8</lan:MD_CharacterSetCode>
-            </lan:characterEncoding>
-        </lan:PT_Locale>
-    </mdb:defaultLocale>
-    <mdb:contact>
-        <cit:CI_Responsibility>
-            <cit:role>
-                <cit:CI_RoleCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codeList.xml#CI_RoleCode" codeListValue="publisher"/>
-            </cit:role>
-            <cit:party>
-                <cit:CI_Organisation>
-                    <cit:name>
-                        <gco:CharacterString>US National Geospatial-Intelligence Agen-cy</gco:CharacterString>
-                    </cit:name>
-                    <cit:contactInfo>
-                        <cit:CI_Contact>
-                            <cit:phone/>
-                            <cit:address xlink:href="#ID00003"/>
-                            <cit:onlineResource xlink:href="#ID00009"/>
-                        </cit:CI_Contact>
-                    </cit:contactInfo>
-                </cit:CI_Organisation>
-            </cit:party>
-        </cit:CI_Responsibility>
-    </mdb:contact>
-    <!-- Date the metadata was created -->
-    <mdb:dateInfo>
-        <cit:CI_Date>
-            <cit:date>
-                <gco:DateTime>2004-03-14T12:00:00</gco:DateTime>
-            </cit:date>
-            <cit:dateType>
-                <cit:CI_DateTypeCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codeList.xml#CI_DateTypeCode" codeListValue="creation"/>
-            </cit:dateType>
-        </cit:CI_Date>
-    </mdb:dateInfo>
-    <mdb:metadataStandard>
-        <cit:CI_Citation>
-            <cit:title>
-                <gco:CharacterString>ISO 19115-1</gco:CharacterString>
-            </cit:title>
-            <cit:edition>
-                <gco:CharacterString>2003</gco:CharacterString>
-            </cit:edition>
-        </cit:CI_Citation>
-    </mdb:metadataStandard>
-
-    <!-- REFERENCE SYSTEM INFORMATION -->
-    <mdb:referenceSystemInfo>
-        <mrs:MD_ReferenceSystem>
-            <mrs:referenceSystemIdentifier>
-                <mcc:MD_Identifier>
-                    <mcc:authority>
-                        <cit:CI_Citation>
-                            <cit:title>
-                                <gco:CharacterString>World Geodetic System</gco:CharacterString>
-                            </cit:title>
-                        </cit:CI_Citation>
-                    </mcc:authority>
-                    <mcc:code>
-                        <gco:CharacterString>WGS 84</gco:CharacterString>
-                    </mcc:code>
-                </mcc:MD_Identifier>
-            </mrs:referenceSystemIdentifier>
-        </mrs:MD_ReferenceSystem>
-    </mdb:referenceSystemInfo>
-    <!-- END REFERENCE SYSTEM INFORMATION -->
-    <!-- IDENTIFICATION INFORMATION -->
-    <mdb:identificationInfo>
-        <mri:MD_DataIdentification>
-            <mri:citation>
-                <cit:CI_Citation>
-                    <cit:title>
-                        <gco:CharacterString>VMAPLV0</gco:CharacterString>
-                    </cit:title>
-                    <cit:date>
-                        <cit:CI_Date>
-                            <cit:date>
-                                <gco:DateTime>2000-09-03T12:00:00</gco:DateTime>
-                            </cit:date>
-                            <cit:dateType>
-                                <cit:CI_DateTypeCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codeList.xml#CI_DateTypeCode" codeListValue="publication"/>
-                            </cit:dateType>
-                        </cit:CI_Date>
-                    </cit:date>
-                    <cit:presentationForm>
-                        <cit:CI_PresentationFormCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codeList.xml#CI_PresentationFormCode" codeListValue="mapDigital"/>
-                    </cit:presentationForm>
-                </cit:CI_Citation>
-            </mri:citation>
-            <mri:abstract>
-                <gco:CharacterString>Vector Map: a general purpose database design to support GIS
-                    applications</gco:CharacterString>
-            </mri:abstract>
-            <mri:status>
-                <mcc:MD_ProgressCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codeList.xml#MD_ProgressCode" codeListValue="completed"/>
-            </mri:status>
-            <mri:pointOfContact>
-                <cit:CI_Responsibility id="ID00001">
-                    <cit:role>
-                        <cit:CI_RoleCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codeList.xml#CI_RoleCode" codeListValue="originator"/>
-                    </cit:role>
-                    <cit:party>
-                        <cit:CI_Organisation>
-                            <cit:name>
-                                <gco:CharacterString>US National Geospatial-Intelligence
-                        Agency</gco:CharacterString>
-                            </cit:name>
-                            <cit:contactInfo>
-                                <cit:CI_Contact id="ID00002">
-                                    <cit:phone>
-                                        <cit:CI_Telephone>
-                                            <cit:number>
-                                                <gco:CharacterString>888-888-8888</gco:CharacterString>
-                                            </cit:number>
-                                        </cit:CI_Telephone>
-                                    </cit:phone>
-                                    <cit:address>
-                                        <cit:CI_Address id="ID00003">
-                                            <cit:deliveryPoint>
-                                                <gco:CharacterString>4600 Sangamore Rd</gco:CharacterString>
-                                            </cit:deliveryPoint>
-                                            <cit:city>
-                                                <gco:CharacterString>Bethesda</gco:CharacterString>
-                                            </cit:city>
-                                            <cit:administrativeArea>
-                                                <gco:CharacterString>MD</gco:CharacterString>
-                                            </cit:administrativeArea>
-                                            <cit:postalCode>
-                                                <gco:CharacterString>20816-5003</gco:CharacterString>
-                                            </cit:postalCode>
-                                            <cit:country>
-                                                <gco:CharacterString>United States</gco:CharacterString>
-                                            </cit:country>
-                                        </cit:CI_Address>
-                                    </cit:address>
-                                    <cit:onlineResource>
-                                        <cit:CI_OnlineResource id="ID00004">
-                                            <cit:linkage>
-                                                <gco:CharacterString>http://geoengine.nga.mil</gco:CharacterString>
-                                            </cit:linkage>
-
-                                            <cit:protocol>
-                                                <gco:CharacterString>http</gco:CharacterString>
-                                            </cit:protocol>
-                                            <cit:function>
-                                                <cit:CI_OnLineFunctionCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codeList.xml#CI_OnLineFunctionCode" codeListValue="download"/>
-                                            </cit:function>
-                                        </cit:CI_OnlineResource>
-                                    </cit:onlineResource>
-                                </cit:CI_Contact>
-                            </cit:contactInfo>
-                            <cit:individual>
-                                <cit:CI_Individual>
-                                    <cit:positionName>
-                                        <gco:CharacterString>Director, NGA, ATTN:COD, MS P-37</gco:CharacterString>
-                                    </cit:positionName>
-                                </cit:CI_Individual>
-                            </cit:individual>
-                        </cit:CI_Organisation>
-                    </cit:party>
-                </cit:CI_Responsibility>
-            </mri:pointOfContact>
-            <mri:spatialRepresentationType>
-
-                <mcc:MD_SpatialRepresentationTypeCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codeList.xml#MD_SpatialRepresentationTypeCode" codeListValue="vector"/>
-            </mri:spatialRepresentationType>
-            <mri:spatialResolution>
-                <mri:MD_Resolution>
-                    <mri:equivalentScale>
-                        <mri:MD_RepresentativeFraction>
-                            <mri:denominator>
-                                <gco:Integer>1000000</gco:Integer>
-                            </mri:denominator>
-                        </mri:MD_RepresentativeFraction>
-                    </mri:equivalentScale>
-                </mri:MD_Resolution>
-            </mri:spatialResolution>
-            <mri:topicCategory>
-                <mri:MD_TopicCategoryCode>boundaries</mri:MD_TopicCategoryCode>
-            </mri:topicCategory>
-            <mri:topicCategory>
-                <mri:MD_TopicCategoryCode>elevation</mri:MD_TopicCategoryCode>
-            </mri:topicCategory>
-            <mri:topicCategory>
-                <mri:MD_TopicCategoryCode>inlandWaters</mri:MD_TopicCategoryCode>
-            </mri:topicCategory>
-            <mri:topicCategory>
-                <mri:MD_TopicCategoryCode>oceans</mri:MD_TopicCategoryCode>
-            </mri:topicCategory>
-            <mri:topicCategory>
-                <mri:MD_TopicCategoryCode>society</mri:MD_TopicCategoryCode>
-            </mri:topicCategory>
-            <mri:topicCategory>
-                <mri:MD_TopicCategoryCode>structure</mri:MD_TopicCategoryCode>
-            </mri:topicCategory>
-            <mri:topicCategory>
-                <mri:MD_TopicCategoryCode>transportation</mri:MD_TopicCategoryCode>
-            </mri:topicCategory>
-            <mri:topicCategory>
-                <mri:MD_TopicCategoryCode>utilitiesCommunication</mri:MD_TopicCategoryCode>
-            </mri:topicCategory>
-            <!-- Method one for indicating data coverage area -->
-            <!-- Use EX_GeographicBoundingBoxType to describe -->
-            <!-- the data coverage area using approximate coordinates -->
-            <!-- THIS METHOD IS MANDATORY IF THE HIERARCHY  -->
-            <!-- LEVEL OF THIS METADATA IS "DATASET" -->
-            <mri:extent>
-                <gex:EX_Extent>
-                    <gex:description>
-                        <gco:CharacterString>location description</gco:CharacterString>
-                    </gex:description>
-                    <gex:geographicElement>
-                        <gex:EX_GeographicBoundingBox>
-                            <gex:extentTypeCode>
-                                <gco:Boolean>false</gco:Boolean>
-                            </gex:extentTypeCode>
-                            <gex:westBoundLongitude>
-                                <gco:Decimal>-180.00</gco:Decimal>
-                            </gex:westBoundLongitude>
-                            <gex:eastBoundLongitude>
-                                <gco:Decimal>180.00</gco:Decimal>
-                            </gex:eastBoundLongitude>
-                            <gex:southBoundLatitude>
-                                <gco:Decimal>-90.00</gco:Decimal>
-                            </gex:southBoundLatitude>
-                            <gex:northBoundLatitude>
-                                <gco:Decimal>90.00</gco:Decimal>
-                            </gex:northBoundLatitude>
-                        </gex:EX_GeographicBoundingBox>
-                    </gex:geographicElement>
-                </gex:EX_Extent>
-            </mri:extent>
-            <!-- Method two for indicating data coverage area -->
-            <!-- Use EX_GeographicBoundingPolygonType to describe -->
-            <!-- the data coverage area using more accurate coordinates -->
-            <!-- Make sure to include the proper coordinate reference   -->
-            <!-- system information when using this method -->
-            <mri:extent>
-                <gex:EX_Extent>
-                    <gex:description>
-                        <gco:CharacterString>location description</gco:CharacterString>
-                    </gex:description>
-                    <gex:geographicElement>
-                        <gex:EX_BoundingPolygon>
-                            <gex:extentTypeCode>
-                                <gco:Boolean>false</gco:Boolean>
-                            </gex:extentTypeCode>
-                            <gex:polygon>
-                                <gml:Polygon gml:id="p1">
-                                    <gml:exterior>
-                                        <gml:LinearRing>
-                                            <gml:posList>180.000000</gml:posList>
-                                        </gml:LinearRing>
-                                    </gml:exterior>
-                                </gml:Polygon>
-                            </gex:polygon>
-                        </gex:EX_BoundingPolygon>
-                    </gex:geographicElement>
-                </gex:EX_Extent>
-            </mri:extent>
-            <mri:extent>
-                <gex:EX_Extent>
-                    <gex:description>
-                        <gco:CharacterString>temporal extent of source information</gco:CharacterString>
-                    </gex:description>
-                    <gex:temporalElement>
-                        <gex:EX_TemporalExtent>
-                            <gex:extent>
-                                <gml:TimePeriod gml:id="tp1">
-                                    <gml:begin>
-                                        <gml:TimeInstant gml:id="ti1">
-                                            <gml:timePosition>1992-04-01T00:00:00-00:00</gml:timePosition>
-                                        </gml:TimeInstant>
-                                    </gml:begin>
-                                    <gml:end>
-                                        <gml:TimeInstant gml:id="ti2">
-                                            <gml:timePosition>2002-02-23T00:00:00-00:00</gml:timePosition>
-                                        </gml:TimeInstant>
-                                    </gml:end>
-                                </gml:TimePeriod>
-                            </gex:extent>
-                        </gex:EX_TemporalExtent>
-                    </gex:temporalElement>
-                </gex:EX_Extent>
-            </mri:extent>
-            <mri:resourceFormat>
-                <mrd:MD_Format id="ID00005">
-                    <mrd:formatSpecificationCitation>
-                        <cit:CI_Citation>
-                            <cit:title>
-                                <gco:CharacterString>VPF</gco:CharacterString>
-                            </cit:title>
-                            <cit:edition>
-                                <gco:CharacterString>9606</gco:CharacterString>
-                            </cit:edition>
-                        </cit:CI_Citation>
-                    </mrd:formatSpecificationCitation>
-                </mrd:MD_Format>
-            </mri:resourceFormat>
-            <mri:resourceFormat>
-                <mrd:MD_Format id="ID00006">
-                    <mrd:formatSpecificationCitation>
-                        <cit:CI_Citation>
-                            <cit:title>
-                                <gco:CharacterString>VMap 0</gco:CharacterString>
-                            </cit:title>
-                            <cit:identifier>
-                                <mcc:MD_Identifier>
-                                    <mcc:code>
-                                        <gco:CharacterString>MIL-V-89039</gco:CharacterString>
-                                    </mcc:code>
-                                </mcc:MD_Identifier>
-                            </cit:identifier>
-                        </cit:CI_Citation>
-                    </mrd:formatSpecificationCitation>
-                    <mrd:amendmentNumber>
-                        <gco:CharacterString>Ammendment 1</gco:CharacterString>
-                    </mrd:amendmentNumber>
-                </mrd:MD_Format>
-            </mri:resourceFormat>
-        </mri:MD_DataIdentification>
-    </mdb:identificationInfo>
-    <!-- END OF IDENTIFICATION INFORMATION -->
-    <mdb:distributionInfo>
-        <mrd:MD_Distribution>
-            <mrd:distributor>
-                <mrd:MD_Distributor>
-                    <mrd:distributorContact>
-                        <cit:CI_Responsibility>
-                            <cit:role>
-                                <cit:CI_RoleCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codeList.xml#CI_RoleCode" codeListValue="distributor"/>
-                            </cit:role>
-                            <cit:party>
-                                <cit:CI_Individual>
-                                    <cit:positionName>
-                                        <gco:CharacterString>Director, NGA, ATTN:COD, MS P-37</gco:CharacterString>
-                                    </cit:positionName>
-                                </cit:CI_Individual>
-                            </cit:party>
-                            <cit:party>
-                                <cit:CI_Organisation>
-                                    <cit:name>
-                                        <gco:CharacterString>US National Geospatial-Intelligence
-                                Agency</gco:CharacterString>
-                                    </cit:name>
-                                    <cit:contactInfo>
-                                        <cit:CI_Contact>
-                                            <cit:phone>
-                                                <cit:CI_Telephone>
-                                                  <cit:number>
-                                                  <gco:CharacterString>555-555-5555</gco:CharacterString>
-                                                  </cit:number>
-                                                  <cit:numberType>
-                                                  <cit:CI_TelephoneTypeCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codeList.xml#CI_TelephoneTypeCode" codeListValue="office"/>
-                                                  </cit:numberType>
-                                                </cit:CI_Telephone>
-                                            </cit:phone>
-                                            <cit:address xlink:href="#ID00003"/>
-                                        </cit:CI_Contact>
-                                    </cit:contactInfo>
-                                </cit:CI_Organisation>
-                            </cit:party>
-                        </cit:CI_Responsibility>
-                    </mrd:distributorContact>
-                    <mrd:distributorFormat>
-                        <mrd:MD_Format>
-                            <mrd:formatSpecificationCitation>
-                                <cit:CI_Citation>
-                                    <cit:title>
-                                        <gco:CharacterString>gzip</gco:CharacterString>
-                                    </cit:title>
-                                    <cit:alternateTitle>
-                                        <gco:CharacterString>GNU RFC 1952</gco:CharacterString>
-                                    </cit:alternateTitle>
-                                </cit:CI_Citation>
-                            </mrd:formatSpecificationCitation>
-                            <mrd:amendmentNumber>
-                                <gco:CharacterString>1.2.4</gco:CharacterString>
-                            </mrd:amendmentNumber>
-                        </mrd:MD_Format>
-                    </mrd:distributorFormat>
-                    <mrd:distributorTransferOptions>
-                        <mrd:MD_DigitalTransferOptions>
-                            <mrd:onLine>
-                                <cit:CI_OnlineResource>
-                                    <cit:linkage>
-                                        <gco:CharacterString>http://geoengine.nga.mil/ftpdir/archive/vpf_data/v0noa.tar.gz</gco:CharacterString>
-                                    </cit:linkage>
-                                    <cit:function>
-                                        <cit:CI_OnLineFunctionCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codeList.xml#CI_OnLineFunctionCode" codeListValue="download"/>
-                                    </cit:function>
-                                </cit:CI_OnlineResource>
-                            </mrd:onLine>
-                            <mrd:onLine>
-                                <cit:CI_OnlineResource>
-                                    <cit:linkage>
-                                        <gco:CharacterString>http://geoengine.nga.mil/ftpdir/archive/vpf_data/v0sas.tar.gz</gco:CharacterString>
-                                    </cit:linkage>
-                                    <cit:function>
-                                        <cit:CI_OnLineFunctionCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codeList.xml#CI_OnLineFunctionCode" codeListValue="download"/>
-                                    </cit:function>
-                                </cit:CI_OnlineResource>
-                            </mrd:onLine>
-                            <mrd:onLine>
-                                <cit:CI_OnlineResource>
-                                    <cit:linkage>
-                                        <gco:CharacterString>http://geoengine.nga.mil/ftpdir/archive/vpf_data/v0soa.tar.gz</gco:CharacterString>
-                                    </cit:linkage>
-                                    <cit:function>
-                                        <cit:CI_OnLineFunctionCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codeList.xml#CI_OnLineFunctionCode" codeListValue="download"/>
-                                    </cit:function>
-                                </cit:CI_OnlineResource>
-                            </mrd:onLine>
-                        </mrd:MD_DigitalTransferOptions>
-                    </mrd:distributorTransferOptions>
-                </mrd:MD_Distributor>
-            </mrd:distributor>
-            <!-- CD-Ordering for Military Customers -->
-            <mrd:distributor>
-                <mrd:MD_Distributor>
-                    <mrd:distributorContact>
-                        <cit:CI_Responsibility>
-                            <cit:role>
-                                <cit:CI_RoleCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codeList.xml#CI_RoleCode" codeListValue="distributor"/>
-                            </cit:role>
-                            <cit:party>
-                                <cit:CI_Individual>
-                                    <cit:name>
-                                        <gco:CharacterString>Defense Supply Center Rich-mond
-                                (DLA)</gco:CharacterString>
-                                    </cit:name>
-                                    <cit:contactInfo>
-                                        <cit:CI_Contact id="ID00007">
-                                            <cit:phone gco:nilReason="missing"/>
-                                            <cit:address>
-                                                <cit:CI_Address id="ID00008">
-                                                  <cit:deliveryPoint>
-                                                  <gco:CharacterString>8000 Jefferson Davis
-                                                Hwy</gco:CharacterString>
-                                                  </cit:deliveryPoint>
-                                                  <cit:city>
-                                                  <gco:CharacterString>Richmond</gco:CharacterString>
-                                                  </cit:city>
-                                                  <cit:administrativeArea>
-                                                  <gco:CharacterString>VA</gco:CharacterString>
-                                                  </cit:administrativeArea>
-                                                  <cit:postalCode>
-                                                  <gco:CharacterString>23297</gco:CharacterString>
-                                                  </cit:postalCode>
-                                                  <cit:country>
-                                                  <gco:CharacterString>United
-                                                States</gco:CharacterString>
-                                                  </cit:country>
-                                                </cit:CI_Address>
-                                            </cit:address>
-                                            <cit:onlineResource>
-                                                <cit:CI_OnlineResource>
-                                                  <cit:linkage>
-                                                  <gco:CharacterString>http://www.dscr.dla.mil/pc9</gco:CharacterString>
-                                                  </cit:linkage>
-                                                  <cit:function>
-                                                  <cit:CI_OnLineFunctionCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codeList.xml#CI_OnLineFunctionCode" codeListValue="order"/>
-                                                  </cit:function>
-                                                </cit:CI_OnlineResource>
-                                            </cit:onlineResource>
-                                        </cit:CI_Contact>
-                                    </cit:contactInfo>
-                                </cit:CI_Individual>
-                            </cit:party>
-                        </cit:CI_Responsibility>
-                    </mrd:distributorContact>
-                    <mrd:distributorFormat>
-                        <mrd:MD_Format>
-                            <mrd:formatSpecificationCitation>
-                                <cit:CI_Citation>
-                                    <cit:title>
-                                        <gco:CharacterString>VPF</gco:CharacterString>
-                                    </cit:title>
-                                    <cit:identifier>
-                                        <mcc:MD_Identifier>
-                                            <mcc:code>
-                                                <gco:CharacterString>MIL-STD-2407</gco:CharacterString>
-                                            </mcc:code>
-                                        </mcc:MD_Identifier>
-                                    </cit:identifier>
-                                </cit:CI_Citation>
-                            </mrd:formatSpecificationCitation>
-                            <mrd:amendmentNumber>
-                                <gco:CharacterString>9606</gco:CharacterString>
-                            </mrd:amendmentNumber>
-                        </mrd:MD_Format>
-                    </mrd:distributorFormat>
-                    <mrd:distributorTransferOptions>
-                        <mrd:MD_DigitalTransferOptions>
-                            <mrd:offLine>
-                                <mrd:MD_Medium>
-                                    <mrd:name>
-                                        <cit:CI_Citation>
-                                            <cit:title>
-                                                <gco:CharacterString>cdROM</gco:CharacterString>
-                                            </cit:title>
-                                        </cit:CI_Citation>
-                                    </mrd:name>
-                                    <mrd:volumes>
-                                        <gco:Integer>4</gco:Integer>
-                                    </mrd:volumes>
-                                    <mrd:mediumFormat>
-                                        <mrd:MD_MediumFormatCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codeList.xml#MD_MediumFormatCode" codeListValue="iso9660"/>
-                                    </mrd:mediumFormat>
-                                </mrd:MD_Medium>
-                            </mrd:offLine>
-                        </mrd:MD_DigitalTransferOptions>
-                    </mrd:distributorTransferOptions>
-                </mrd:MD_Distributor>
-            </mrd:distributor>
-        </mrd:MD_Distribution>
-    </mdb:distributionInfo>
-    <!-- DATA QUALITY AND LINEAGE (No XML schema yet, can't validate this part, so is com-mented out…-->
-    <mdb:dataQualityInfo>
-        <mdq:DQ_DataQuality>
-            <mdq:scope>
-                <mcc:MD_Scope>
-                    <mcc:level>
-                        <mcc:MD_ScopeCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codeList.xml#MD_ScopeCode" codeListValue="dataset"/>
-                    </mcc:level>
-                </mcc:MD_Scope>
-            </mdq:scope>
-            <mdq:report>
-                <mdq:DQ_DomainConsistency>
-                    <mdq:measure>
-                        <mdq:DQ_MeasureReference>
-                            <mdq:nameOfMeasure>
-                                <gco:CharacterString>Attribute Completeness Percentage</gco:CharacterString>
-                            </mdq:nameOfMeasure>
-                        </mdq:DQ_MeasureReference>
-                    </mdq:measure>
-                    <mdq:result>
-                        <mdq:DQ_ConformanceResult>
-                            <mdq:specification>
-                                <cit:CI_Citation>
-                                    <cit:title>
-                                        <gco:CharacterString>MIL-V-89039</gco:CharacterString>
-                                    </cit:title>
-                                    <cit:date>
-                                        <cit:CI_Date>
-                                            <cit:date>
-
-                                                <gco:DateTime>1995-02-09T00:00:00Z</gco:DateTime>
-                                            </cit:date>
-                                            <cit:dateType>
-                                                <cit:CI_DateTypeCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codeList.xml#CI_DateTypeCode" codeListValue="creation"/>
-                                            </cit:dateType>
-                                        </cit:CI_Date>
-                                    </cit:date>
-                                </cit:CI_Citation>
-                            </mdq:specification>
-                            <mdq:explanation>
-                                <gco:CharacterString>All features in this library have valid
-                                    attribute codes assigned to them in accordance with this
-                                    specification</gco:CharacterString>
-                            </mdq:explanation>
-                            <mdq:pass>
-                                <gco:Boolean>true</gco:Boolean>
-                            </mdq:pass>
-                        </mdq:DQ_ConformanceResult>
-                    </mdq:result>
-                </mdq:DQ_DomainConsistency>
-            </mdq:report>
-        </mdq:DQ_DataQuality>
-    </mdb:dataQualityInfo>
-    <mdb:resourceLineage>
-        <mrl:LI_Lineage>
-            <mrl:statement>
-                <gco:CharacterString>HISTORICAL BACKGROUND - While the fifth edition of NOAMER has evolved from previous digital version, the majority of the feature content is based on the National Imagery and Mapping Agency's  (NIMA) hardcopy Operational Navigational Chart (ONC) series. The initial digital version of VMap0 was the Digital Chart of the World and was NIMA's first Vector Product Format (VPF) product. The DCW was released in 1992. With the ongoing development of the VPF Military Standard and the advent of the VMap0 product specification, a new version of the database was needed. VMap 0 library, NOAMER, Edition 4 was released in 1997.</gco:CharacterString>
-            </mrl:statement>
-        </mrl:LI_Lineage>
-    </mdb:resourceLineage>
-    <!-- END OF DATA QUALITY & LINEAGE -->
-
-    <!-- CONSTRAINTS -->
-    <mdb:metadataConstraints>
-        <mco:MD_SecurityConstraints>
-            <mco:classification>
-                <mco:MD_ClassificationCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codeList.xml#MD_ClassificationCode" codeListValue="unclassified"/>
-            </mco:classification>
-            <mco:handlingDescription>
-                <gco:CharacterString>RELEASABILITY - unrestricted</gco:CharacterString>
-            </mco:handlingDescription>
-        </mco:MD_SecurityConstraints>
-    </mdb:metadataConstraints>
-    <!-- END OF CONSTRAINTS -->
-
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mds/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mds/1.0/index.html
deleted file mode 100644
index d272d8e41..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mds/1.0/index.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Metadata for Data and Services (MDS) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Metadata for Data and Services (MDS) Version: 1.0</h1><img src="mds.png"><h2>Description</h2>
-      <p>MDS 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.2.  It includes this namespace contains all classes needed for a complete metadata record for any
-         resource. It is used for metadata records that do not include geospatial common extensions
-         (gex), extenbsions to the schema (mex), data series (DS_*) elements (mda) or metadata
-         for data transfer (mdt). The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>Sample XML files for mds 1.0</h2><a href="AppendixD.2VectorSmartMapExample.xml">AppendixD.2VectorSmartMapExample.xml</a> <a href="instance1.xml">instance1.xml</a> <a href="mds.xml">mds.xml</a> 
-      <h2>XML Namespace for mds 1.0</h2>
-      <p>The namespace URI for mds 1.0 is <b>http://standards.iso.org/iso/19115/-3/mds/1.0</b>.
-      </p>
-      <h2>XML Schema for mds 1.0</h2>
-      <p><b><a href="mds.xsd">mds.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the mds 1.0 namespace or by XML Schema documents importing the mds 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the mds namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for mds 1.0 are available <a href="mds.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for mds 1.0</h2>
-      <p><b><a href="metadataDataServices.xsd">metadataDataServices.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.2. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): 
-      </p>
-      <h2>Related XML Namespaces for mds 1.0</h2> The mds 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Feature Catalog Common</td>
-            <td>fcc</td>
-            <td><a href="http://standards.iso.org/iso/19110/fcc/1.0">http://standards.iso.org/iso/19110/fcc/1.0</a></td>
-            <td>../../../../19110/fcc/1.0/fcc.xsd</td>
-         </tr>
-         <tr>
-            <td>Geospatial EXtent</td>
-            <td>gex</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gex/1.0">http://standards.iso.org/iso/19115/-3/gex/1.0</a></td>
-            <td>../../../../19115/-3/gex/1.0/gex.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata for Acquisition</td>
-            <td>mac</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mac/1.0">http://standards.iso.org/iso/19115/-3/mac/1.0</a></td>
-            <td>../../../../19115/-3/mac/1.0/mac.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata for Application Schema</td>
-            <td>mas</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mas/1.0">http://standards.iso.org/iso/19115/-3/mas/1.0</a></td>
-            <td>../../../../19115/-3/mas/1.0/mas.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata for Constraints</td>
-            <td>mco</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mco/1.0">http://standards.iso.org/iso/19115/-3/mco/1.0</a></td>
-            <td>../../../../19115/-3/mco/1.0/mco.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata Base</td>
-            <td>mdb</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mdb/1.0">http://standards.iso.org/iso/19115/-3/mdb/1.0</a></td>
-            <td>../../../../19115/-3/mdb/1.0/mdb.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata for Data Quality</td>
-            <td>mdq</td>
-            <td><a href="http://standards.iso.org/iso/19157/-2/mdq/1.0">http://standards.iso.org/iso/19157/-2/mdq/1.0</a></td>
-            <td>../../../../19157/-2/mdq/1.0/mdq.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata for Maintenance Information</td>
-            <td>mmi</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mmi/1.0">http://standards.iso.org/iso/19115/-3/mmi/1.0</a></td>
-            <td>../../../../19115/-3/mmi/1.0/mmi.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata for Portrayal Catalog</td>
-            <td>mpc</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mpc/1.0">http://standards.iso.org/iso/19115/-3/mpc/1.0</a></td>
-            <td>../../../../19115/-3/mpc/1.0/mpc.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata for Resource Content</td>
-            <td>mrc</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mrc/1.0">http://standards.iso.org/iso/19115/-3/mrc/1.0</a></td>
-            <td>../../../../19115/-3/mrc/1.0/mrc.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata for Resource Distribution</td>
-            <td>mrd</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mrd/1.0">http://standards.iso.org/iso/19115/-3/mrd/1.0</a></td>
-            <td>../../../../19115/-3/mrd/1.0/mrd.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata for Resource Lineage</td>
-            <td>mrl</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mrl/1.0">http://standards.iso.org/iso/19115/-3/mrl/1.0</a></td>
-            <td>../../../../19115/-3/mrl/1.0/mrl.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata for Reference System</td>
-            <td>mrs</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mrs/1.0">http://standards.iso.org/iso/19115/-3/mrs/1.0</a></td>
-            <td>../../../../19115/-3/mrs/1.0/mrs.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata for Spatial Representation</td>
-            <td>msr</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/msr/1.0">http://standards.iso.org/iso/19115/-3/msr/1.0</a></td>
-            <td>../../../../19115/-3/msr/1.0/msr.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata for Services</td>
-            <td>srv</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/srv/2.0">http://standards.iso.org/iso/19115/-3/srv/2.0</a></td>
-            <td>../../../../19115/-3/srv/2.0/srv.xsd</td>
-         </tr>
-      </table>
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mds/1.0/mds.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mds/1.0/mds.png
deleted file mode 100644
index b7ca849fa..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mds/1.0/mds.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mds/1.0/mds.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mds/1.0/mds.xml
deleted file mode 100644
index 9e29dbfe8..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mds/1.0/mds.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mds/1.0 mds.xsd"
-   xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0"
-   xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
-   xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0"
-   xmlns:mac="http://standards.iso.org/iso/19115/-3/mac/1.0"
-   xmlns:mas="http://standards.iso.org/iso/19115/-3/mas/1.0"
-   xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0"
-   xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0"
-   xmlns:mco="http://standards.iso.org/iso/19115/-3/mco/1.0"
-   xmlns:mdq="http://standards.iso.org/iso/19157/-2/mdq/1.0"
-   xmlns:mmi="http://standards.iso.org/iso/19115/-3/mmi/1.0"
-   xmlns:mpc="http://standards.iso.org/iso/19115/-3/mpc/1.0"
-   xmlns:mrc="http://standards.iso.org/iso/19115/-3/mrc/1.0"
-   xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0"
-   xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0"
-   xmlns:mrl="http://standards.iso.org/iso/19115/-3/mrl/1.0"
-   xmlns:mrs="http://standards.iso.org/iso/19115/-3/mrs/1.0"
-   xmlns:msr="http://standards.iso.org/iso/19115/-3/msr/1.0">
-   <!-- 
-   This is a sample metadata record for the complete metadata conformance class.
-   It contains required elements from the mdb, mcc (cit, gco), lan, mri,
-   mas, mco, mrl, gex, mrc, mrd, mpc, msr and srv namespaces.
-   
-   This sample includes optional elements of MD_Metadata that are included in
-   the mds namespace and required elements within them. More detailed examples
-   are available in the namespace directories.
-   -->
-   <mdb:metadataIdentifier>
-      <mcc:MD_Identifier>
-         <mcc:code/>
-      </mcc:MD_Identifier>
-   </mdb:metadataIdentifier>
-   <mdb:defaultLocale>
-      <lan:PT_Locale>
-         <lan:language/>
-         <lan:characterEncoding/>
-      </lan:PT_Locale>
-   </mdb:defaultLocale>
-   <mdb:parentMetadata>
-      <cit:CI_Citation>
-         <cit:title/>
-      </cit:CI_Citation>
-   </mdb:parentMetadata>
-   <mdb:metadataScope>
-      <mdb:MD_MetadataScope>
-         <mdb:resourceScope/>
-      </mdb:MD_MetadataScope>
-   </mdb:metadataScope>
-   <mdb:contact>
-      <cit:CI_Responsibility>
-         <cit:role>
-            <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="pointOfContact">pointOfContact</cit:CI_RoleCode>
-         </cit:role>
-         <cit:party>
-            <cit:CI_Organisation>
-               <cit:name>
-                  <gco:CharacterString>Organisation Name</gco:CharacterString>
-               </cit:name>
-            </cit:CI_Organisation>
-         </cit:party>
-      </cit:CI_Responsibility>
-   </mdb:contact>
-   <mdb:dateInfo>
-      <cit:CI_Date>
-         <cit:date>
-            <gco:DateTime>2014-04-03T16:00:00</gco:DateTime>
-         </cit:date>
-         <cit:dateType>
-            <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode" codeListValue="creation">creation</cit:CI_DateTypeCode>
-         </cit:dateType>
-      </cit:CI_Date>
-   </mdb:dateInfo>
-   <mdb:metadataStandard>
-      <cit:CI_Citation>
-         <cit:title/>
-      </cit:CI_Citation>
-   </mdb:metadataStandard>
-   <mdb:metadataProfile>
-      <cit:CI_Citation>
-         <cit:title/>
-      </cit:CI_Citation>
-   </mdb:metadataProfile>
-   <mdb:alternativeMetadataReference>
-      <cit:CI_Citation>
-         <cit:title/>
-      </cit:CI_Citation>
-   </mdb:alternativeMetadataReference>
-   <mdb:otherLocale>
-      <lan:PT_Locale>
-         <lan:language/>
-         <lan:characterEncoding/>
-      </lan:PT_Locale>
-   </mdb:otherLocale>
-   <mdb:metadataLinkage>
-      <cit:CI_OnlineResource>
-         <cit:linkage/>
-      </cit:CI_OnlineResource>
-   </mdb:metadataLinkage>
-   <mdb:spatialRepresentationInfo>
-      <msr:MD_GridSpatialRepresentation>
-         <msr:numberOfDimensions/>
-         <msr:cellGeometry/>
-         <msr:transformationParameterAvailability/>
-      </msr:MD_GridSpatialRepresentation>
-   </mdb:spatialRepresentationInfo>
-   <mdb:referenceSystemInfo>
-      <mrs:MD_ReferenceSystem/>
-   </mdb:referenceSystemInfo>
-   <mdb:identificationInfo>
-      <mri:MD_DataIdentification>
-         <mri:citation>
-            <cit:CI_Citation>
-               <cit:title>
-                  <gco:CharacterString>Sample Metadata for Minimal Conformance Class</gco:CharacterString>
-               </cit:title>
-            </cit:CI_Citation>
-         </mri:citation>
-         <mri:abstract>
-            <gco:CharacterString>This sample record has all required elements for minimal ISO 19115:2013 metadata</gco:CharacterString>
-         </mri:abstract>
-      </mri:MD_DataIdentification>
-   </mdb:identificationInfo>
-   <mdb:contentInfo>
-      <mrc:MD_CoverageDescription>
-         <mrc:attributeDescription>
-            <gco:RecordType/>
-         </mrc:attributeDescription>
-      </mrc:MD_CoverageDescription>
-   </mdb:contentInfo>
-   <mdb:distributionInfo>
-      <mrd:MD_Distribution/>
-   </mdb:distributionInfo>
-   <mdb:dataQualityInfo>
-      <mdq:DQ_DataQuality>
-         <mdq:scope/>
-         <mdq:report/>
-      </mdq:DQ_DataQuality>
-   </mdb:dataQualityInfo>
-   <mdb:resourceLineage>
-      <mrl:LI_Lineage/>
-   </mdb:resourceLineage>
-   <mdb:portrayalCatalogueInfo>
-      <mpc:MD_PortrayalCatalogueReference>
-         <mpc:portrayalCatalogueCitation/>
-      </mpc:MD_PortrayalCatalogueReference>
-   </mdb:portrayalCatalogueInfo>
-   <mdb:metadataConstraints>
-      <mco:MD_Constraints/>
-   </mdb:metadataConstraints>
-   <mdb:applicationSchemaInfo>
-      <mas:MD_ApplicationSchemaInformation>
-         <mas:name/>
-         <mas:schemaLanguage/>
-         <mas:constraintLanguage/>
-      </mas:MD_ApplicationSchemaInformation>
-   </mdb:applicationSchemaInfo>
-   <mdb:metadataMaintenance>
-      <mmi:MD_MaintenanceInformation/>
-   </mdb:metadataMaintenance>
-   <mdb:acquisitionInformation>
-      <mac:MI_AcquisitionInformation/>
-   </mdb:acquisitionInformation>
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mds/1.0/mds.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mds/1.0/mds.xsd
deleted file mode 100644
index 42284aa8c..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mds/1.0/mds.xsd
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:fcc="http://standards.iso.org/iso/19110/fcc/1.0" xmlns:gex="http://standards.iso.org/iso/19115/-3/gex/1.0" xmlns:mac="http://standards.iso.org/iso/19115/-3/mac/1.0" xmlns:mas="http://standards.iso.org/iso/19115/-3/mas/1.0" xmlns:mco="http://standards.iso.org/iso/19115/-3/mco/1.0" xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0" xmlns:mdq="http://standards.iso.org/iso/19157/-2/mdq/1.0" xmlns:mds="http://standards.iso.org/iso/19115/-3/mds/1.0" xmlns:mmi="http://standards.iso.org/iso/19115/-3/mmi/1.0" xmlns:mpc="http://standards.iso.org/iso/19115/-3/mpc/1.0" xmlns:mrc="http://standards.iso.org/iso/19115/-3/mrc/1.0" xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0" xmlns:mrl="http://standards.iso.org/iso/19115/-3/mrl/1.0" xmlns:mrs="http://standards.iso.org/iso/19115/-3/mrs/1.0" xmlns:msr="http://standards.iso.org/iso/19115/-3/msr/1.0" xmlns:srv="http://standards.iso.org/iso/19115/-3/srv/2.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mds/1.0" version="1.0">
-  <annotation>
-    <documentation>Namespace &lt;font color="#1f497d"&gt;that imports all necessary namespaces to implement a complete metadata record for a dataset or service, not including extended data types or user-defined extensions. &lt;/font&gt;Wrapper namespace to support Catalog Service implementations.</documentation>
-  </annotation>
-  <include schemaLocation="metadataDataServices.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19110/fcc/1.0" schemaLocation="../../../../19110/fcc/1.0/fcc.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gex/1.0" schemaLocation="../../../../19115/-3/gex/1.0/gex.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mac/1.0" schemaLocation="../../../../19115/-3/mac/1.0/mac.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mas/1.0" schemaLocation="../../../../19115/-3/mas/1.0/mas.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mco/1.0" schemaLocation="../../../../19115/-3/mco/1.0/mco.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mdb/1.0" schemaLocation="../../../../19115/-3/mdb/1.0/mdb.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19157/-2/mdq/1.0" schemaLocation="../../../../19157/-2/mdq/1.0/mdq.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mmi/1.0" schemaLocation="../../../../19115/-3/mmi/1.0/mmi.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mpc/1.0" schemaLocation="../../../../19115/-3/mpc/1.0/mpc.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mrc/1.0" schemaLocation="../../../../19115/-3/mrc/1.0/mrc.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mrd/1.0" schemaLocation="../../../../19115/-3/mrd/1.0/mrd.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mrl/1.0" schemaLocation="../../../../19115/-3/mrl/1.0/mrl.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mrs/1.0" schemaLocation="../../../../19115/-3/mrs/1.0/mrs.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/msr/1.0" schemaLocation="../../../../19115/-3/msr/1.0/msr.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/srv/2.0" schemaLocation="../../../../19115/-3/srv/2.0/srv.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mds/1.0/mds.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mds/1.0/mds.zip
deleted file mode 100644
index 4dca4f5f8..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mds/1.0/mds.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mds/1.0/metadataDataServices.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mds/1.0/metadataDataServices.xsd
deleted file mode 100644
index 81c29c15e..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mds/1.0/metadataDataServices.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:mds="http://standards.iso.org/iso/19115/-3/mds/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mds/1.0" version="1.0">
-  <include schemaLocation="mds.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/codelists.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/codelists.html
deleted file mode 100644
index 2151318f0..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/codelists.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0" xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>
-         Codelists from the Metadata for Data Transfer (mdt) Namespace
-         
-      </title>
-   </head>
-   <body><a name="top"></a><h1>ISO 19115-3 Codelist Report</h1>
-      <h2>
-         Codelists from the Metadata for Data Transfer (mdt) Namespace
-         
-      </h2>
-      <table>
-         <tr><b>
-               <td>Scope</td></b><td>
-               Codelists from the Metadata for Data Transfer (mdt) Namespace
-               
-            </td>
-         </tr>
-         <tr><b>
-               <td>Field of Application</td></b><td>
-               ISO TC211 Metadata Standards
-               
-            </td>
-         </tr>
-         <tr><b>
-               <td>Version (Date)</td></b><td>
-               1.0
-                ()
-            </td>
-         </tr>
-      </table>
-      <h2>
-         MX_ScopeCode
-          (
-         MX_ScopeCode
-         ):
-      </h2><b>Description: </b>
-      class of information to which the referencing entity applies
-      
-      <table width="95%" border="1" cellpadding="2" cellspacing="2">
-         <tr>
-            <th valign="top">Entry</th>
-            <th valign="top">Definition</th>
-         </tr>
-         <tr>
-            <td valign="top">
-               MX_ScopeCode_initiative
-               
-            </td>
-            <td valign="top">
-               The referencing entity applies to a transfer aggregate which was originally identified
-               as an initiative (DS_Initiative)
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MX_ScopeCode_stereoMate
-               
-            </td>
-            <td valign="top">
-               The referencing entity applies to a transfer aggregate which was originally identified
-               as a stereo mate (DS_StereoMate)
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MX_ScopeCode_sensor
-               
-            </td>
-            <td valign="top">
-               The referencing entity applies to a transfer aggregate which was originally identified
-               as a sensor (DS_Sensor)
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MX_ScopeCode_platformSeries
-               
-            </td>
-            <td valign="top">
-               The referencing entity applies to a transfer aggregate which was originally identified
-               as a platform series (DS_PlatformSeries)
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MX_ScopeCode_sensorSeries
-               
-            </td>
-            <td valign="top">
-               The referencing entity applies to a transfer aggregate which was originally identified
-               as a sensor series (DS_SensorSeries)
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MX_ScopeCode_productionSeries
-               
-            </td>
-            <td valign="top">
-               The referencing entity applies to a transfer aggregate which was originally identified
-               as a sensor series (DS_SensorSeries)
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MX_ScopeCode_transferAggregate
-               
-            </td>
-            <td valign="top">
-               The referencing entity applies to a transfer aggregate which has no existence outside
-               of the transfer context
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MX_ScopeCode_otherAggregate
-               
-            </td>
-            <td valign="top">
-               The referencing entity applies to a transfer aggregate which has an existence
-               outside of the transfer context, but which does not pertains to a specific aggregate
-               type.
-               
-            </td>
-         </tr>
-      </table><a href="#top">top</a><hr/><i>Stylesheet: CT_CodelistHTML.xsl Version: 2015-04-17</i></body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/codelists.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/codelists.xml
deleted file mode 100644
index 5d12a96ba..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/codelists.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cat:CT_CodelistCatalogue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/cat/1.0 ../../../-3/cat/1.0/cat.xsd"
- xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0"
- xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:gml="http://www.opengis.net/gml/3.2">
-   <!--=====Catalogue description=====-->
-   <cat:name>
-      <gco:CharacterString>Codelists from the Metadata for Data Transfer (mdt) Namespace</gco:CharacterString>
-   </cat:name>
-   <cat:scope>
-      <gco:CharacterString>Codelists from the Metadata for Data Transfer (mdt) Namespace</gco:CharacterString>
-   </cat:scope>
-   <cat:fieldOfApplication>
-      <gco:CharacterString>ISO TC211 Metadata Standards</gco:CharacterString>
-   </cat:fieldOfApplication>
-   <cat:versionNumber>
-      <gco:CharacterString>1.0</gco:CharacterString>
-   </cat:versionNumber>
-   <cat:versionDate>
-      <gco:Date>2015-04-18</gco:Date>
-   </cat:versionDate>
-   <cat:locale>
-      <lan:PT_Locale>
-         <lan:language>
-            <lan:LanguageCode codeList="standards.iso.org/19115/-3/lan/1.0/codelists.xml#LanguageCode" codeListValue="eng">eng</lan:LanguageCode>
-         </lan:language>
-         <lan:characterEncoding>
-            <lan:MD_CharacterSetCode codeList="standards.iso.org/19115/-3/lan/1.0/codelists.xml#MD_CharacterSetCode" codeListValue="UTF-8">UTF-8</lan:MD_CharacterSetCode>
-         </lan:characterEncoding>
-      </lan:PT_Locale>
-   </cat:locale>
-   <!--============================= Codelists =======================================-->
-   <!-- MX_ScopeCode  -->
-   <cat:codelistItem>
-      <cat:CT_Codelist id="MX_ScopeCode">
-         <cat:identifier>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MX_ScopeCode</gco:ScopedName>
-         </cat:identifier>
-         <cat:name>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MX_ScopeCode</gco:ScopedName>
-         </cat:name>
-         <cat:definition>
-            <gco:CharacterString>class of information to which the referencing entity applies</gco:CharacterString>
-         </cat:definition>
-         <cat:description>
-            <gco:CharacterString>class of information to which the referencing entity applies</gco:CharacterString>
-         </cat:description>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MX_ScopeCode_initiative">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MX_ScopeCode_initiative</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>The referencing entity applies to a transfer aggregate which was originally identified as an initiative (DS_Initiative)</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MX_ScopeCode_stereoMate">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MX_ScopeCode_stereoMate</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>The referencing entity applies to a transfer aggregate which was originally identified as a stereo mate (DS_StereoMate)</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MX_ScopeCode_sensor">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MX_ScopeCode_sensor</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>The referencing entity applies to a transfer aggregate which was originally identified as a sensor (DS_Sensor)</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MX_ScopeCode_platformSeries">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MX_ScopeCode_platformSeries</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>The referencing entity applies to a transfer aggregate which was originally identified as a platform series (DS_PlatformSeries)</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MX_ScopeCode_sensorSeries">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MX_ScopeCode_sensorSeries</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>The referencing entity applies to a transfer aggregate which was originally identified as a sensor series (DS_SensorSeries)</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MX_ScopeCode_productionSeries">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MX_ScopeCode_productionSeries</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>The referencing entity applies to a transfer aggregate which was originally identified as a sensor series (DS_SensorSeries)</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MX_ScopeCode_transferAggregate">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MX_ScopeCode_transferAggregate</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>The referencing entity applies to a transfer aggregate which has no existence outside of the transfer context</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MX_ScopeCode_otherAggregate">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MX_ScopeCode_otherAggregate</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>The referencing entity applies to a transfer aggregate which has an existence
-                     outside of the transfer context, but which does not pertains to a specific aggregate
-                     type.</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-       </cat:CT_Codelist>
-   </cat:codelistItem>
-   <!--=== EOF ===-->
-</cat:CT_CodelistCatalogue>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/index.html
deleted file mode 100644
index d5c460c5e..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/index.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Metadata for Data Transfer (MDT) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Metadata for Data Transfer (MDT) Version: 1.0</h1><img src="mdt.png"><h2>Description</h2>
-      <p>MDT 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 7.4.2,
-         7.4.3.  It includes this namespace contains all classes needed for a complete metadata record for any
-         resource and enables the description of data transfer (MX_*) elements. This is the
-         most inclusive of the ISO 19115-3 namespaces so it should be used in situations where
-         all 19115-3 capabilities are required. The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>Sample XML files for mdt 1.0</h2><a href="mdt.xml">mdt.xml</a> 
-      <h2>CodeLists for mdt 1.0</h2><a href="codelists.html">codelists.html</a> <a href="codelists.xml">codelists.xml</a> 
-      <h2>XML Namespace for mdt 1.0</h2>
-      <p>The namespace URI for mdt 1.0 is <b>http://standards.iso.org/iso/19115/-3/mdt/1.0</b>.
-      </p>
-      <h2>XML Schema for mdt 1.0</h2>
-      <p><b><a href="mdt.xsd">mdt.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the mdt 1.0 namespace or by XML Schema documents importing the mdt 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the mdt namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for mdt 1.0 are available <a href="mdt.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for mdt 1.0</h2>
-      <p><b><a href="metadataTransfer.xsd">metadataTransfer.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 7.4.2,
-         7.4.3. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): MX_Aggregate, MX_DataFile, MX_DataSet, AbstractMX_File, <b>MX_ScopeCode</b>, and MX_SupportFile
-      </p>
-      <h2>Related XML Namespaces for mdt 1.0</h2> The mdt 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>CATalogue</td>
-            <td>cat</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/cat/1.0">http://standards.iso.org/iso/19115/-3/cat/1.0</a></td>
-            <td>../../../../19115/-3/cat/1.0/cat.xsd</td>
-         </tr>
-         <tr>
-            <td>Geographic COmmon</td>
-            <td>gco</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gco/1.0">http://standards.iso.org/iso/19115/-3/gco/1.0</a></td>
-            <td>../../../../19115/-3/gco/1.0/gco.xsd</td>
-         </tr>
-         <tr>
-            <td>Geospatial Common eXtension</td>
-            <td>gcx</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gcx/1.0">http://standards.iso.org/iso/19115/-3/gcx/1.0</a></td>
-            <td>../../../../19115/-3/gcx/1.0/gcx.xsd</td>
-         </tr>
-         <tr>
-            <td>MetaData Application</td>
-            <td>mda</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mda/1.0">http://standards.iso.org/iso/19115/-3/mda/1.0</a></td>
-            <td>../../../../19115/-3/mda/1.0/mda.xsd</td>
-         </tr>
-      </table>
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/mdt.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/mdt.png
deleted file mode 100644
index be283169b..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/mdt.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/mdt.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/mdt.xml
deleted file mode 100644
index a53598484..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/mdt.xml
+++ /dev/null
@@ -1,3903 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mdb/1.0 ../../../ISO%20TC211%20XMG/standards.iso.org/19115/-3/mdt/1.0/metadataTransfer.xsd"
- xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0"
- xmlns:mrl="http://standards.iso.org/iso/19115/-3/mrl/1.0"
- xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0"
- xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0"
- xmlns:mpc="http://standards.iso.org/iso/19115/-3/mpc/1.0"
- xmlns:srv="http://standards.iso.org/iso/19115/-3/srv/2.0"
- xmlns:mac="http://standards.iso.org/iso/19115/-3/mac/1.0"
- xmlns:mrs="http://standards.iso.org/iso/19115/-3/mrs/1.0"
- xmlns:mco="http://standards.iso.org/iso/19115/-3/mco/1.0"
- xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0"
- xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0"
- xmlns:mas="http://standards.iso.org/iso/19115/-3/mas/1.0"
- xmlns:mda="http://standards.iso.org/iso/19115/-3/mda/1.0"
- xmlns:msr="http://standards.iso.org/iso/19115/-3/msr/1.0"
- xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0"
- xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
- xmlns:gex="http://standards.iso.org/iso/19115/-3/gex/1.0"
- xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0"
- xmlns:mex="http://standards.iso.org/iso/19115/-3/mex/1.0"
- xmlns:mdq="http://standards.iso.org/iso/19157/-2/mdq/1.0"
- xmlns:mmi="http://standards.iso.org/iso/19115/-3/mmi/1.0"
- xmlns:mdt="http://standards.iso.org/iso/19115/-3/mdt/1.0"
- xmlns:mds="http://standards.iso.org/iso/19115/-3/mds/1.0"
- xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2"
- xmlns:mrc="http://standards.iso.org/iso/19115/-3/mrc/1.0"
- xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0">
-   <mdb:metadataIdentifier>
-      <mcc:MD_Identifier>
-         <mcc:code>
-            <gco:CharacterString>fileIdentifier</gco:CharacterString>
-         </mcc:code>
-         <mcc:codeSpace>
-            <gco:CharacterString>fileIdentifierNamespace</gco:CharacterString>
-         </mcc:codeSpace>
-      </mcc:MD_Identifier>
-   </mdb:metadataIdentifier>
-   <mdb:defaultLocale>
-      <lan:PT_Locale>
-         <lan:language>
-            <lan:LanguageCode codeList="codeListLocation#LanguageCode"
-                              codeListValue="/gmd:MD_Metadata/gmd:language/gco:CharacterString">/gmd:MD_Metadata/gmd:language/gco:CharacterString</lan:LanguageCode>
-         </lan:language>
-         <lan:characterEncoding>
-            <lan:MD_CharacterSetCode codeList="codeListLocation#MD_CharacterSetCode" codeListValue="UTF8">UTF8</lan:MD_CharacterSetCode>
-         </lan:characterEncoding>
-      </lan:PT_Locale>
-   </mdb:defaultLocale>
-   <mdb:parentMetadata>
-      <cit:CI_Citation>
-         <cit:title>
-            <gco:CharacterString>/gmd:MD_Metadata/gmd:parentIdentifier/gco:CharacterString</gco:CharacterString>
-         </cit:title>
-         <cit:identifier>
-            <mcc:MD_Identifier>
-               <mcc:code>
-                  <gco:CharacterString>MD_Metadata/gmd:parentIdentifier/gco:CharacterString</gco:CharacterString>
-               </mcc:code>
-               <mcc:codeSpace>
-                  <gco:CharacterString>/gmd</gco:CharacterString>
-               </mcc:codeSpace>
-            </mcc:MD_Identifier>
-         </cit:identifier>
-      </cit:CI_Citation>
-   </mdb:parentMetadata>
-   <mdb:metadataScope>
-      <mdb:MD_MetadataScope>
-         <mdb:resourceScope>
-            <mcc:MD_ScopeCode codeList="codeListLocation#MD_ScopeCode" codeListValue="dataset">dataset</mcc:MD_ScopeCode>
-         </mdb:resourceScope>
-         <mdb:name>
-            <gco:CharacterString>/gmd:MD_Metadata/gmd:hierarchyLevelName/gco:CharacterString</gco:CharacterString>
-         </mdb:name>
-      </mdb:MD_MetadataScope>
-   </mdb:metadataScope>
-   <mdb:metadataScope>
-      <mdb:MD_MetadataScope>
-         <mdb:resourceScope>
-            <mcc:MD_ScopeCode codeList="codeListLocation#MD_ScopeCode" codeListValue="dataset">dataset</mcc:MD_ScopeCode>
-         </mdb:resourceScope>
-         <mdb:name>
-            <gco:CharacterString>/gmd:MD_Metadata/gmd:hierarchyLevelName/gco:CharacterString</gco:CharacterString>
-         </mdb:name>
-      </mdb:MD_MetadataScope>
-   </mdb:metadataScope>
-   <mdb:contact>
-      <cit:CI_Responsibility id="indOrgPos">
-         <cit:role>
-            <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="pointOfContact">pointOfContact</cit:CI_RoleCode>
-         </cit:role>
-         <cit:party>
-            <cit:CI_Organisation>
-               <cit:name>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:contact/gmd:CI_ResponsibleParty/gmd:organisationName/gco:CharacterString</gco:CharacterString>
-               </cit:name>
-               <cit:contactInfo>
-                  <cit:CI_Contact>
-                     <cit:phone>
-                        <cit:CI_Telephone>
-                           <cit:number>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:voice/gco:CharacterString</gco:CharacterString>
-                           </cit:number>
-                           <cit:numberType>
-                              <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode" codeListValue="voice">voice</cit:CI_TelephoneTypeCode>
-                           </cit:numberType>
-                        </cit:CI_Telephone>
-                     </cit:phone>
-                     <cit:phone>
-                        <cit:CI_Telephone>
-                           <cit:number>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:facsimile/gco:CharacterString</gco:CharacterString>
-                           </cit:number>
-                           <cit:numberType>
-                              <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode"
-                                                        codeListValue="facsimile">facsimile</cit:CI_TelephoneTypeCode>
-                           </cit:numberType>
-                        </cit:CI_Telephone>
-                     </cit:phone>
-                     <cit:address>
-                        <cit:CI_Address>
-                           <cit:deliveryPoint>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:deliveryPoint/gco:CharacterString</gco:CharacterString>
-                           </cit:deliveryPoint>
-                           <cit:city>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:city/gco:CharacterString</gco:CharacterString>
-                           </cit:city>
-                           <cit:administrativeArea>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:administrativeArea/gco:CharacterString</gco:CharacterString>
-                           </cit:administrativeArea>
-                           <cit:postalCode>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:postalCode/gco:CharacterString</gco:CharacterString>
-                           </cit:postalCode>
-                           <cit:country>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:country/gco:CharacterString</gco:CharacterString>
-                           </cit:country>
-                           <cit:electronicMailAddress>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:electronicMailAddress/gco:CharacterString</gco:CharacterString>
-                           </cit:electronicMailAddress>
-                        </cit:CI_Address>
-                     </cit:address>
-                     <cit:onlineResource>
-                        <cit:CI_OnlineResource>
-                           <cit:linkage>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:linkage/gmd:URL</gco:CharacterString>
-                           </cit:linkage>
-                           <cit:protocol>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:CI_OnlineResource/gmd:protocol/gco:CharacterString</gco:CharacterString>
-                           </cit:protocol>
-                           <cit:applicationProfile>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:CI_OnlineResource/gmd:applicationProfile/gco:CharacterString</gco:CharacterString>
-                           </cit:applicationProfile>
-                           <cit:name gco:nilReason="missing">
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:CI_OnlineResource/gmd:name/gco:CharacterString</gco:CharacterString>
-                           </cit:name>
-                           <cit:description>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:CI_OnlineResource/gmd:description/gco:CharacterString</gco:CharacterString>
-                           </cit:description>
-                           <cit:function>
-                              <cit:CI_OnLineFunctionCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode"
-                                                         codeListValue="download">/gmd:MD_Metadata/gmd:contact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:CI_OnlineResource/gmd:function/gmd:CI_OnLineFunctionCode</cit:CI_OnLineFunctionCode>
-                           </cit:function>
-                        </cit:CI_OnlineResource>
-                     </cit:onlineResource>
-                     <cit:hoursOfService>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:contact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:hoursOfService/gco:CharacterString</gco:CharacterString>
-                     </cit:hoursOfService>
-                     <cit:contactInstructions>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:contact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:contactInstructions/gco:CharacterString</gco:CharacterString>
-                     </cit:contactInstructions>
-                  </cit:CI_Contact>
-               </cit:contactInfo>
-               <cit:individual>
-                  <cit:CI_Individual>
-                     <cit:name>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:contact/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString</gco:CharacterString>
-                     </cit:name>
-                     <cit:positionName>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:contact/gmd:CI_ResponsibleParty/gmd:positionName/gco:CharacterString</gco:CharacterString>
-                     </cit:positionName>
-                  </cit:CI_Individual>
-               </cit:individual>
-            </cit:CI_Organisation>
-         </cit:party>
-      </cit:CI_Responsibility>
-   </mdb:contact>
-   <mdb:contact>
-      <cit:CI_Responsibility id="ind">
-         <cit:role>
-            <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="pointOfContact">pointOfContact</cit:CI_RoleCode>
-         </cit:role>
-         <cit:party>
-            <cit:CI_Individual>
-               <cit:name>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.2/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString</gco:CharacterString>
-               </cit:name>
-               <cit:contactInfo>
-                  <cit:CI_Contact>
-                     <cit:phone>
-                        <cit:CI_Telephone>
-                           <cit:number>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.2/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:voice/gco:CharacterString</gco:CharacterString>
-                           </cit:number>
-                           <cit:numberType>
-                              <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode" codeListValue="voice">voice</cit:CI_TelephoneTypeCode>
-                           </cit:numberType>
-                        </cit:CI_Telephone>
-                     </cit:phone>
-                     <cit:phone>
-                        <cit:CI_Telephone>
-                           <cit:number>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.2/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:facsimile/gco:CharacterString</gco:CharacterString>
-                           </cit:number>
-                           <cit:numberType>
-                              <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode"
-                                                        codeListValue="facsimile">facsimile</cit:CI_TelephoneTypeCode>
-                           </cit:numberType>
-                        </cit:CI_Telephone>
-                     </cit:phone>
-                     <cit:address>
-                        <cit:CI_Address>
-                           <cit:deliveryPoint>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.2/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:deliveryPoint/gco:CharacterString</gco:CharacterString>
-                           </cit:deliveryPoint>
-                           <cit:city>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.2/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:city/gco:CharacterString</gco:CharacterString>
-                           </cit:city>
-                           <cit:administrativeArea>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.2/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:administrativeArea/gco:CharacterString</gco:CharacterString>
-                           </cit:administrativeArea>
-                           <cit:postalCode>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.2/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:postalCode/gco:CharacterString</gco:CharacterString>
-                           </cit:postalCode>
-                           <cit:country>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.2/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:country/gco:CharacterString</gco:CharacterString>
-                           </cit:country>
-                           <cit:electronicMailAddress>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.2/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:electronicMailAddress/gco:CharacterString</gco:CharacterString>
-                           </cit:electronicMailAddress>
-                        </cit:CI_Address>
-                     </cit:address>
-                     <cit:hoursOfService>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.2/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:hoursOfService/gco:CharacterString</gco:CharacterString>
-                     </cit:hoursOfService>
-                  </cit:CI_Contact>
-               </cit:contactInfo>
-            </cit:CI_Individual>
-         </cit:party>
-      </cit:CI_Responsibility>
-   </mdb:contact>
-   <mdb:contact>
-      <cit:CI_Responsibility id="org">
-         <cit:role>
-            <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="pointOfContact">pointOfContact</cit:CI_RoleCode>
-         </cit:role>
-         <cit:party>
-            <cit:CI_Organisation>
-               <cit:name>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.3/gmd:CI_ResponsibleParty/gmd:organisationName/gco:CharacterString</gco:CharacterString>
-               </cit:name>
-               <cit:contactInfo>
-                  <cit:CI_Contact>
-                     <cit:phone>
-                        <cit:CI_Telephone>
-                           <cit:number>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.3/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:voice/gco:CharacterString</gco:CharacterString>
-                           </cit:number>
-                           <cit:numberType>
-                              <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode" codeListValue="voice">voice</cit:CI_TelephoneTypeCode>
-                           </cit:numberType>
-                        </cit:CI_Telephone>
-                     </cit:phone>
-                     <cit:phone>
-                        <cit:CI_Telephone>
-                           <cit:number>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.3/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:facsimile/gco:CharacterString</gco:CharacterString>
-                           </cit:number>
-                           <cit:numberType>
-                              <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode"
-                                                        codeListValue="facsimile">facsimile</cit:CI_TelephoneTypeCode>
-                           </cit:numberType>
-                        </cit:CI_Telephone>
-                     </cit:phone>
-                     <cit:address>
-                        <cit:CI_Address>
-                           <cit:deliveryPoint>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.3/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:deliveryPoint/gco:CharacterString</gco:CharacterString>
-                           </cit:deliveryPoint>
-                           <cit:city>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.3/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:city/gco:CharacterString</gco:CharacterString>
-                           </cit:city>
-                           <cit:administrativeArea>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.3/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:administrativeArea/gco:CharacterString</gco:CharacterString>
-                           </cit:administrativeArea>
-                           <cit:postalCode>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.3/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:postalCode/gco:CharacterString</gco:CharacterString>
-                           </cit:postalCode>
-                           <cit:country>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.3/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:country/gco:CharacterString</gco:CharacterString>
-                           </cit:country>
-                           <cit:electronicMailAddress>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.3/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:electronicMailAddress/gco:CharacterString</gco:CharacterString>
-                           </cit:electronicMailAddress>
-                        </cit:CI_Address>
-                     </cit:address>
-                     <cit:hoursOfService>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.3/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:hoursOfService/gco:CharacterString</gco:CharacterString>
-                     </cit:hoursOfService>
-                  </cit:CI_Contact>
-               </cit:contactInfo>
-            </cit:CI_Organisation>
-         </cit:party>
-      </cit:CI_Responsibility>
-   </mdb:contact>
-   <mdb:contact>
-      <cit:CI_Responsibility id="pos">
-         <cit:role>
-            <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="pointOfContact">pointOfContact</cit:CI_RoleCode>
-         </cit:role>
-         <cit:party>
-            <cit:CI_Individual>
-               <cit:contactInfo>
-                  <cit:CI_Contact>
-                     <cit:phone>
-                        <cit:CI_Telephone>
-                           <cit:number>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.4/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:voice/gco:CharacterString</gco:CharacterString>
-                           </cit:number>
-                           <cit:numberType>
-                              <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode" codeListValue="voice">voice</cit:CI_TelephoneTypeCode>
-                           </cit:numberType>
-                        </cit:CI_Telephone>
-                     </cit:phone>
-                     <cit:phone>
-                        <cit:CI_Telephone>
-                           <cit:number>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.4/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:facsimile/gco:CharacterString</gco:CharacterString>
-                           </cit:number>
-                           <cit:numberType>
-                              <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode"
-                                                        codeListValue="facsimile">facsimile</cit:CI_TelephoneTypeCode>
-                           </cit:numberType>
-                        </cit:CI_Telephone>
-                     </cit:phone>
-                     <cit:address>
-                        <cit:CI_Address>
-                           <cit:deliveryPoint>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.4/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:deliveryPoint/gco:CharacterString</gco:CharacterString>
-                           </cit:deliveryPoint>
-                           <cit:city>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.4/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:city/gco:CharacterString</gco:CharacterString>
-                           </cit:city>
-                           <cit:administrativeArea>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.4/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:administrativeArea/gco:CharacterString</gco:CharacterString>
-                           </cit:administrativeArea>
-                           <cit:postalCode>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.4/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:postalCode/gco:CharacterString</gco:CharacterString>
-                           </cit:postalCode>
-                           <cit:country>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.4/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:country/gco:CharacterString</gco:CharacterString>
-                           </cit:country>
-                           <cit:electronicMailAddress>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.4/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:electronicMailAddress/gco:CharacterString</gco:CharacterString>
-                           </cit:electronicMailAddress>
-                        </cit:CI_Address>
-                     </cit:address>
-                     <cit:hoursOfService>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.4/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:hoursOfService/gco:CharacterString</gco:CharacterString>
-                     </cit:hoursOfService>
-                  </cit:CI_Contact>
-               </cit:contactInfo>
-               <cit:positionName>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.4/gmd:CI_ResponsibleParty/gmd:positionName/gco:CharacterString</gco:CharacterString>
-               </cit:positionName>
-            </cit:CI_Individual>
-         </cit:party>
-      </cit:CI_Responsibility>
-   </mdb:contact>
-   <mdb:contact>
-      <cit:CI_Responsibility id="indOrg">
-         <cit:role>
-            <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="pointOfContact">pointOfContact</cit:CI_RoleCode>
-         </cit:role>
-         <cit:party>
-            <cit:CI_Organisation>
-               <cit:name>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.5/gmd:CI_ResponsibleParty/gmd:organisationName/gco:CharacterString</gco:CharacterString>
-               </cit:name>
-               <cit:contactInfo>
-                  <cit:CI_Contact>
-                     <cit:phone>
-                        <cit:CI_Telephone>
-                           <cit:number>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.5/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:voice/gco:CharacterString</gco:CharacterString>
-                           </cit:number>
-                           <cit:numberType>
-                              <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode" codeListValue="voice">voice</cit:CI_TelephoneTypeCode>
-                           </cit:numberType>
-                        </cit:CI_Telephone>
-                     </cit:phone>
-                     <cit:phone>
-                        <cit:CI_Telephone>
-                           <cit:number>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.5/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:facsimile/gco:CharacterString</gco:CharacterString>
-                           </cit:number>
-                           <cit:numberType>
-                              <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode"
-                                                        codeListValue="facsimile">facsimile</cit:CI_TelephoneTypeCode>
-                           </cit:numberType>
-                        </cit:CI_Telephone>
-                     </cit:phone>
-                     <cit:address>
-                        <cit:CI_Address>
-                           <cit:deliveryPoint>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.5/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:deliveryPoint/gco:CharacterString</gco:CharacterString>
-                           </cit:deliveryPoint>
-                           <cit:city>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.5/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:city/gco:CharacterString</gco:CharacterString>
-                           </cit:city>
-                           <cit:administrativeArea>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.5/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:administrativeArea/gco:CharacterString</gco:CharacterString>
-                           </cit:administrativeArea>
-                           <cit:postalCode>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.5/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:postalCode/gco:CharacterString</gco:CharacterString>
-                           </cit:postalCode>
-                           <cit:country>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.5/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:country/gco:CharacterString</gco:CharacterString>
-                           </cit:country>
-                           <cit:electronicMailAddress>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.5/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:electronicMailAddress/gco:CharacterString</gco:CharacterString>
-                           </cit:electronicMailAddress>
-                        </cit:CI_Address>
-                     </cit:address>
-                     <cit:hoursOfService>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.5/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:hoursOfService/gco:CharacterString</gco:CharacterString>
-                     </cit:hoursOfService>
-                  </cit:CI_Contact>
-               </cit:contactInfo>
-               <cit:individual>
-                  <cit:CI_Individual>
-                     <cit:name>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.5/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString</gco:CharacterString>
-                     </cit:name>
-                  </cit:CI_Individual>
-               </cit:individual>
-            </cit:CI_Organisation>
-         </cit:party>
-      </cit:CI_Responsibility>
-   </mdb:contact>
-   <mdb:contact>
-      <cit:CI_Responsibility id="indPos">
-         <cit:role>
-            <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="pointOfContact">pointOfContact</cit:CI_RoleCode>
-         </cit:role>
-         <cit:party>
-            <cit:CI_Individual>
-               <cit:name>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.6/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString</gco:CharacterString>
-               </cit:name>
-               <cit:contactInfo>
-                  <cit:CI_Contact>
-                     <cit:phone>
-                        <cit:CI_Telephone>
-                           <cit:number>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.6/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:voice/gco:CharacterString</gco:CharacterString>
-                           </cit:number>
-                           <cit:numberType>
-                              <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode" codeListValue="voice">voice</cit:CI_TelephoneTypeCode>
-                           </cit:numberType>
-                        </cit:CI_Telephone>
-                     </cit:phone>
-                     <cit:phone>
-                        <cit:CI_Telephone>
-                           <cit:number>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.6/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:facsimile/gco:CharacterString</gco:CharacterString>
-                           </cit:number>
-                           <cit:numberType>
-                              <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode"
-                                                        codeListValue="facsimile">facsimile</cit:CI_TelephoneTypeCode>
-                           </cit:numberType>
-                        </cit:CI_Telephone>
-                     </cit:phone>
-                     <cit:address>
-                        <cit:CI_Address>
-                           <cit:deliveryPoint>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.6/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:deliveryPoint/gco:CharacterString</gco:CharacterString>
-                           </cit:deliveryPoint>
-                           <cit:city>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.6/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:city/gco:CharacterString</gco:CharacterString>
-                           </cit:city>
-                           <cit:administrativeArea>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.6/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:administrativeArea/gco:CharacterString</gco:CharacterString>
-                           </cit:administrativeArea>
-                           <cit:postalCode>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.6/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:postalCode/gco:CharacterString</gco:CharacterString>
-                           </cit:postalCode>
-                           <cit:country>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.6/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:country/gco:CharacterString</gco:CharacterString>
-                           </cit:country>
-                           <cit:electronicMailAddress>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.6/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:electronicMailAddress/gco:CharacterString</gco:CharacterString>
-                           </cit:electronicMailAddress>
-                        </cit:CI_Address>
-                     </cit:address>
-                     <cit:hoursOfService>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.6/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:hoursOfService/gco:CharacterString</gco:CharacterString>
-                     </cit:hoursOfService>
-                  </cit:CI_Contact>
-               </cit:contactInfo>
-               <cit:positionName>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.6/gmd:CI_ResponsibleParty/gmd:positionName/gco:CharacterString</gco:CharacterString>
-               </cit:positionName>
-            </cit:CI_Individual>
-         </cit:party>
-      </cit:CI_Responsibility>
-   </mdb:contact>
-   <mdb:contact>
-      <cit:CI_Responsibility id="orgPos">
-         <cit:role>
-            <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="pointOfContact">pointOfContact</cit:CI_RoleCode>
-         </cit:role>
-         <cit:party>
-            <cit:CI_Organisation>
-               <cit:name>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.7/gmd:CI_ResponsibleParty/gmd:organisationName/gco:CharacterString</gco:CharacterString>
-               </cit:name>
-               <cit:contactInfo>
-                  <cit:CI_Contact>
-                     <cit:phone>
-                        <cit:CI_Telephone>
-                           <cit:number>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.7/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:voice/gco:CharacterString</gco:CharacterString>
-                           </cit:number>
-                           <cit:numberType>
-                              <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode" codeListValue="voice">voice</cit:CI_TelephoneTypeCode>
-                           </cit:numberType>
-                        </cit:CI_Telephone>
-                     </cit:phone>
-                     <cit:phone>
-                        <cit:CI_Telephone>
-                           <cit:number>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.7/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:facsimile/gco:CharacterString</gco:CharacterString>
-                           </cit:number>
-                           <cit:numberType>
-                              <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode"
-                                                        codeListValue="facsimile">facsimile</cit:CI_TelephoneTypeCode>
-                           </cit:numberType>
-                        </cit:CI_Telephone>
-                     </cit:phone>
-                     <cit:address>
-                        <cit:CI_Address>
-                           <cit:deliveryPoint>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.7/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:deliveryPoint/gco:CharacterString</gco:CharacterString>
-                           </cit:deliveryPoint>
-                           <cit:city>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.7/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:city/gco:CharacterString</gco:CharacterString>
-                           </cit:city>
-                           <cit:administrativeArea>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.7/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:administrativeArea/gco:CharacterString</gco:CharacterString>
-                           </cit:administrativeArea>
-                           <cit:postalCode>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.7/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:postalCode/gco:CharacterString</gco:CharacterString>
-                           </cit:postalCode>
-                           <cit:country>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.7/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:country/gco:CharacterString</gco:CharacterString>
-                           </cit:country>
-                           <cit:electronicMailAddress>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.7/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:electronicMailAddress/gco:CharacterString</gco:CharacterString>
-                           </cit:electronicMailAddress>
-                        </cit:CI_Address>
-                     </cit:address>
-                     <cit:hoursOfService>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.7/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:hoursOfService/gco:CharacterString</gco:CharacterString>
-                     </cit:hoursOfService>
-                  </cit:CI_Contact>
-               </cit:contactInfo>
-               <cit:individual>
-                  <cit:CI_Individual>
-                     <cit:positionName>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:contact.7/gmd:CI_ResponsibleParty/gmd:positionName/gco:CharacterString</gco:CharacterString>
-                     </cit:positionName>
-                  </cit:CI_Individual>
-               </cit:individual>
-            </cit:CI_Organisation>
-         </cit:party>
-      </cit:CI_Responsibility>
-   </mdb:contact>
-   <mdb:dateInfo>
-      <cit:CI_Date>
-         <cit:date>
-            <gco:DateTime>2111-11-11T11:11:11</gco:DateTime>
-         </cit:date>
-         <cit:dateType>
-            <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode" codeListValue="creation">creation</cit:CI_DateTypeCode>
-         </cit:dateType>
-      </cit:CI_Date>
-   </mdb:dateInfo>
-   <mdb:metadataStandard>
-      <cit:CI_Citation>
-         <cit:title>
-            <gco:CharacterString>/gmd:MD_Metadata/gmd:metadataStandardName/gco:CharacterString</gco:CharacterString>
-         </cit:title>
-         <cit:edition>
-            <gco:CharacterString>/gmd:MD_Metadata/gmd:metadataStandardVersion/gco:CharacterString</gco:CharacterString>
-         </cit:edition>
-      </cit:CI_Citation>
-   </mdb:metadataStandard>
-   <mdb:otherLocale>
-      <lan:PT_Locale>
-         <lan:language>
-            <lan:LanguageCode codeList="codeListLocation#LanguageCode" codeListValue=""/>
-         </lan:language>
-         <lan:characterEncoding>
-            <lan:MD_CharacterSetCode codeList="codeListLocation#MD_CharacterSetCode" codeListValue="UTF8">UTF8</lan:MD_CharacterSetCode>
-         </lan:characterEncoding>
-      </lan:PT_Locale>
-   </mdb:otherLocale>
-   <mdb:spatialRepresentationInfo>
-      <msr:MD_Georectified id="seriesSpatialRepresentation">
-         <msr:numberOfDimensions>
-            <gco:Integer>77788</gco:Integer>
-         </msr:numberOfDimensions>
-         <msr:axisDimensionProperties>
-            <msr:MD_Dimension>
-               <msr:dimensionName>
-                  <msr:MD_DimensionNameTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_DimensionNameTypeCode"
-                                                codeListValue="row">/gmd:MD_Metadata/gmd:spatialRepresentationInfo/gmd:MD_Georectified/gmd:axisDimensionProperties/gmd:MD_Dimension/gmd:dimensionName/gmd:MD_DimensionNameTypeCode</msr:MD_DimensionNameTypeCode>
-               </msr:dimensionName>
-               <msr:dimensionSize>
-                  <gco:Integer>7777</gco:Integer>
-               </msr:dimensionSize>
-               <msr:resolution>
-                  <gco:Measure uom="degrees">77777</gco:Measure>
-               </msr:resolution>
-            </msr:MD_Dimension>
-         </msr:axisDimensionProperties>
-         <msr:axisDimensionProperties>
-            <msr:MD_Dimension>
-               <msr:dimensionName>
-                  <msr:MD_DimensionNameTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_DimensionNameTypeCode"
-                                                codeListValue="column">/gmd:MD_Metadata/gmd:spatialRepresentationInfo/gmd:MD_Georectified/gmd:axisDimensionProperties.2/gmd:MD_Dimension/gmd:dimensionName/gmd:MD_DimensionNameTypeCode</msr:MD_DimensionNameTypeCode>
-               </msr:dimensionName>
-               <msr:dimensionSize>
-                  <gco:Integer>2233</gco:Integer>
-               </msr:dimensionSize>
-               <msr:resolution>
-                  <gco:Measure uom="degrees">2234</gco:Measure>
-               </msr:resolution>
-            </msr:MD_Dimension>
-         </msr:axisDimensionProperties>
-         <msr:cellGeometry>
-            <msr:MD_CellGeometryCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_CellGeometryCode"
-                                     codeListValue="area">/gmd:MD_Metadata/gmd:spatialRepresentationInfo/gmd:MD_Georectified/gmd:cellGeometry/gmd:MD_CellGeometryCode</msr:MD_CellGeometryCode>
-         </msr:cellGeometry>
-         <msr:transformationParameterAvailability gco:nilReason="unknown"/>
-         <msr:checkPointAvailability gco:nilReason="unknown"/>
-         <msr:cornerPoints>
-            <gml:Point gml:id="cornerPoint-upper-left" srsName="urn:x-ogc:def:crs:EPSG::4326">
-               <gml:pos>11.11</gml:pos>
-            </gml:Point>
-         </msr:cornerPoints>
-         <msr:cornerPoints>
-            <gml:Point gml:id="cornerPoint-upper-right" srsName="urn:x-ogc:def:crs:EPSG::4326">
-               <gml:pos>22.22</gml:pos>
-            </gml:Point>
-         </msr:cornerPoints>
-         <msr:cornerPoints>
-            <gml:Point gml:id="cornerPoint-lower-right" srsName="urn:x-ogc:def:crs:EPSG::4326">
-               <gml:pos>33.334</gml:pos>
-            </gml:Point>
-         </msr:cornerPoints>
-         <msr:cornerPoints>
-            <gml:Point gml:id="cornerPoint-lower_left" srsName="urn:x-ogc:def:crs:EPSG::4326">
-               <gml:pos>44.44</gml:pos>
-            </gml:Point>
-         </msr:cornerPoints>
-         <msr:pointInPixel>
-            <msr:MD_PixelOrientationCode>upperRight</msr:MD_PixelOrientationCode>
-         </msr:pointInPixel>
-      </msr:MD_Georectified>
-   </mdb:spatialRepresentationInfo>
-   <mdb:referenceSystemInfo>
-      <mrs:MD_ReferenceSystem>
-         <mrs:referenceSystemIdentifier>
-            <mcc:MD_Identifier>
-               <mcc:authority>
-                  <cit:CI_Citation>
-                     <cit:title>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:referenceSystemInfo/gmd:MD_ReferenceSystem/gmd:referenceSystemIdentifier/gmd:RS_Identifier/gmd:authority/gmd:CI_Citation/gmd:title/gco:CharacterString</gco:CharacterString>
-                     </cit:title>
-                     <cit:date>
-                        <cit:CI_Date>
-                           <cit:date>
-                              <gco:DateTime>2011-04-04T00:00:00</gco:DateTime>
-                           </cit:date>
-                           <cit:dateType>
-                              <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode" codeListValue=""/>
-                           </cit:dateType>
-                        </cit:CI_Date>
-                     </cit:date>
-                     <cit:date>
-                        <cit:CI_Date>
-                           <cit:date>
-                              <gco:DateTime>2777-07-07T00:00:00</gco:DateTime>
-                           </cit:date>
-                           <cit:dateType>
-                              <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode" codeListValue=""/>
-                           </cit:dateType>
-                        </cit:CI_Date>
-                     </cit:date>
-                     <cit:citedResponsibleParty>
-                        <cit:CI_Responsibility>
-                           <cit:role>
-                              <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue=""/>
-                           </cit:role>
-                           <cit:party>
-                              <cit:CI_Organisation>
-                                 <cit:name>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:referenceSystemInfo/gmd:MD_ReferenceSystem/gmd:referenceSystemIdentifier/gmd:RS_Identifier/gmd:authority/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:organisationName/gco:CharacterString</gco:CharacterString>
-                                 </cit:name>
-                                 <cit:contactInfo>
-                                    <cit:CI_Contact>
-                                       <cit:onlineResource>
-                                          <cit:CI_OnlineResource>
-                                             <cit:linkage>
-                                                <gco:CharacterString>/gmd:MD_Metadata/gmd:referenceSystemInfo/gmd:MD_ReferenceSystem/gmd:referenceSystemIdentifier/gmd:RS_Identifier/gmd:authority/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:linkage/gmd:URL</gco:CharacterString>
-                                             </cit:linkage>
-                                             <cit:name>
-                                                <gco:CharacterString>/gmd:MD_Metadata/gmd:referenceSystemInfo/gmd:MD_ReferenceSystem/gmd:referenceSystemIdentifier/gmd:RS_Identifier/gmd:authority/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:name/gco:CharacterString</gco:CharacterString>
-                                             </cit:name>
-                                             <cit:description>
-                                                <gco:CharacterString>/gmd:MD_Metadata/gmd:referenceSystemInfo/gmd:MD_ReferenceSystem/gmd:referenceSystemIdentifier/gmd:RS_Identifier/gmd:authority/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:description/gco:CharacterString</gco:CharacterString>
-                                             </cit:description>
-                                             <cit:function>
-                                                <cit:CI_OnLineFunctionCode codeList="" codeListValue="">/gmd:MD_Metadata/gmd:referenceSystemInfo/gmd:MD_ReferenceSystem/gmd:referenceSystemIdentifier/gmd:RS_Identifier/gmd:authority/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:function/gmd:CI_OnLineFunctionCode</cit:CI_OnLineFunctionCode>
-                                             </cit:function>
-                                          </cit:CI_OnlineResource>
-                                       </cit:onlineResource>
-                                    </cit:CI_Contact>
-                                 </cit:contactInfo>
-                              </cit:CI_Organisation>
-                           </cit:party>
-                        </cit:CI_Responsibility>
-                     </cit:citedResponsibleParty>
-                     <cit:onlineResource>
-                        <cit:CI_OnlineResource>
-                           <cit:linkage>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:referenceSystemInfo/gmd:MD_ReferenceSystem/gmd:referenceSystemIdentifier/gmd:RS_Identifier/gmd:authority/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:linkage/gmd:URL</gco:CharacterString>
-                           </cit:linkage>
-                           <cit:name>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:referenceSystemInfo/gmd:MD_ReferenceSystem/gmd:referenceSystemIdentifier/gmd:RS_Identifier/gmd:authority/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:name/gco:CharacterString</gco:CharacterString>
-                           </cit:name>
-                           <cit:description>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:referenceSystemInfo/gmd:MD_ReferenceSystem/gmd:referenceSystemIdentifier/gmd:RS_Identifier/gmd:authority/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:description/gco:CharacterString</gco:CharacterString>
-                           </cit:description>
-                           <cit:function>
-                              <cit:CI_OnLineFunctionCode codeList="" codeListValue="">/gmd:MD_Metadata/gmd:referenceSystemInfo/gmd:MD_ReferenceSystem/gmd:referenceSystemIdentifier/gmd:RS_Identifier/gmd:authority/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:function/gmd:CI_OnLineFunctionCode</cit:CI_OnLineFunctionCode>
-                           </cit:function>
-                        </cit:CI_OnlineResource>
-                     </cit:onlineResource>
-                  </cit:CI_Citation>
-               </mcc:authority>
-               <mcc:code>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:referenceSystemInfo/gmd:MD_ReferenceSystem/gmd:referenceSystemIdentifier/gmd:RS_Identifier/gmd:code/gco:CharacterString</gco:CharacterString>
-               </mcc:code>
-               <mcc:codeSpace>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:referenceSystemInfo/gmd:MD_ReferenceSystem/gmd:referenceSystemIdentifier/gmd:RS_Identifier/gmd:codeSpace/gco:CharacterString</gco:CharacterString>
-               </mcc:codeSpace>
-               <mcc:version>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:referenceSystemInfo/gmd:MD_ReferenceSystem/gmd:referenceSystemIdentifier/gmd:RS_Identifier/gmd:version/gco:CharacterString</gco:CharacterString>
-               </mcc:version>
-            </mcc:MD_Identifier>
-         </mrs:referenceSystemIdentifier>
-      </mrs:MD_ReferenceSystem>
-   </mdb:referenceSystemInfo>
-   <mdb:metadataExtensionInfo>
-      <mex:MD_MetadataExtensionInformation>
-         <mex:extensionOnLineResource>
-            <cit:CI_OnlineResource>
-               <cit:linkage>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:metadataExtensionInfo/gmd:MD_MetadataExtensionInformation/gmd:extensionOnLineResource/gmd:CI_OnlineResource/gmd:linkage/gmd:URL</gco:CharacterString>
-               </cit:linkage>
-               <cit:protocol>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:metadataExtensionInfo/gmd:MD_MetadataExtensionInformation/gmd:extensionOnLineResource/gmd:CI_OnlineResource/gmd:linkage/gmd:protocol</gco:CharacterString>
-               </cit:protocol>
-               <cit:applicationProfile>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:metadataExtensionInfo/gmd:MD_MetadataExtensionInformation/gmd:extensionOnLineResource/gmd:CI_OnlineResource/gmd:linkage/gmd:applicationProfile</gco:CharacterString>
-               </cit:applicationProfile>
-               <cit:name>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:metadataExtensionInfo/gmd:MD_MetadataExtensionInformation/gmd:extensionOnLineResource/gmd:CI_OnlineResource/gmd:linkage/gmd:name</gco:CharacterString>
-               </cit:name>
-               <cit:description>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:metadataExtensionInfo/gmd:MD_MetadataExtensionInformation/gmd:extensionOnLineResource/gmd:CI_OnlineResource/gmd:linkage/gmd:description</gco:CharacterString>
-               </cit:description>
-               <cit:function>
-                  <cit:CI_OnLineFunctionCode codeList="" codeListValue="">/gmd:MD_Metadata/gmd:metadataExtensionInfo/gmd:MD_MetadataExtensionInformation/gmd:extensionOnLineResource/gmd:CI_OnlineResource/gmd:function/gmd:CI_OnLineFunctionCode</cit:CI_OnLineFunctionCode>
-               </cit:function>
-            </cit:CI_OnlineResource>
-         </mex:extensionOnLineResource>
-         <mex:extendedElementInformation>
-            <mex:MD_ExtendedElementInformation>
-               <mex:name>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:metadataExtensionInfo/gmd:MD_MetadataExtensionInformation/gmd:extendedElementInformation/gmd:MD_ExtendedElementInformation/gmd:name/gco:CharacterString</gco:CharacterString>
-               </mex:name>
-               <mex:definition>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:metadataExtensionInfo/gmd:MD_MetadataExtensionInformation/gmd:extendedElementInformation/gmd:MD_ExtendedElementInformation/gmd:definition/gco:CharacterString</gco:CharacterString>
-               </mex:definition>
-               <mex:obligation>
-                  <mex:MD_ObligationCode>mandatory</mex:MD_ObligationCode>
-               </mex:obligation>
-               <mex:condition>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:metadataExtensionInfo/gmd:MD_MetadataExtensionInformation/gmd:extendedElementInformation/gmd:MD_ExtendedElementInformation/gmd:condition/gco:CharacterString</gco:CharacterString>
-               </mex:condition>
-               <mex:dataType>
-                  <mex:MD_DatatypeCode codeList="" codeListValue=""/>
-               </mex:dataType>
-               <mex:maximumOccurrence>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:metadataExtensionInfo/gmd:MD_MetadataExtensionInformation/gmd:extendedElementInformation/gmd:MD_ExtendedElementInformation/gmd:maximumOccurrence/gco:CharacterString</gco:CharacterString>
-               </mex:maximumOccurrence>
-               <mex:domainValue>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:metadataExtensionInfo/gmd:MD_MetadataExtensionInformation/gmd:extendedElementInformation/gmd:MD_ExtendedElementInformation/gmd:domainValue/gco:CharacterString</gco:CharacterString>
-               </mex:domainValue>
-               <mex:parentEntity>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:metadataExtensionInfo/gmd:MD_MetadataExtensionInformation/gmd:extendedElementInformation/gmd:MD_ExtendedElementInformation/gmd:parentEntity/gco:CharacterString</gco:CharacterString>
-               </mex:parentEntity>
-               <mex:rule>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:metadataExtensionInfo/gmd:MD_MetadataExtensionInformation/gmd:extendedElementInformation/gmd:MD_ExtendedElementInformation/gmd:rule/gco:CharacterString</gco:CharacterString>
-               </mex:rule>
-               <mex:rationale>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:metadataExtensionInfo/gmd:MD_MetadataExtensionInformation/gmd:extendedElementInformation/gmd:MD_ExtendedElementInformation/gmd:rationale/gco:CharacterString</gco:CharacterString>
-               </mex:rationale>
-               <mex:source>
-                  <cit:CI_Responsibility>
-                     <cit:role>
-                        <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue=""/>
-                     </cit:role>
-                     <cit:party>
-                        <cit:CI_Organisation>
-                           <cit:name>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:metadataExtensionInfo/gmd:MD_MetadataExtensionInformation/gmd:extendedElementInformation/gmd:MD_ExtendedElementInformation/gmd:source/gmd:CI_ResponsibleParty/gmd:organisationName/gco:CharacterString</gco:CharacterString>
-                           </cit:name>
-                           <cit:contactInfo>
-                              <cit:CI_Contact>
-                                 <cit:address>
-                                    <cit:CI_Address>
-                                       <cit:electronicMailAddress>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:metadataExtensionInfo/gmd:MD_MetadataExtensionInformation/gmd:extendedElementInformation/gmd:MD_ExtendedElementInformation/gmd:source/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:electronicMailAddress/gco:CharacterString</gco:CharacterString>
-                                       </cit:electronicMailAddress>
-                                    </cit:CI_Address>
-                                 </cit:address>
-                              </cit:CI_Contact>
-                           </cit:contactInfo>
-                        </cit:CI_Organisation>
-                     </cit:party>
-                  </cit:CI_Responsibility>
-               </mex:source>
-            </mex:MD_ExtendedElementInformation>
-         </mex:extendedElementInformation>
-      </mex:MD_MetadataExtensionInformation>
-   </mdb:metadataExtensionInfo>
-   <mdb:identificationInfo>
-      <mri:MD_DataIdentification>
-         <mri:citation>
-            <cit:CI_Citation>
-               <cit:title>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:title/gco:CharacterString</gco:CharacterString>
-               </cit:title>
-               <cit:alternateTitle>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:alternateTitle/gco:CharacterString</gco:CharacterString>
-               </cit:alternateTitle>
-               <cit:alternateTitle>
-                  <gcx:Anchor xlink:href="http://www.example.com/testAnchorSubstitution">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:alternateTitle/gmx:Anchor</gcx:Anchor>
-               </cit:alternateTitle>
-               <cit:alternateTitle>
-                  <gcx:FileName src="http://www.example.com/testFileNameSubstitution">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:alternateTitle/gmx:FileName</gcx:FileName>
-               </cit:alternateTitle>
-               <cit:date>
-                  <cit:CI_Date>
-                     <cit:date>
-                        <gco:DateTime>2011-01-01T00:00:00</gco:DateTime>
-                     </cit:date>
-                     <cit:dateType>
-                        <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode"
-                                             codeListValue="/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date.2/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date.2/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode</cit:CI_DateTypeCode>
-                     </cit:dateType>
-                  </cit:CI_Date>
-               </cit:date>
-               <cit:date>
-                  <cit:CI_Date>
-                     <cit:date>
-                        <gco:DateTime>2011-11-11T00:00:00</gco:DateTime>
-                     </cit:date>
-                     <cit:dateType>
-                        <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode"
-                                             codeListValue="/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode</cit:CI_DateTypeCode>
-                     </cit:dateType>
-                  </cit:CI_Date>
-               </cit:date>
-               <cit:date>
-                  <cit:CI_Date>
-                     <cit:date>
-                        <gco:DateTime>2011-12-22T00:00:00</gco:DateTime>
-                     </cit:date>
-                     <cit:dateType>
-                        <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode"
-                                             codeListValue="/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode</cit:CI_DateTypeCode>
-                     </cit:dateType>
-                  </cit:CI_Date>
-               </cit:date>
-               <cit:date>
-                  <cit:CI_Date>
-                     <cit:date>
-                        <gco:DateTime>2011-12-22T22:22:22</gco:DateTime>
-                     </cit:date>
-                     <cit:dateType>
-                        <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode"
-                                             codeListValue="/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date.2/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date.2/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode</cit:CI_DateTypeCode>
-                     </cit:dateType>
-                  </cit:CI_Date>
-               </cit:date>
-               <cit:date gco:nilReason="unknown"
-                         xlink:title="This is a title attribute on a date"/>
-               <cit:date>
-                  <cit:CI_Date>
-                     <cit:date gco:nilReason="unknown"/>
-                     <cit:dateType>
-                        <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode"
-                                             codeListValue="/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date.2/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date.2/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode</cit:CI_DateTypeCode>
-                     </cit:dateType>
-                  </cit:CI_Date>
-               </cit:date>
-               <cit:edition>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:edition/gco:CharacterString</gco:CharacterString>
-               </cit:edition>
-               <cit:editionDate>
-                  <gco:DateTime>2012-09-09T00:00:00</gco:DateTime>
-               </cit:editionDate>
-               <cit:identifier>
-                  <mcc:MD_Identifier id="MD_Identifier_id">
-                     <mcc:code>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:identifier/gmd:MD_Identifier/gmd:code/gco:CharacterString</gco:CharacterString>
-                     </mcc:code>
-                  </mcc:MD_Identifier>
-               </cit:identifier>
-               <cit:identifier>
-                  <mcc:MD_Identifier id="RS_Identifier_id">
-                     <mcc:code>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:identifier/gmd:RS_Identifier/gmd:code/gco:CharacterString</gco:CharacterString>
-                     </mcc:code>
-                     <mcc:codeSpace>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:identifier/gmd:RS_Identifier/gmd:codeSpace/gco:CharacterString</gco:CharacterString>
-                     </mcc:codeSpace>
-                  </mcc:MD_Identifier>
-               </cit:identifier>
-               <cit:identifier>
-                  <mcc:MD_Identifier>
-                     <mcc:code>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:dataSetURI/gco:CharacterString</gco:CharacterString>
-                     </mcc:code>
-                  </mcc:MD_Identifier>
-               </cit:identifier>
-               <cit:citedResponsibleParty>
-                  <cit:CI_Responsibility id="citedIndOrgPos">
-                     <cit:role>
-                        <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="originator">originator</cit:CI_RoleCode>
-                     </cit:role>
-                     <cit:party>
-                        <cit:CI_Organisation>
-                           <cit:name>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:organisationName/gco:CharacterString</gco:CharacterString>
-                           </cit:name>
-                           <cit:contactInfo>
-                              <cit:CI_Contact>
-                                 <cit:phone>
-                                    <cit:CI_Telephone>
-                                       <cit:number>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:voice/gco:CharacterString</gco:CharacterString>
-                                       </cit:number>
-                                       <cit:numberType>
-                                          <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode" codeListValue="voice">voice</cit:CI_TelephoneTypeCode>
-                                       </cit:numberType>
-                                    </cit:CI_Telephone>
-                                 </cit:phone>
-                                 <cit:phone>
-                                    <cit:CI_Telephone>
-                                       <cit:number>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:facsimile/gco:CharacterString</gco:CharacterString>
-                                       </cit:number>
-                                       <cit:numberType>
-                                          <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode"
-                                                                    codeListValue="facsimile">facsimile</cit:CI_TelephoneTypeCode>
-                                       </cit:numberType>
-                                    </cit:CI_Telephone>
-                                 </cit:phone>
-                                 <cit:address>
-                                    <cit:CI_Address>
-                                       <cit:deliveryPoint>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:deliveryPoint/gco:CharacterString</gco:CharacterString>
-                                       </cit:deliveryPoint>
-                                       <cit:city>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:city/gco:CharacterString</gco:CharacterString>
-                                       </cit:city>
-                                       <cit:administrativeArea>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:administrativeArea/gco:CharacterString</gco:CharacterString>
-                                       </cit:administrativeArea>
-                                       <cit:postalCode>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:postalCode/gco:CharacterString</gco:CharacterString>
-                                       </cit:postalCode>
-                                       <cit:country>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:country/gco:CharacterString</gco:CharacterString>
-                                       </cit:country>
-                                       <cit:electronicMailAddress>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:electronicMailAddress/gco:CharacterString</gco:CharacterString>
-                                       </cit:electronicMailAddress>
-                                    </cit:CI_Address>
-                                 </cit:address>
-                                 <cit:hoursOfService>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:hoursOfService/gco:CharacterString</gco:CharacterString>
-                                 </cit:hoursOfService>
-                                 <cit:contactInstructions>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:contactInstructions/gco:CharacterString</gco:CharacterString>
-                                 </cit:contactInstructions>
-                              </cit:CI_Contact>
-                           </cit:contactInfo>
-                           <cit:individual>
-                              <cit:CI_Individual>
-                                 <cit:name>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString</gco:CharacterString>
-                                 </cit:name>
-                                 <cit:positionName>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:positionName/gco:CharacterString</gco:CharacterString>
-                                 </cit:positionName>
-                              </cit:CI_Individual>
-                           </cit:individual>
-                        </cit:CI_Organisation>
-                     </cit:party>
-                  </cit:CI_Responsibility>
-               </cit:citedResponsibleParty>
-               <cit:citedResponsibleParty>
-                  <cit:CI_Responsibility id="citedInd">
-                     <cit:role>
-                        <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="originator">originator</cit:CI_RoleCode>
-                     </cit:role>
-                     <cit:party>
-                        <cit:CI_Individual>
-                           <cit:name>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty.2/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString</gco:CharacterString>
-                           </cit:name>
-                        </cit:CI_Individual>
-                     </cit:party>
-                  </cit:CI_Responsibility>
-               </cit:citedResponsibleParty>
-               <cit:citedResponsibleParty>
-                  <cit:CI_Responsibility id="citedOrg">
-                     <cit:role>
-                        <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="originator">originator</cit:CI_RoleCode>
-                     </cit:role>
-                     <cit:party>
-                        <cit:CI_Organisation>
-                           <cit:name>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty.3/gmd:CI_ResponsibleParty/gmd:organizationName/gco:CharacterString</gco:CharacterString>
-                           </cit:name>
-                        </cit:CI_Organisation>
-                     </cit:party>
-                  </cit:CI_Responsibility>
-               </cit:citedResponsibleParty>
-               <cit:citedResponsibleParty>
-                  <cit:CI_Responsibility id="citedPos">
-                     <cit:role>
-                        <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="originator">originator</cit:CI_RoleCode>
-                     </cit:role>
-                     <cit:party>
-                        <cit:CI_Individual>
-                           <cit:positionName>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty.4/gmd:CI_ResponsibleParty/gmd:positionName/gco:CharacterString</gco:CharacterString>
-                           </cit:positionName>
-                        </cit:CI_Individual>
-                     </cit:party>
-                  </cit:CI_Responsibility>
-               </cit:citedResponsibleParty>
-               <cit:citedResponsibleParty>
-                  <cit:CI_Responsibility id="citedIndOrg">
-                     <cit:role>
-                        <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="originator">originator</cit:CI_RoleCode>
-                     </cit:role>
-                     <cit:party>
-                        <cit:CI_Organisation>
-                           <cit:name>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty.5/gmd:CI_ResponsibleParty/gmd:organizationName/gco:CharacterString</gco:CharacterString>
-                           </cit:name>
-                           <cit:individual>
-                              <cit:CI_Individual>
-                                 <cit:name>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty.5/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString</gco:CharacterString>
-                                 </cit:name>
-                              </cit:CI_Individual>
-                           </cit:individual>
-                        </cit:CI_Organisation>
-                     </cit:party>
-                  </cit:CI_Responsibility>
-               </cit:citedResponsibleParty>
-               <cit:citedResponsibleParty>
-                  <cit:CI_Responsibility id="citedIndPos">
-                     <cit:role>
-                        <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="originator">originator</cit:CI_RoleCode>
-                     </cit:role>
-                     <cit:party>
-                        <cit:CI_Individual>
-                           <cit:name>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty.6/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString</gco:CharacterString>
-                           </cit:name>
-                           <cit:positionName>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty.6/gmd:CI_ResponsibleParty/gmd:positionName/gco:CharacterString</gco:CharacterString>
-                           </cit:positionName>
-                        </cit:CI_Individual>
-                     </cit:party>
-                  </cit:CI_Responsibility>
-               </cit:citedResponsibleParty>
-               <cit:citedResponsibleParty>
-                  <cit:CI_Responsibility id="citedOrgPos">
-                     <cit:role>
-                        <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="publisher">publisher</cit:CI_RoleCode>
-                     </cit:role>
-                     <cit:party>
-                        <cit:CI_Organisation>
-                           <cit:name>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty.7/gmd:CI_ResponsibleParty/gmd:organizationName/gco:CharacterString</gco:CharacterString>
-                           </cit:name>
-                           <cit:individual>
-                              <cit:CI_Individual>
-                                 <cit:positionName>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty.7/gmd:CI_ResponsibleParty/gmd:positionName/gco:CharacterString</gco:CharacterString>
-                                 </cit:positionName>
-                              </cit:CI_Individual>
-                           </cit:individual>
-                        </cit:CI_Organisation>
-                     </cit:party>
-                  </cit:CI_Responsibility>
-               </cit:citedResponsibleParty>
-               <cit:presentationForm>
-                  <cit:CI_PresentationFormCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_PresentationFormCode"
-                                               codeListValue="mapDigital">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:presentationForm/gmd:CI_PresentationFormCode</cit:CI_PresentationFormCode>
-               </cit:presentationForm>
-               <cit:series>
-                  <cit:CI_Series>
-                     <cit:name>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:series/gmd:CI_Series/gmd:name/gco:CharacterString</gco:CharacterString>
-                     </cit:name>
-                     <cit:issueIdentification>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:series/gmd:CI_Series/gmd:issueIdentification/gco:CharacterString</gco:CharacterString>
-                     </cit:issueIdentification>
-                     <cit:page>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:series/gmd:CI_Series/gmd:page/gco:CharacterString</gco:CharacterString>
-                     </cit:page>
-                  </cit:CI_Series>
-               </cit:series>
-               <cit:otherCitationDetails>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:otherCitationDetails/gco:CharacterString</gco:CharacterString>
-               </cit:otherCitationDetails>
-               <cit:ISBN>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:ISBN/gco:CharacterString</gco:CharacterString>
-               </cit:ISBN>
-               <cit:ISSN>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:ISSN/gco:CharacterString</gco:CharacterString>
-               </cit:ISSN>
-               <cit:onlineResource>
-                  <cit:CI_OnlineResource>
-                     <cit:linkage>
-                        <gco:CharacterString>http://www.example.com/CI_Citation.CI_OnlineResource</gco:CharacterString>
-                     </cit:linkage>
-                     <cit:name>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty.8/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:name/gco:CharacterString</gco:CharacterString>
-                     </cit:name>
-                     <cit:description>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty.8/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:description/gco:CharacterString</gco:CharacterString>
-                     </cit:description>
-                     <cit:function>
-                        <cit:CI_OnLineFunctionCode codeList="" codeListValue="information">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty.8/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:function/gmd:CI_OnLineFunctionCode</cit:CI_OnLineFunctionCode>
-                     </cit:function>
-                  </cit:CI_OnlineResource>
-               </cit:onlineResource>
-            </cit:CI_Citation>
-         </mri:citation>
-         <mri:abstract>
-            <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:abstract/gco:CharacterString</gco:CharacterString>
-         </mri:abstract>
-         <mri:purpose>
-            <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:purpose/gco:CharacterString</gco:CharacterString>
-         </mri:purpose>
-         <mri:status>
-            <mcc:MD_ProgressCode codeList="codeListLocation#MD_ProgressCode"
-                                 codeListValue="/*/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:status/gmd:MD_ProgressCode/@codeListValue">/*/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:status/gmd:MD_ProgressCode/@codeListValue</mcc:MD_ProgressCode>
-         </mri:status>
-         <mri:pointOfContact>
-            <cit:CI_Responsibility>
-               <cit:role>
-                  <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="pointOfContact">pointOfContact</cit:CI_RoleCode>
-               </cit:role>
-               <cit:party>
-                  <cit:CI_Organisation>
-                     <cit:name>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:organisationName/gco:CharacterString</gco:CharacterString>
-                     </cit:name>
-                     <cit:contactInfo>
-                        <cit:CI_Contact>
-                           <cit:phone>
-                              <cit:CI_Telephone>
-                                 <cit:number>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:voice/gco:CharacterString</gco:CharacterString>
-                                 </cit:number>
-                                 <cit:numberType>
-                                    <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode" codeListValue="voice">voice</cit:CI_TelephoneTypeCode>
-                                 </cit:numberType>
-                              </cit:CI_Telephone>
-                           </cit:phone>
-                           <cit:phone>
-                              <cit:CI_Telephone>
-                                 <cit:number>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:facsimile/gco:CharacterString</gco:CharacterString>
-                                 </cit:number>
-                                 <cit:numberType>
-                                    <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode"
-                                                              codeListValue="facsimile">facsimile</cit:CI_TelephoneTypeCode>
-                                 </cit:numberType>
-                              </cit:CI_Telephone>
-                           </cit:phone>
-                           <cit:address>
-                              <cit:CI_Address>
-                                 <cit:deliveryPoint>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:deliveryPoint/gco:CharacterString</gco:CharacterString>
-                                 </cit:deliveryPoint>
-                                 <cit:city>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:city/gco:CharacterString</gco:CharacterString>
-                                 </cit:city>
-                                 <cit:administrativeArea gco:nilReason="missing">
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:administrativeArea/gco:CharacterString</gco:CharacterString>
-                                 </cit:administrativeArea>
-                                 <cit:postalCode>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:postalCode/gco:CharacterString</gco:CharacterString>
-                                 </cit:postalCode>
-                                 <cit:country>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:country/gco:CharacterString</gco:CharacterString>
-                                 </cit:country>
-                                 <cit:electronicMailAddress>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:electronicMailAddress/gco:CharacterString</gco:CharacterString>
-                                 </cit:electronicMailAddress>
-                              </cit:CI_Address>
-                           </cit:address>
-                           <cit:onlineResource>
-                              <cit:CI_OnlineResource>
-                                 <cit:linkage>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:linkage/gmd:URL</gco:CharacterString>
-                                 </cit:linkage>
-                                 <cit:protocol gco:nilReason="/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:protocol/@gco:nilReason">
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:protocol/gco:CharacterString</gco:CharacterString>
-                                 </cit:protocol>
-                                 <cit:name gco:nilReason="/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:name/@gco:nilReason">
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:name/gco:CharacterString</gco:CharacterString>
-                                 </cit:name>
-                                 <cit:description>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:description/gco:CharacterString</gco:CharacterString>
-                                 </cit:description>
-                              </cit:CI_OnlineResource>
-                           </cit:onlineResource>
-                           <cit:hoursOfService>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:hoursOfService/gco:CharacterString</gco:CharacterString>
-                           </cit:hoursOfService>
-                        </cit:CI_Contact>
-                     </cit:contactInfo>
-                     <cit:individual>
-                        <cit:CI_Individual>
-                           <cit:name>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString</gco:CharacterString>
-                           </cit:name>
-                           <cit:positionName>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:positionName/gco:CharacterString</gco:CharacterString>
-                           </cit:positionName>
-                        </cit:CI_Individual>
-                     </cit:individual>
-                  </cit:CI_Organisation>
-               </cit:party>
-            </cit:CI_Responsibility>
-         </mri:pointOfContact>
-         <mri:spatialRepresentationType>
-            <mcc:MD_SpatialRepresentationTypeCode codeList="codeListLocation#MD_SpatialRepresentationTypeCode"
-                                                  codeListValue=""/>
-         </mri:spatialRepresentationType>
-         <mri:spatialResolution>
-            <mri:MD_Resolution>
-               <mri:distance>
-                  <gco:Distance uom="distanceUnits">56777</gco:Distance>
-               </mri:distance>
-            </mri:MD_Resolution>
-         </mri:spatialResolution>
-         <mri:spatialResolution>
-            <mri:MD_Resolution>
-               <mri:equivalentScale>
-                  <mri:MD_RepresentativeFraction id="representativeFractionId">
-                     <mri:denominator>
-                        <gco:Integer>123456789</gco:Integer>
-                     </mri:denominator>
-                  </mri:MD_RepresentativeFraction>
-               </mri:equivalentScale>
-            </mri:MD_Resolution>
-         </mri:spatialResolution>
-         <mri:topicCategory>
-            <mri:MD_TopicCategoryCode>oceans</mri:MD_TopicCategoryCode>
-         </mri:topicCategory>
-         <mri:topicCategory>
-            <mri:MD_TopicCategoryCode>farming</mri:MD_TopicCategoryCode>
-         </mri:topicCategory>
-         <mri:extent>
-            <gex:EX_Extent id="boundingExtent">
-               <gex:description>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:description/gco:CharacterString</gco:CharacterString>
-               </gex:description>
-               <gex:geographicElement>
-                  <gex:EX_GeographicBoundingBox>
-                     <gex:extentTypeCode>
-                        <gco:Boolean>1</gco:Boolean>
-                     </gex:extentTypeCode>
-                     <gex:westBoundLongitude>
-                        <gco:Decimal>11.11123</gco:Decimal>
-                     </gex:westBoundLongitude>
-                     <gex:eastBoundLongitude>
-                        <gco:Decimal>22.222</gco:Decimal>
-                     </gex:eastBoundLongitude>
-                     <gex:southBoundLatitude>
-                        <gco:Decimal>33.333</gco:Decimal>
-                     </gex:southBoundLatitude>
-                     <gex:northBoundLatitude>
-                        <gco:Decimal>44.444</gco:Decimal>
-                     </gex:northBoundLatitude>
-                  </gex:EX_GeographicBoundingBox>
-               </gex:geographicElement>
-               <gex:geographicElement>
-                  <gex:EX_GeographicDescription>
-                     <gex:extentTypeCode>
-                        <gco:Boolean>1</gco:Boolean>
-                     </gex:extentTypeCode>
-                     <gex:geographicIdentifier>
-                        <mcc:MD_Identifier>
-                           <mcc:authority>
-                              <cit:CI_Citation>
-                                 <cit:title>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement.2/gmd:EX_GeographicDescription/gmd:geographicIdentifier/gmd:MD_Identifier/gmd:authority/gmd:CI_Citation/gmd:title/gco:CharacterString</gco:CharacterString>
-                                 </cit:title>
-                                 <cit:date>
-                                    <cit:CI_Date>
-                                       <cit:date>
-                                          <gco:DateTime>2000-06-06T00:00:00</gco:DateTime>
-                                       </cit:date>
-                                       <cit:dateType>
-                                          <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode" codeListValue=""/>
-                                       </cit:dateType>
-                                    </cit:CI_Date>
-                                 </cit:date>
-                              </cit:CI_Citation>
-                           </mcc:authority>
-                           <mcc:code>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement.2/gmd:EX_GeographicDescription/gmd:geographicIdentifier/gmd:MD_Identifier/gmd:code/gco:CharacterString</gco:CharacterString>
-                           </mcc:code>
-                        </mcc:MD_Identifier>
-                     </gex:geographicIdentifier>
-                  </gex:EX_GeographicDescription>
-               </gex:geographicElement>
-               <gex:geographicElement>
-                  <gex:EX_GeographicDescription>
-                     <gex:geographicIdentifier>
-                        <mcc:MD_Identifier>
-                           <mcc:code>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_GeographicDescription/gmd:geographicIdentifier/gmd:MD_Identifier/gmd:code/gco:CharacterString</gco:CharacterString>
-                           </mcc:code>
-                        </mcc:MD_Identifier>
-                     </gex:geographicIdentifier>
-                  </gex:EX_GeographicDescription>
-               </gex:geographicElement>
-               <gex:temporalElement>
-                  <gex:EX_TemporalExtent>
-                     <gex:extent>
-                        <gml:TimePeriod gml:id="tp.114854.81883">
-                           <gml:begin>
-                              <gml:TimeInstant gml:id="start_114854.81883">
-                                 <gml:timePosition>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod/gml:begin/gml:TimeInstant/gml:timePosition</gml:timePosition>
-                              </gml:TimeInstant>
-                           </gml:begin>
-                           <gml:end>
-                              <gml:TimeInstant gml:id="end_114854.81883">
-                                 <gml:timePosition indeterminatePosition="now"/>
-                              </gml:TimeInstant>
-                           </gml:end>
-                        </gml:TimePeriod>
-                     </gex:extent>
-                  </gex:EX_TemporalExtent>
-               </gex:temporalElement>
-               <gex:temporalElement>
-                  <gex:EX_TemporalExtent>
-                     <gex:extent>
-                        <gml:TimePeriod gml:id="tp.114854.81666">
-                           <gml:beginPosition>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod/gml:beginPosition</gml:beginPosition>
-                           <gml:endPosition>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod/gml:endPosition</gml:endPosition>
-                        </gml:TimePeriod>
-                     </gex:extent>
-                  </gex:EX_TemporalExtent>
-               </gex:temporalElement>
-            </gex:EX_Extent>
-         </mri:extent>
-         <mri:resourceMaintenance>
-            <mmi:MD_MaintenanceInformation>
-               <mmi:maintenanceAndUpdateFrequency>
-                  <mmi:MD_MaintenanceFrequencyCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_MaintenanceFrequencyCode"
-                                                   codeListValue="Weekly">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceMaintenance/gmd:MD_MaintenanceInformation/gmd:maintenanceAndUpdateFrequency/gmd:MD_MaintenanceFrequencyCode</mmi:MD_MaintenanceFrequencyCode>
-               </mmi:maintenanceAndUpdateFrequency>
-               <mmi:maintenanceDate>
-                  <cit:CI_Date>
-                     <cit:date>
-                        <gco:DateTime>2012-10-06T00:00:00</gco:DateTime>
-                     </cit:date>
-                     <cit:dateType>
-                        <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode" codeListValue="update">update</cit:CI_DateTypeCode>
-                     </cit:dateType>
-                  </cit:CI_Date>
-               </mmi:maintenanceDate>
-            </mmi:MD_MaintenanceInformation>
-         </mri:resourceMaintenance>
-         <mri:graphicOverview>
-            <mcc:MD_BrowseGraphic>
-               <mcc:fileName>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:graphicOverview/gmd:MD_BrowseGraphic/gmd:fileName/gco:CharacterString</gco:CharacterString>
-               </mcc:fileName>
-               <mcc:fileDescription>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:graphicOverview/gmd:MD_BrowseGraphic/gmd:fileDescription/gco:CharacterString</gco:CharacterString>
-               </mcc:fileDescription>
-               <mcc:fileType>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:graphicOverview/gmd:MD_BrowseGraphic/gmd:fileType/gco:CharacterString</gco:CharacterString>
-               </mcc:fileType>
-            </mcc:MD_BrowseGraphic>
-         </mri:graphicOverview>
-         <mri:graphicOverview>
-            <mcc:MD_BrowseGraphic>
-               <mcc:fileName>
-                  <gcx:FileName src="http://browseGraphicFileName"/>
-               </mcc:fileName>
-               <mcc:fileDescription>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:graphicOverview/gmd:MD_BrowseGraphic[2]/gmd:fileDescription/gco:CharacterString</gco:CharacterString>
-               </mcc:fileDescription>
-               <mcc:fileType>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:graphicOverview/gmd:MD_BrowseGraphic[2]/gmd:fileType/gco:CharacterString</gco:CharacterString>
-               </mcc:fileType>
-            </mcc:MD_BrowseGraphic>
-         </mri:graphicOverview>
-         <mri:graphicOverview>
-            <mcc:MD_BrowseGraphic>
-               <mcc:fileName>
-                  <gcx:Anchor xlink:href="http://browseGraphicAnchor"/>
-               </mcc:fileName>
-               <mcc:fileDescription>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:graphicOverview/gmd:MD_BrowseGraphic[3]/gmd:fileDescription/gco:CharacterString</gco:CharacterString>
-               </mcc:fileDescription>
-               <mcc:fileType>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:graphicOverview/gmd:MD_BrowseGraphic[3]/gmd:fileType/gco:CharacterString</gco:CharacterString>
-               </mcc:fileType>
-            </mcc:MD_BrowseGraphic>
-         </mri:graphicOverview>
-         <mri:resourceFormat>
-            <mrd:MD_Format>
-               <mrd:formatSpecificationCitation>
-                  <cit:CI_Citation>
-                     <cit:title>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceFormat/gmd:MD_Format/gmd:name/gco:CharacterString</gco:CharacterString>
-                     </cit:title>
-                     <cit:alternateTitle>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceFormat/gmd:MD_Format/gmd:specification/gco:CharacterString</gco:CharacterString>
-                     </cit:alternateTitle>
-                     <cit:date gco:nilReason="unknown"/>
-                     <cit:edition>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceFormat/gmd:MD_Format/gmd:version/gco:CharacterString</gco:CharacterString>
-                     </cit:edition>
-                     <cit:identifier>
-                        <mcc:MD_Identifier>
-                           <mcc:code>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceFormat/gmd:MD_Format/gmd:name/gco:CharacterString</gco:CharacterString>
-                           </mcc:code>
-                        </mcc:MD_Identifier>
-                     </cit:identifier>
-                  </cit:CI_Citation>
-               </mrd:formatSpecificationCitation>
-               <mrd:amendmentNumber>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceFormat/gmd:MD_Format/gmd:amendmentNumber/gco:CharacterString</gco:CharacterString>
-               </mrd:amendmentNumber>
-               <mrd:fileDecompressionTechnique>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceFormat/gmd:MD_Format/gmd:fileDecompressionTechnique/gco:CharacterString</gco:CharacterString>
-               </mrd:fileDecompressionTechnique>
-            </mrd:MD_Format>
-         </mri:resourceFormat>
-         <mri:resourceFormat>
-            <mrd:MD_Format>
-               <mrd:formatSpecificationCitation>
-                  <cit:CI_Citation>
-                     <cit:title>
-                        <gcx:Anchor xlink:href="http://www.example.com/testAnchorSubstitution">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceFormat/gmd:MD_Format/gmd:name/gmx:Anchor</gcx:Anchor>
-                     </cit:title>
-                     <cit:alternateTitle>
-                        <gcx:FileName src="http://www.example.com/testFileNameSubstitution">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceFormat/gmd:MD_Format/gmd:specification/gmx:FileName</gcx:FileName>
-                     </cit:alternateTitle>
-                     <cit:date gco:nilReason="unknown"/>
-                     <cit:edition>
-                        <gcx:Anchor xlink:href="http://www.example.com/testAnchorSubstitution">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceFormat/gmd:MD_Format/gmd:version/gmx:Anchor</gcx:Anchor>
-                     </cit:edition>
-                     <cit:identifier>
-                        <mcc:MD_Identifier>
-                           <mcc:code>
-                              <gcx:Anchor xlink:href="http://www.example.com/testAnchorSubstitution">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceFormat/gmd:MD_Format/gmd:name/gmx:Anchor</gcx:Anchor>
-                           </mcc:code>
-                        </mcc:MD_Identifier>
-                     </cit:identifier>
-                  </cit:CI_Citation>
-               </mrd:formatSpecificationCitation>
-               <mrd:amendmentNumber>
-                  <gcx:FileName src="http://www.example.com/testFileNameSubstitution">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceFormat/gmd:MD_Format/gmd:amendmentNumber/gmx:FileName</gcx:FileName>
-               </mrd:amendmentNumber>
-               <mrd:fileDecompressionTechnique>
-                  <gcx:Anchor xlink:href="http://www.example.com/testAnchorSubstitution">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceFormat/gmd:MD_Format/gmd:fileDecompressionTechnique/gmx:Anchor</gcx:Anchor>
-               </mrd:fileDecompressionTechnique>
-            </mrd:MD_Format>
-         </mri:resourceFormat>
-         <mri:descriptiveKeywords>
-            <mri:MD_Keywords>
-               <mri:keyword>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords/gmd:MD_Keywords/gmd:keyword/gco:CharacterString</gco:CharacterString>
-               </mri:keyword>
-               <mri:keyword>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords/gmd:MD_Keywords/gmd:keyword.2/gco:CharacterString</gco:CharacterString>
-               </mri:keyword>
-               <mri:type>
-                  <mri:MD_KeywordTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_KeywordTypeCode"
-                                          codeListValue="theme">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords/gmd:MD_Keywords/gmd:type/gmd:MD_KeywordTypeCode</mri:MD_KeywordTypeCode>
-               </mri:type>
-               <mri:thesaurusName>
-                  <cit:CI_Citation>
-                     <cit:title>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:title/gco:CharacterString</gco:CharacterString>
-                     </cit:title>
-                     <cit:date>
-                        <cit:CI_Date>
-                           <cit:date>
-                              <gco:DateTime>2011-10-10T00:00:00</gco:DateTime>
-                           </cit:date>
-                           <cit:dateType>
-                              <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode" codeListValue=""/>
-                           </cit:dateType>
-                        </cit:CI_Date>
-                     </cit:date>
-                  </cit:CI_Citation>
-               </mri:thesaurusName>
-            </mri:MD_Keywords>
-         </mri:descriptiveKeywords>
-         <mri:descriptiveKeywords>
-            <mri:MD_Keywords>
-               <mri:keyword>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.2/gmd:MD_Keywords/gmd:keyword/gco:CharacterString</gco:CharacterString>
-               </mri:keyword>
-               <mri:type>
-                  <mri:MD_KeywordTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_KeywordTypeCode"
-                                          codeListValue="theme">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.2/gmd:MD_Keywords/gmd:type/gmd:MD_KeywordTypeCode</mri:MD_KeywordTypeCode>
-               </mri:type>
-               <mri:thesaurusName>
-                  <cit:CI_Citation>
-                     <cit:title>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.2/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:title/gco:CharacterString</gco:CharacterString>
-                     </cit:title>
-                     <cit:date>
-                        <cit:CI_Date>
-                           <cit:date>
-                              <gco:DateTime>2011-05-05T00:00:00</gco:DateTime>
-                           </cit:date>
-                           <cit:dateType>
-                              <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode" codeListValue=""/>
-                           </cit:dateType>
-                        </cit:CI_Date>
-                     </cit:date>
-                  </cit:CI_Citation>
-               </mri:thesaurusName>
-            </mri:MD_Keywords>
-         </mri:descriptiveKeywords>
-         <mri:descriptiveKeywords>
-            <mri:MD_Keywords>
-               <mri:keyword>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.3/gmd:MD_Keywords/gmd:keyword/gco:CharacterString</gco:CharacterString>
-               </mri:keyword>
-               <mri:type>
-                  <mri:MD_KeywordTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_KeywordTypeCode"
-                                          codeListValue="place">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.3/gmd:MD_Keywords/gmd:type/gmd:MD_KeywordTypeCode</mri:MD_KeywordTypeCode>
-               </mri:type>
-               <mri:thesaurusName>
-                  <cit:CI_Citation>
-                     <cit:title>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.3/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:title/gco:CharacterString</gco:CharacterString>
-                     </cit:title>
-                     <cit:date>
-                        <cit:CI_Date>
-                           <cit:date>
-                              <gco:DateTime>2011-07-07T00:00:00</gco:DateTime>
-                           </cit:date>
-                           <cit:dateType>
-                              <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode" codeListValue=""/>
-                           </cit:dateType>
-                        </cit:CI_Date>
-                     </cit:date>
-                  </cit:CI_Citation>
-               </mri:thesaurusName>
-            </mri:MD_Keywords>
-         </mri:descriptiveKeywords>
-         <mri:descriptiveKeywords>
-            <mri:MD_Keywords>
-               <mri:keyword>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.4/gmd:MD_Keywords/gmd:keyword/gco:CharacterString</gco:CharacterString>
-               </mri:keyword>
-               <mri:type>
-                  <mri:MD_KeywordTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_KeywordTypeCode"
-                                          codeListValue="theme">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.4/gmd:MD_Keywords/gmd:type/gmd:MD_KeywordTypeCode</mri:MD_KeywordTypeCode>
-               </mri:type>
-               <mri:thesaurusName>
-                  <cit:CI_Citation>
-                     <cit:title>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.4/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:title/gco:CharacterString</gco:CharacterString>
-                     </cit:title>
-                     <cit:date>
-                        <cit:CI_Date>
-                           <cit:date>
-                              <gco:DateTime>2011-06-06T00:00:00</gco:DateTime>
-                           </cit:date>
-                           <cit:dateType>
-                              <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode" codeListValue=""/>
-                           </cit:dateType>
-                        </cit:CI_Date>
-                     </cit:date>
-                  </cit:CI_Citation>
-               </mri:thesaurusName>
-            </mri:MD_Keywords>
-         </mri:descriptiveKeywords>
-         <mri:descriptiveKeywords>
-            <mri:MD_Keywords>
-               <mri:keyword>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.5/gmd:MD_Keywords/gmd:keyword/gco:CharacterString</gco:CharacterString>
-               </mri:keyword>
-               <mri:keyword>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.5/gmd:MD_Keywords/gmd:keyword.2/gco:CharacterString</gco:CharacterString>
-               </mri:keyword>
-               <mri:type>
-                  <mri:MD_KeywordTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_KeywordTypeCode"
-                                          codeListValue="theme">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.5/gmd:MD_Keywords/gmd:type/gmd:MD_KeywordTypeCode</mri:MD_KeywordTypeCode>
-               </mri:type>
-               <mri:thesaurusName>
-                  <cit:CI_Citation>
-                     <cit:title>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.5/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:title/gco:CharacterString</gco:CharacterString>
-                     </cit:title>
-                     <cit:date>
-                        <cit:CI_Date>
-                           <cit:date>
-                              <gco:DateTime>2011-08-08T00:00:00</gco:DateTime>
-                           </cit:date>
-                           <cit:dateType>
-                              <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode" codeListValue=""/>
-                           </cit:dateType>
-                        </cit:CI_Date>
-                     </cit:date>
-                  </cit:CI_Citation>
-               </mri:thesaurusName>
-            </mri:MD_Keywords>
-         </mri:descriptiveKeywords>
-         <mri:descriptiveKeywords>
-            <mri:MD_Keywords>
-               <mri:keyword>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.6/gmd:MD_Keywords/gmd:keyword/gco:CharacterString</gco:CharacterString>
-               </mri:keyword>
-               <mri:type>
-                  <mri:MD_KeywordTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_KeywordTypeCode"
-                                          codeListValue="theme">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.6/gmd:MD_Keywords/gmd:type/gmd:MD_KeywordTypeCode</mri:MD_KeywordTypeCode>
-               </mri:type>
-               <mri:thesaurusName>
-                  <cit:CI_Citation>
-                     <cit:title>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.6/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:title/gco:CharacterString</gco:CharacterString>
-                     </cit:title>
-                     <cit:date>
-                        <cit:CI_Date>
-                           <cit:date>
-                              <gco:DateTime>2011-09-09T00:00:00</gco:DateTime>
-                           </cit:date>
-                           <cit:dateType>
-                              <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode"
-                                                   codeListValue="/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.6/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.6/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode</cit:CI_DateTypeCode>
-                           </cit:dateType>
-                        </cit:CI_Date>
-                     </cit:date>
-                     <cit:edition>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.6/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:edition/gco:CharacterString</gco:CharacterString>
-                     </cit:edition>
-                     <cit:citedResponsibleParty>
-                        <cit:CI_Responsibility>
-                           <cit:role>
-                              <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="publisher">publisher</cit:CI_RoleCode>
-                           </cit:role>
-                           <cit:party>
-                              <cit:CI_Organisation>
-                                 <cit:name>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.6/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:organisationName/gco:CharacterString</gco:CharacterString>
-                                 </cit:name>
-                                 <cit:contactInfo>
-                                    <cit:CI_Contact>
-                                       <cit:address>
-                                          <cit:CI_Address>
-                                             <cit:deliveryPoint>
-                                                <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.6/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:deliveryPoint/gco:CharacterString</gco:CharacterString>
-                                             </cit:deliveryPoint>
-                                             <cit:city>
-                                                <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.6/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:city/gco:CharacterString</gco:CharacterString>
-                                             </cit:city>
-                                             <cit:administrativeArea>
-                                                <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.6/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:administrativeArea/gco:CharacterString</gco:CharacterString>
-                                             </cit:administrativeArea>
-                                             <cit:postalCode>
-                                                <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.6/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:postalCode/gco:CharacterString</gco:CharacterString>
-                                             </cit:postalCode>
-                                             <cit:country>
-                                                <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.6/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:country/gco:CharacterString</gco:CharacterString>
-                                             </cit:country>
-                                          </cit:CI_Address>
-                                       </cit:address>
-                                       <cit:onlineResource>
-                                          <cit:CI_OnlineResource>
-                                             <cit:linkage>
-                                                <gco:CharacterString>http://www.example.com/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:linkage/gmd:URL</gco:CharacterString>
-                                             </cit:linkage>
-                                             <cit:protocol>
-                                                <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.6/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:protocol/gco:CharacterString</gco:CharacterString>
-                                             </cit:protocol>
-                                             <cit:applicationProfile>
-                                                <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.6/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:applicationProfile/gco:CharacterString</gco:CharacterString>
-                                             </cit:applicationProfile>
-                                             <cit:name>
-                                                <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.6/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:name/gco:CharacterString</gco:CharacterString>
-                                             </cit:name>
-                                             <cit:description>
-                                                <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.6/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:description/gco:CharacterString</gco:CharacterString>
-                                             </cit:description>
-                                             <cit:function>
-                                                <cit:CI_OnLineFunctionCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode"
-                                                                           codeListValue="information">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.6/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:function/gmd:CI_OnLineFunctionCode</cit:CI_OnLineFunctionCode>
-                                             </cit:function>
-                                          </cit:CI_OnlineResource>
-                                       </cit:onlineResource>
-                                    </cit:CI_Contact>
-                                 </cit:contactInfo>
-                              </cit:CI_Organisation>
-                           </cit:party>
-                        </cit:CI_Responsibility>
-                     </cit:citedResponsibleParty>
-                     <cit:onlineResource>
-                        <cit:CI_OnlineResource>
-                           <cit:linkage>
-                              <gco:CharacterString>http://www.example.com/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:linkage/gmd:URL</gco:CharacterString>
-                           </cit:linkage>
-                           <cit:protocol>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.6/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:protocol/gco:CharacterString</gco:CharacterString>
-                           </cit:protocol>
-                           <cit:applicationProfile>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.6/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:applicationProfile/gco:CharacterString</gco:CharacterString>
-                           </cit:applicationProfile>
-                           <cit:name>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.6/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:name/gco:CharacterString</gco:CharacterString>
-                           </cit:name>
-                           <cit:description>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.6/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:description/gco:CharacterString</gco:CharacterString>
-                           </cit:description>
-                           <cit:function>
-                              <cit:CI_OnLineFunctionCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode"
-                                                         codeListValue="information">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords.6/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:function/gmd:CI_OnLineFunctionCode</cit:CI_OnLineFunctionCode>
-                           </cit:function>
-                        </cit:CI_OnlineResource>
-                     </cit:onlineResource>
-                  </cit:CI_Citation>
-               </mri:thesaurusName>
-            </mri:MD_Keywords>
-         </mri:descriptiveKeywords>
-         <mri:resourceSpecificUsage>
-            <mri:MD_Usage>
-               <mri:specificUsage>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceSpecificUsage/gmd:MD_Usage/gmd:specificUsage/gco:CharacterString</gco:CharacterString>
-               </mri:specificUsage>
-               <mri:usageDateTime>
-                  <gml:TimeInstant gml:id="d6e1116">
-                     <gml:timePosition>2012-10-06T17:36:00</gml:timePosition>
-                  </gml:TimeInstant>
-               </mri:usageDateTime>
-               <mri:userDeterminedLimitations>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceSpecificUsage/gmd:MD_Usage/gmd:userDeterminedLimitations/gco:CharacterString/</gco:CharacterString>
-               </mri:userDeterminedLimitations>
-               <mri:userContactInfo>
-                  <cit:CI_Responsibility>
-                     <cit:role>
-                        <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode"
-                                         codeListValue="/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceSpecificUsage/gmd:MD_Usage/gmd:userContactInfo/gmd:CI_ResponsibleParty/gmd:role/gmd:CI_RoleCode/@codeListValue">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceSpecificUsage/gmd:MD_Usage/gmd:userContactInfo/gmd:CI_ResponsibleParty/gmd:role/gmd:CI_RoleCode/@codeListValue</cit:CI_RoleCode>
-                     </cit:role>
-                     <cit:party>
-                        <cit:CI_Organisation>
-                           <cit:name>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceSpecificUsage/gmd:MD_Usage/gmd:userContactInfo/gmd:CI_ResponsibleParty/gmd:organisationName</gco:CharacterString>
-                           </cit:name>
-                           <cit:contactInfo>
-                              <cit:CI_Contact>
-                                 <cit:address>
-                                    <cit:CI_Address>
-                                       <cit:electronicMailAddress>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceSpecificUsage/gmd:MD_Usage/gmd:userContactInfo/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:electronicMailAddress</gco:CharacterString>
-                                       </cit:electronicMailAddress>
-                                    </cit:CI_Address>
-                                 </cit:address>
-                              </cit:CI_Contact>
-                           </cit:contactInfo>
-                           <cit:individual>
-                              <cit:CI_Individual>
-                                 <cit:name>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceSpecificUsage/gmd:MD_Usage/gmd:userContactInfo/gmd:CI_ResponsibleParty/gmd:individualName</gco:CharacterString>
-                                 </cit:name>
-                                 <cit:positionName>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceSpecificUsage/gmd:MD_Usage/gmd:userContactInfo/gmd:CI_ResponsibleParty/gmd:positionName</gco:CharacterString>
-                                 </cit:positionName>
-                              </cit:CI_Individual>
-                           </cit:individual>
-                        </cit:CI_Organisation>
-                     </cit:party>
-                  </cit:CI_Responsibility>
-               </mri:userContactInfo>
-            </mri:MD_Usage>
-         </mri:resourceSpecificUsage>
-         <mri:resourceConstraints>
-            <mco:MD_Constraints>
-               <mco:useLimitation>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceConstraints/gmd:MD_Constraints/gmd:useLimitation/gco:CharacterString</gco:CharacterString>
-               </mco:useLimitation>
-            </mco:MD_Constraints>
-         </mri:resourceConstraints>
-         <mri:resourceConstraints>
-            <mco:MD_LegalConstraints>
-               <mco:useLimitation>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:useLimitation/gco:CharacterString</gco:CharacterString>
-               </mco:useLimitation>
-               <mco:useLimitation>
-                  <gcx:Anchor xlink:href="/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:useLimitation/gmx:Anchor/@xlink:href">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:useLimitation/gmx:Anchor</gcx:Anchor>
-               </mco:useLimitation>
-               <mco:accessConstraints>
-                  <mco:MD_RestrictionCode codeList="" codeListValue="">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:accessConstraints/gmd:MD_RestrictionCode</mco:MD_RestrictionCode>
-               </mco:accessConstraints>
-               <mco:useConstraints>
-                  <mco:MD_RestrictionCode codeList="" codeListValue="">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:useConstraints/gmd:MD_RestrictionCode</mco:MD_RestrictionCode>
-               </mco:useConstraints>
-               <mco:otherConstraints>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:otherConstraints/gco:CharacterString</gco:CharacterString>
-               </mco:otherConstraints>
-               <mco:otherConstraints>
-                  <gcx:Anchor xlink:href="/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:otherConstraints/gmx:Anchor/@xlink:href">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:otherConstraints/gmx:Anchor</gcx:Anchor>
-               </mco:otherConstraints>
-            </mco:MD_LegalConstraints>
-         </mri:resourceConstraints>
-         <mri:resourceConstraints>
-            <mco:MD_SecurityConstraints>
-               <mco:useLimitation>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceConstraints/gmd:MD_SecurityConstraints/gmd:useLimitation/gco:CharacterString</gco:CharacterString>
-               </mco:useLimitation>
-               <mco:classification>
-                  <mco:MD_ClassificationCode codeList="" codeListValue="">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceConstraints/gmd:MD_SecurityConstraints/gmd:classification/gmd:MD_ClassificationCode</mco:MD_ClassificationCode>
-               </mco:classification>
-               <mco:classificationSystem>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceConstraints/gmd:MD_SecurityConstraints/gmd:classificationSystem/gco:CharacterString</gco:CharacterString>
-               </mco:classificationSystem>
-               <mco:handlingDescription>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceConstraints/gmd:MD_SecurityConstraints/gmd:handlingDescription/gco:CharacterString</gco:CharacterString>
-               </mco:handlingDescription>
-            </mco:MD_SecurityConstraints>
-         </mri:resourceConstraints>
-         <mri:associatedResource>
-            <mri:MD_AssociatedResource id="nameIdentifier">
-               <mri:name>
-                  <cit:CI_Citation>
-                     <cit:title>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.1/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:title/gco:CharacterString</gco:CharacterString>
-                     </cit:title>
-                     <cit:date>
-                        <cit:CI_Date>
-                           <cit:date>
-                              <gco:DateTime>2000-05-05T00:00:00</gco:DateTime>
-                           </cit:date>
-                           <cit:dateType>
-                              <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode"
-                                                   codeListValue="/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.1/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.1/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode</cit:CI_DateTypeCode>
-                           </cit:dateType>
-                        </cit:CI_Date>
-                     </cit:date>
-                     <cit:edition>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.1/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:edition/gco:CharacterString</gco:CharacterString>
-                     </cit:edition>
-                     <cit:identifier>
-                        <mcc:MD_Identifier>
-                           <mcc:code>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.1/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:identifier/gmd:MD_Identifier/gmd:code/gco:CharacterString</gco:CharacterString>
-                           </mcc:code>
-                        </mcc:MD_Identifier>
-                     </cit:identifier>
-                     <cit:identifier>
-                        <mcc:MD_Identifier>
-                           <mcc:authority>
-                              <cit:CI_Citation>
-                                 <cit:title>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo/gmd:MD_AggregateInformation/gmd:aggregateDataSetIdentifier/gmd:MD_Identifier/gmd:authority/gmd:CI_Citation/gmd:title</gco:CharacterString>
-                                 </cit:title>
-                                 <cit:date gco:nilReason="withheld"/>
-                              </cit:CI_Citation>
-                           </mcc:authority>
-                           <mcc:code>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo/gmd:MD_AggregateInformation/gmd:aggregateDataSetIdentifier/gmd:MD_Identifier/gmd:code</gco:CharacterString>
-                           </mcc:code>
-                        </mcc:MD_Identifier>
-                     </cit:identifier>
-                     <cit:citedResponsibleParty>
-                        <cit:CI_Responsibility id="fgdccitation_22753.114849.926657.1">
-                           <cit:role>
-                              <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="originator">originator</cit:CI_RoleCode>
-                           </cit:role>
-                           <cit:party>
-                              <cit:CI_Individual>
-                                 <cit:name>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.1/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:citedResponsibleParty.1/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString</gco:CharacterString>
-                                 </cit:name>
-                              </cit:CI_Individual>
-                           </cit:party>
-                        </cit:CI_Responsibility>
-                     </cit:citedResponsibleParty>
-                     <cit:citedResponsibleParty>
-                        <cit:CI_Responsibility id="fgdccitation_22753.114849.926657.2">
-                           <cit:role>
-                              <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="originator">originator</cit:CI_RoleCode>
-                           </cit:role>
-                           <cit:party>
-                              <cit:CI_Individual>
-                                 <cit:name>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.1/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:citedResponsibleParty.2/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString</gco:CharacterString>
-                                 </cit:name>
-                              </cit:CI_Individual>
-                           </cit:party>
-                        </cit:CI_Responsibility>
-                     </cit:citedResponsibleParty>
-                     <cit:citedResponsibleParty>
-                        <cit:CI_Responsibility id="fgdccitation_22753.114849.926657.3">
-                           <cit:role>
-                              <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="originator">originator</cit:CI_RoleCode>
-                           </cit:role>
-                           <cit:party>
-                              <cit:CI_Individual>
-                                 <cit:name>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.1/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:citedResponsibleParty.3/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString</gco:CharacterString>
-                                 </cit:name>
-                              </cit:CI_Individual>
-                           </cit:party>
-                        </cit:CI_Responsibility>
-                     </cit:citedResponsibleParty>
-                     <cit:citedResponsibleParty>
-                        <cit:CI_Responsibility id="fgdccitation_22753.114849.926657.4">
-                           <cit:role>
-                              <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="publisher">publisher</cit:CI_RoleCode>
-                           </cit:role>
-                           <cit:party>
-                              <cit:CI_Individual>
-                                 <cit:name>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:citedResponsibleParty.4/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString</gco:CharacterString>
-                                 </cit:name>
-                              </cit:CI_Individual>
-                           </cit:party>
-                        </cit:CI_Responsibility>
-                     </cit:citedResponsibleParty>
-                     <cit:citedResponsibleParty/>
-                     <cit:onlineResource>
-                        <cit:CI_OnlineResource id="onlineresource_4366.114850.97754">
-                           <cit:linkage>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:citedResponsibleParty.5/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:linkage/gmd:URL</gco:CharacterString>
-                           </cit:linkage>
-                           <cit:protocol>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:citedResponsibleParty.5/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:protocol/gco:CharacterString</gco:CharacterString>
-                           </cit:protocol>
-                           <cit:applicationProfile>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:citedResponsibleParty.5/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:applicationProfile/gco:CharacterString</gco:CharacterString>
-                           </cit:applicationProfile>
-                           <cit:name>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:citedResponsibleParty.5/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:name/gco:CharacterString</gco:CharacterString>
-                           </cit:name>
-                           <cit:description>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:citedResponsibleParty.5/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:description/gco:CharacterString</gco:CharacterString>
-                           </cit:description>
-                           <cit:function>
-                              <cit:CI_OnLineFunctionCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode"
-                                                         codeListValue="information">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:citedResponsibleParty.5/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:function/gmd:CI_OnLineFunctionCode</cit:CI_OnLineFunctionCode>
-                           </cit:function>
-                        </cit:CI_OnlineResource>
-                     </cit:onlineResource>
-                  </cit:CI_Citation>
-               </mri:name>
-               <mri:associationType>
-                  <mri:DS_AssociationTypeCode codeList="codeListLocation#DS_AssociationTypeCode"
-                                              codeListValue="/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo/gmd:MD_AggregateInformation/gmd:associationType/gmd:DS_AssociationTypeCode">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo/gmd:MD_AggregateInformation/gmd:associationType/gmd:DS_AssociationTypeCode</mri:DS_AssociationTypeCode>
-               </mri:associationType>
-               <mri:initiativeType>
-                  <mri:DS_InitiativeTypeCode codeList="codeListLocation#DS_InitiativeTypeCode"
-                                             codeListValue="/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo/gmd:MD_AggregateInformation/gmd:initiativeType/gmd:DS_InitiativeTypeCode">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo/gmd:MD_AggregateInformation/gmd:initiativeType/gmd:DS_InitiativeTypeCode</mri:DS_InitiativeTypeCode>
-               </mri:initiativeType>
-            </mri:MD_AssociatedResource>
-         </mri:associatedResource>
-         <mri:associatedResource>
-            <mri:MD_AssociatedResource id="name">
-               <mri:name>
-                  <cit:CI_Citation>
-                     <cit:title>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.2/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:title/gco:CharacterString</gco:CharacterString>
-                     </cit:title>
-                     <cit:date>
-                        <cit:CI_Date>
-                           <cit:date>
-                              <gco:DateTime>2000-01-02T00:00:00</gco:DateTime>
-                           </cit:date>
-                           <cit:dateType>
-                              <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode"
-                                                   codeListValue="/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.2/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.2/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode</cit:CI_DateTypeCode>
-                           </cit:dateType>
-                        </cit:CI_Date>
-                     </cit:date>
-                     <cit:edition>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.2/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:edition/gco:CharacterString</gco:CharacterString>
-                     </cit:edition>
-                     <cit:identifier>
-                        <mcc:MD_Identifier>
-                           <mcc:code>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.2/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:identifier/gmd:MD_Identifier/gmd:code/gco:CharacterString</gco:CharacterString>
-                           </mcc:code>
-                        </mcc:MD_Identifier>
-                     </cit:identifier>
-                     <cit:citedResponsibleParty>
-                        <cit:CI_Responsibility id="fgdccitation_22425.114851.062325.1">
-                           <cit:role>
-                              <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="originator">originator</cit:CI_RoleCode>
-                           </cit:role>
-                           <cit:party>
-                              <cit:CI_Individual>
-                                 <cit:name>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.2/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString</gco:CharacterString>
-                                 </cit:name>
-                              </cit:CI_Individual>
-                           </cit:party>
-                        </cit:CI_Responsibility>
-                     </cit:citedResponsibleParty>
-                     <cit:citedResponsibleParty>
-                        <cit:CI_Responsibility id="fgdccitation_22425.114851.062325.2">
-                           <cit:role>
-                              <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="originator">originator</cit:CI_RoleCode>
-                           </cit:role>
-                           <cit:party>
-                              <cit:CI_Individual>
-                                 <cit:name>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.2/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:citedResponsibleParty.2/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString</gco:CharacterString>
-                                 </cit:name>
-                              </cit:CI_Individual>
-                           </cit:party>
-                        </cit:CI_Responsibility>
-                     </cit:citedResponsibleParty>
-                     <cit:citedResponsibleParty>
-                        <cit:CI_Responsibility id="fgdccitation_22425.114851.062325.3">
-                           <cit:role>
-                              <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="originator">originator</cit:CI_RoleCode>
-                           </cit:role>
-                           <cit:party>
-                              <cit:CI_Individual>
-                                 <cit:name>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.2/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:citedResponsibleParty.3/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString</gco:CharacterString>
-                                 </cit:name>
-                              </cit:CI_Individual>
-                           </cit:party>
-                        </cit:CI_Responsibility>
-                     </cit:citedResponsibleParty>
-                     <cit:citedResponsibleParty>
-                        <cit:CI_Responsibility id="fgdccitation_22425.114851.062325.4">
-                           <cit:role>
-                              <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="publisher">publisher</cit:CI_RoleCode>
-                           </cit:role>
-                           <cit:party>
-                              <cit:CI_Individual>
-                                 <cit:name>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.2/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:citedResponsibleParty.4/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString</gco:CharacterString>
-                                 </cit:name>
-                              </cit:CI_Individual>
-                           </cit:party>
-                        </cit:CI_Responsibility>
-                     </cit:citedResponsibleParty>
-                     <cit:citedResponsibleParty/>
-                     <cit:onlineResource>
-                        <cit:CI_OnlineResource id="onlineresource_3523.114852.10837">
-                           <cit:linkage>
-                              <gco:CharacterString>http://www.example.com/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.2/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:citedResponsibleParty.5/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:linkage/gmd:URL</gco:CharacterString>
-                           </cit:linkage>
-                           <cit:protocol>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.2/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:citedResponsibleParty.5/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:protocol/gco:CharacterString</gco:CharacterString>
-                           </cit:protocol>
-                           <cit:applicationProfile>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.2/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:citedResponsibleParty.5/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:applicationProfile/gco:CharacterString</gco:CharacterString>
-                           </cit:applicationProfile>
-                           <cit:name>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.2/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:citedResponsibleParty.5/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:name/gco:CharacterString</gco:CharacterString>
-                           </cit:name>
-                           <cit:description>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.2/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:citedResponsibleParty.5/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:description/gco:CharacterString</gco:CharacterString>
-                           </cit:description>
-                           <cit:function>
-                              <cit:CI_OnLineFunctionCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode"
-                                                         codeListValue="information">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.2/gmd:MD_AggregateInformation/gmd:aggregateDataSetName/gmd:CI_Citation/gmd:citedResponsibleParty.5/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:function/gmd:CI_OnLineFunctionCode</cit:CI_OnLineFunctionCode>
-                           </cit:function>
-                        </cit:CI_OnlineResource>
-                     </cit:onlineResource>
-                  </cit:CI_Citation>
-               </mri:name>
-               <mri:associationType>
-                  <mri:DS_AssociationTypeCode codeList="codeListLocation#DS_AssociationTypeCode"
-                                              codeListValue="/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.2/gmd:MD_AggregateInformation/gmd:associationType/gmd:DS_AssociationTypeCode">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.2/gmd:MD_AggregateInformation/gmd:associationType/gmd:DS_AssociationTypeCode</mri:DS_AssociationTypeCode>
-               </mri:associationType>
-               <mri:initiativeType>
-                  <mri:DS_InitiativeTypeCode codeList="codeListLocation#DS_InitiativeTypeCode"
-                                             codeListValue="/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.2/gmd:MD_AggregateInformation/gmd:initiativeType/gmd:DS_InitiativeTypeCode">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.2/gmd:MD_AggregateInformation/gmd:initiativeType/gmd:DS_InitiativeTypeCode</mri:DS_InitiativeTypeCode>
-               </mri:initiativeType>
-            </mri:MD_AssociatedResource>
-         </mri:associatedResource>
-         <mri:associatedResource>
-            <mri:MD_AssociatedResource id="identifier">
-               <mri:name>
-                  <cit:CI_Citation>
-                     <cit:title>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.3/gmd:MD_AggregateInformation/gmd:aggregateDataSetIdentifier/gmd:MD_Identifier/gmd:authority/gmd:CI_Citation/gmd:title</gco:CharacterString>
-                     </cit:title>
-                     <cit:date gco:nilReason="unknown"/>
-                     <cit:identifier>
-                        <mcc:MD_Identifier>
-                           <mcc:authority>
-                              <cit:CI_Citation>
-                                 <cit:title>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.3/gmd:MD_AggregateInformation/gmd:aggregateDataSetIdentifier/gmd:MD_Identifier/gmd:authority/gmd:CI_Citation/gmd:title</gco:CharacterString>
-                                 </cit:title>
-                                 <cit:date gco:nilReason="withheld"/>
-                              </cit:CI_Citation>
-                           </mcc:authority>
-                           <mcc:code>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.3/gmd:MD_AggregateInformation/gmd:aggregateDataSetIdentifier/gmd:MD_Identifier/gmd:code</gco:CharacterString>
-                           </mcc:code>
-                        </mcc:MD_Identifier>
-                     </cit:identifier>
-                  </cit:CI_Citation>
-               </mri:name>
-               <mri:associationType>
-                  <mri:DS_AssociationTypeCode codeList="codeListLocation#DS_AssociationTypeCode"
-                                              codeListValue="/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.3/gmd:MD_AggregateInformation/gmd:associationType/gmd:DS_AssociationTypeCode">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.3/gmd:MD_AggregateInformation/gmd:associationType/gmd:DS_AssociationTypeCode</mri:DS_AssociationTypeCode>
-               </mri:associationType>
-               <mri:initiativeType>
-                  <mri:DS_InitiativeTypeCode codeList="codeListLocation#DS_InitiativeTypeCode"
-                                             codeListValue="/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.3/gmd:MD_AggregateInformation/gmd:initiativeType/gmd:DS_InitiativeTypeCode">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:aggregationInfo.3/gmd:MD_AggregateInformation/gmd:initiativeType/gmd:DS_InitiativeTypeCode</mri:DS_InitiativeTypeCode>
-               </mri:initiativeType>
-            </mri:MD_AssociatedResource>
-         </mri:associatedResource>
-         <mri:associatedResource>
-            <mri:MD_AssociatedResource>
-               <mri:name>
-                  <cit:CI_Citation>
-                     <cit:title>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:collectiveTitle/gco:CharacterString</gco:CharacterString>
-                     </cit:title>
-                  </cit:CI_Citation>
-               </mri:name>
-               <mri:associationType>
-                  <mri:DS_AssociationTypeCode codeList="codeListLocation#DS_AssociationTypeCode"
-                                              codeListValue="largerWorkCitation">largerWorkCitation</mri:DS_AssociationTypeCode>
-               </mri:associationType>
-            </mri:MD_AssociatedResource>
-         </mri:associatedResource>
-         <mri:defaultLocale>
-            <lan:PT_Locale>
-               <lan:language>
-                  <lan:LanguageCode codeList="codeListLocation#LanguageCode"
-                                    codeListValue="/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:language/gco:CharacterString">/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:language/gco:CharacterString</lan:LanguageCode>
-               </lan:language>
-               <lan:characterEncoding>
-                  <lan:MD_CharacterSetCode codeList="codeListLocation#MD_CharacterSetCode" codeListValue=""/>
-               </lan:characterEncoding>
-            </lan:PT_Locale>
-         </mri:defaultLocale>
-         <mri:environmentDescription>
-            <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:environmentDescription/gco:CharacterString</gco:CharacterString>
-         </mri:environmentDescription>
-         <mri:supplementalInformation>
-            <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:supplementalInformation/gco:CharacterString</gco:CharacterString>
-         </mri:supplementalInformation>
-      </mri:MD_DataIdentification>
-   </mdb:identificationInfo>
-   <mdb:identificationInfo>
-      <srv:SV_ServiceIdentification id="SV_ServiceIdentification.id">
-         <mri:citation>
-            <cit:CI_Citation>
-               <cit:title>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:citation/gmd:CI_Citation/gmd:title/gco:CharacterString</gco:CharacterString>
-               </cit:title>
-               <cit:date>
-                  <cit:CI_Date>
-                     <cit:date>
-                        <gco:DateTime>8888-08-08T00:00:00</gco:DateTime>
-                     </cit:date>
-                     <cit:dateType>
-                        <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode"
-                                             codeListValue="/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode">/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode</cit:CI_DateTypeCode>
-                     </cit:dateType>
-                  </cit:CI_Date>
-               </cit:date>
-               <cit:date gco:nilReason="missing"/>
-               <cit:identifier>
-                  <mcc:MD_Identifier id="MD_Identifier.id">
-                     <mcc:code>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:citation/gmd:CI_Citation/gmd:identifier/gmd:MD_Identifier/gmd:code/gco:CharacterString</gco:CharacterString>
-                     </mcc:code>
-                  </mcc:MD_Identifier>
-               </cit:identifier>
-               <cit:identifier>
-                  <mcc:MD_Identifier>
-                     <mcc:code>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:dataSetURI/gco:CharacterString</gco:CharacterString>
-                     </mcc:code>
-                  </mcc:MD_Identifier>
-               </cit:identifier>
-               <cit:citedResponsibleParty>
-                  <cit:CI_Responsibility>
-                     <cit:role>
-                        <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="originator">originator</cit:CI_RoleCode>
-                     </cit:role>
-                     <cit:party>
-                        <cit:CI_Organisation>
-                           <cit:name>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:organisationName/gco:CharacterString</gco:CharacterString>
-                           </cit:name>
-                           <cit:contactInfo>
-                              <cit:CI_Contact>
-                                 <cit:address>
-                                    <cit:CI_Address>
-                                       <cit:electronicMailAddress>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:electronicMailAddress/gco:CharacterString</gco:CharacterString>
-                                       </cit:electronicMailAddress>
-                                    </cit:CI_Address>
-                                 </cit:address>
-                              </cit:CI_Contact>
-                           </cit:contactInfo>
-                           <cit:individual>
-                              <cit:CI_Individual>
-                                 <cit:name>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:citation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString</gco:CharacterString>
-                                 </cit:name>
-                              </cit:CI_Individual>
-                           </cit:individual>
-                        </cit:CI_Organisation>
-                     </cit:party>
-                  </cit:CI_Responsibility>
-               </cit:citedResponsibleParty>
-            </cit:CI_Citation>
-         </mri:citation>
-         <mri:abstract>
-            <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:abstract/gco:CharacterString</gco:CharacterString>
-         </mri:abstract>
-         <mri:pointOfContact>
-            <cit:CI_Responsibility>
-               <cit:role>
-                  <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="pointOfContact">pointOfContact</cit:CI_RoleCode>
-               </cit:role>
-               <cit:party>
-                  <cit:CI_Organisation>
-                     <cit:name>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:organisationName/gco:CharacterString</gco:CharacterString>
-                     </cit:name>
-                     <cit:contactInfo>
-                        <cit:CI_Contact>
-                           <cit:phone>
-                              <cit:CI_Telephone>
-                                 <cit:number>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:voice/gco:CharacterString</gco:CharacterString>
-                                 </cit:number>
-                                 <cit:numberType>
-                                    <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode" codeListValue="voice">voice</cit:CI_TelephoneTypeCode>
-                                 </cit:numberType>
-                              </cit:CI_Telephone>
-                           </cit:phone>
-                           <cit:address>
-                              <cit:CI_Address>
-                                 <cit:deliveryPoint>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:deliveryPoint/gco:CharacterString</gco:CharacterString>
-                                 </cit:deliveryPoint>
-                                 <cit:city>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:city/gco:CharacterString</gco:CharacterString>
-                                 </cit:city>
-                                 <cit:administrativeArea>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:administrativeArea/gco:CharacterString</gco:CharacterString>
-                                 </cit:administrativeArea>
-                                 <cit:postalCode>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:postalCode/gco:CharacterString</gco:CharacterString>
-                                 </cit:postalCode>
-                                 <cit:country>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:country/gco:CharacterString</gco:CharacterString>
-                                 </cit:country>
-                                 <cit:electronicMailAddress>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:electronicMailAddress/gco:CharacterString</gco:CharacterString>
-                                 </cit:electronicMailAddress>
-                              </cit:CI_Address>
-                           </cit:address>
-                           <cit:onlineResource>
-                              <cit:CI_OnlineResource>
-                                 <cit:linkage>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:linkage/gmd:URL</gco:CharacterString>
-                                 </cit:linkage>
-                                 <cit:protocol gco:nilReason="/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:protocol/@gco:nilReason">
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:protocol/gco:CharacterString</gco:CharacterString>
-                                 </cit:protocol>
-                                 <cit:name gco:nilReason="/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:name/@gco:nilReason">
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:name/gco:CharacterString</gco:CharacterString>
-                                 </cit:name>
-                                 <cit:description>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:description/gco:CharacterString</gco:CharacterString>
-                                 </cit:description>
-                              </cit:CI_OnlineResource>
-                           </cit:onlineResource>
-                           <cit:hoursOfService>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:hoursOfService/gco:CharacterString</gco:CharacterString>
-                           </cit:hoursOfService>
-                        </cit:CI_Contact>
-                     </cit:contactInfo>
-                     <cit:individual>
-                        <cit:CI_Individual>
-                           <cit:name>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString</gco:CharacterString>
-                           </cit:name>
-                           <cit:positionName>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:positionName/gco:CharacterString</gco:CharacterString>
-                           </cit:positionName>
-                        </cit:CI_Individual>
-                     </cit:individual>
-                  </cit:CI_Organisation>
-               </cit:party>
-            </cit:CI_Responsibility>
-         </mri:pointOfContact>
-         <mri:extent>
-            <gex:EX_Extent>
-               <gex:geographicElement>
-                  <gex:EX_GeographicBoundingBox>
-                     <gex:extentTypeCode>
-                        <gco:Boolean>1</gco:Boolean>
-                     </gex:extentTypeCode>
-                     <gex:westBoundLongitude>
-                        <gco:Decimal>-100.01</gco:Decimal>
-                     </gex:westBoundLongitude>
-                     <gex:eastBoundLongitude>
-                        <gco:Decimal>-50.01</gco:Decimal>
-                     </gex:eastBoundLongitude>
-                     <gex:southBoundLatitude>
-                        <gco:Decimal>20.12</gco:Decimal>
-                     </gex:southBoundLatitude>
-                     <gex:northBoundLatitude>
-                        <gco:Decimal>52.01</gco:Decimal>
-                     </gex:northBoundLatitude>
-                  </gex:EX_GeographicBoundingBox>
-               </gex:geographicElement>
-               <gex:temporalElement>
-                  <gex:EX_TemporalExtent>
-                     <gex:extent>
-                        <gml:TimePeriod gml:id="d161e35">
-                           <gml:beginPosition>2011-08-17T23:44:00Z</gml:beginPosition>
-                           <gml:endPosition>2012-10-03T07:44:00Z</gml:endPosition>
-                        </gml:TimePeriod>
-                     </gex:extent>
-                  </gex:EX_TemporalExtent>
-               </gex:temporalElement>
-            </gex:EX_Extent>
-         </mri:extent>
-         <mri:resourceMaintenance>
-            <mmi:MD_MaintenanceInformation>
-               <mmi:maintenanceAndUpdateFrequency>
-                  <mmi:MD_MaintenanceFrequencyCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_MaintenanceFrequencyCode"
-                                                   codeListValue="Weekly">/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:resourceMaintenance/gmd:MD_MaintenanceInformation/gmd:maintenanceAndUpdateFrequency/gmd:MD_MaintenanceFrequencyCode</mmi:MD_MaintenanceFrequencyCode>
-               </mmi:maintenanceAndUpdateFrequency>
-               <mmi:maintenanceDate>
-                  <cit:CI_Date>
-                     <cit:date>
-                        <gco:DateTime>7777-07-07T00:00:00</gco:DateTime>
-                     </cit:date>
-                     <cit:dateType>
-                        <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode" codeListValue="update">update</cit:CI_DateTypeCode>
-                     </cit:dateType>
-                  </cit:CI_Date>
-               </mmi:maintenanceDate>
-            </mmi:MD_MaintenanceInformation>
-         </mri:resourceMaintenance>
-         <mri:descriptiveKeywords>
-            <mri:MD_Keywords>
-               <mri:keyword>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:descriptiveKeywords/gmd:MD_Keywords/gmd:keyword/gco:CharacterString</gco:CharacterString>
-               </mri:keyword>
-               <mri:keyword>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:descriptiveKeywords/gmd:MD_Keywords/gmd:keyword.2/gco:CharacterString</gco:CharacterString>
-               </mri:keyword>
-               <mri:type>
-                  <mri:MD_KeywordTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_KeywordTypeCode"
-                                          codeListValue="theme">/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:descriptiveKeywords.5/gmd:MD_Keywords/gmd:type/gmd:MD_KeywordTypeCode</mri:MD_KeywordTypeCode>
-               </mri:type>
-               <mri:thesaurusName>
-                  <cit:CI_Citation>
-                     <cit:title>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:descriptiveKeywords/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:title/gco:CharacterString</gco:CharacterString>
-                     </cit:title>
-                     <cit:date>
-                        <cit:CI_Date>
-                           <cit:date>
-                              <gco:DateTime>2011-08-08T00:00:00</gco:DateTime>
-                           </cit:date>
-                           <cit:dateType>
-                              <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode"
-                                                   codeListValue=" /gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:descriptiveKeywords/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode&#xA;                    "> /gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:descriptiveKeywords/gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode
-                    </cit:CI_DateTypeCode>
-                           </cit:dateType>
-                        </cit:CI_Date>
-                     </cit:date>
-                  </cit:CI_Citation>
-               </mri:thesaurusName>
-            </mri:MD_Keywords>
-         </mri:descriptiveKeywords>
-         <mri:resourceConstraints>
-            <mco:MD_Constraints>
-               <mco:useLimitation>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:resourceConstraints/gmd:MD_Constraints/gmd:useLimitation/gco:CharacterString</gco:CharacterString>
-               </mco:useLimitation>
-            </mco:MD_Constraints>
-         </mri:resourceConstraints>
-         <mri:resourceConstraints>
-            <mco:MD_LegalConstraints>
-               <mco:useLimitation>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:useLimitation/gco:CharacterString</gco:CharacterString>
-               </mco:useLimitation>
-               <mco:accessConstraints>
-                  <mco:MD_RestrictionCode codeList=""
-                                          codeListValue="/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:accessConstraints/gmd:MD_RestrictionCode/@codeListValue">/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:accessConstraints/gmd:MD_RestrictionCode</mco:MD_RestrictionCode>
-               </mco:accessConstraints>
-               <mco:useConstraints>
-                  <mco:MD_RestrictionCode codeList=""
-                                          codeListValue="/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:useConstraints/gmd:MD_RestrictionCode/@codeListValue">/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:useConstraints/gmd:MD_RestrictionCode</mco:MD_RestrictionCode>
-               </mco:useConstraints>
-               <mco:otherConstraints>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:otherConstraints/gco:CharacterString</gco:CharacterString>
-               </mco:otherConstraints>
-            </mco:MD_LegalConstraints>
-         </mri:resourceConstraints>
-         <mri:resourceConstraints>
-            <mco:MD_SecurityConstraints>
-               <mco:useLimitation>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:resourceConstraints/gmd:MD_SecurityConstraints/gmd:useLimitation/gco:CharacterString</gco:CharacterString>
-               </mco:useLimitation>
-               <mco:classification>
-                  <mco:MD_ClassificationCode codeList=""
-                                             codeListValue="/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:resourceConstraints/gmd:MD_SecurityConstraints/gmd:classification/gmd:MD_ClassificationCode/@codeListValue">/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:resourceConstraints/gmd:MD_SecurityConstraints/gmd:classification/gmd:MD_ClassificationCode</mco:MD_ClassificationCode>
-               </mco:classification>
-               <mco:classificationSystem>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:resourceConstraints/gmd:MD_SecurityConstraints/gmd:classificationSystem/gco:CharacterString</gco:CharacterString>
-               </mco:classificationSystem>
-               <mco:handlingDescription>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:resourceConstraints/gmd:MD_SecurityConstraints/gmd:handlingDescription/gco:CharacterString</gco:CharacterString>
-               </mco:handlingDescription>
-            </mco:MD_SecurityConstraints>
-         </mri:resourceConstraints>
-         <mri:associatedResource>
-            <mri:MD_AssociatedResource>
-               <mri:name>
-                  <cit:CI_Citation>
-                     <cit:title>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:citation/gmd:CI_Citation/gmd:collectiveTitle/gco:CharacterString</gco:CharacterString>
-                     </cit:title>
-                  </cit:CI_Citation>
-               </mri:name>
-               <mri:associationType>
-                  <mri:DS_AssociationTypeCode codeList="codeListLocation#DS_AssociationTypeCode"
-                                              codeListValue="largerWorkCitation">largerWorkCitation</mri:DS_AssociationTypeCode>
-               </mri:associationType>
-            </mri:MD_AssociatedResource>
-         </mri:associatedResource>
-         <srv:serviceType>
-            <gco:ScopedName>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/srv:serviceType/gco:LocalName</gco:ScopedName>
-         </srv:serviceType>
-         <srv:serviceTypeVersion>
-            <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/srv:serviceTypeVersion/gco:CharacterString</gco:CharacterString>
-         </srv:serviceTypeVersion>
-         <srv:couplingType>
-            <srv:SV_CouplingType codeList="codeListLocation#SV_CouplingType" codeListValue="tight">tight</srv:SV_CouplingType>
-         </srv:couplingType>
-         <srv:containsOperations>
-            <srv:SV_OperationMetadata>
-               <srv:operationName>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/srv:containsOperations/srv:SV_OperationMetadata/srv:operationName/gco:CharacterString</gco:CharacterString>
-               </srv:operationName>
-               <srv:distributedComputingPlatform>
-                  <srv:DCPList codeList="codeListLocation#DCPList" codeListValue=""/>
-               </srv:distributedComputingPlatform>
-               <srv:invocationName>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/srv:containsOperations/srv:SV_OperationMetadata/srv:invocationName/gco:CharacterString</gco:CharacterString>
-               </srv:invocationName>
-               <srv:connectPoint>
-                  <cit:CI_OnlineResource>
-                     <cit:linkage>
-                        <gco:CharacterString>http://www.example.com/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/srv:containsOperations/srv:SV_OperationMetadata/srv:connectPoint/gmd:CI_OnlineResource/gmd:linkage/gmd:URL</gco:CharacterString>
-                     </cit:linkage>
-                     <cit:name>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/srv:containsOperations/srv:SV_OperationMetadata/srv:connectPoint/gmd:CI_OnlineResource/gmd:name/gco:CharacterString</gco:CharacterString>
-                     </cit:name>
-                     <cit:description>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/srv:containsOperations/srv:SV_OperationMetadata/srv:connectPoint/gmd:CI_OnlineResource/gmd:description/gco:CharacterString</gco:CharacterString>
-                     </cit:description>
-                     <cit:function>
-                        <cit:CI_OnLineFunctionCode codeList="http://www.ngdc.noaa.gov/metadata/published/xsd/schema/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode"
-                                                   codeListValue="download">/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/srv:containsOperations/srv:SV_OperationMetadata/srv:connectPoint/gmd:CI_OnlineResource/gmd:function/gmd:CI_OnLineFunctionCode</cit:CI_OnLineFunctionCode>
-                     </cit:function>
-                  </cit:CI_OnlineResource>
-               </srv:connectPoint>
-               <srv:parameter>
-                  <srv:SV_Parameter>
-                     <srv:name>
-                        <gco:MemberName>
-                           <gco:aName>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/srv:containsOperations/srv:SV_OperationMetadata/srv:parameters/srv:SV_Parameter/srv:name/gco:aName/gco:CharacterString</gco:CharacterString>
-                           </gco:aName>
-                           <gco:attributeType>
-                              <gco:TypeName>
-                                 <gco:aName>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/srv:containsOperations/srv:SV_OperationMetadata/srv:parameters/srv:SV_Parameter/srv:name/gco:attributeType/gco:TypeName/gco:aName/gco:CharacterString</gco:CharacterString>
-                                 </gco:aName>
-                              </gco:TypeName>
-                           </gco:attributeType>
-                        </gco:MemberName>
-                     </srv:name>
-                     <srv:direction>
-                        <srv:SV_ParameterDirection>in</srv:SV_ParameterDirection>
-                     </srv:direction>
-                     <srv:description>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/srv:containsOperations/srv:SV_OperationMetadata/srv:parameters/srv:SV_Parameter/srv:description/gco:CharacterString</gco:CharacterString>
-                     </srv:description>
-                     <srv:optionality>
-                        <gco:Boolean>true</gco:Boolean>
-                     </srv:optionality>
-                     <srv:repeatability>
-                        <gco:Boolean>false</gco:Boolean>
-                     </srv:repeatability>
-                  </srv:SV_Parameter>
-               </srv:parameter>
-            </srv:SV_OperationMetadata>
-         </srv:containsOperations>
-         <srv:operatesOn xlink:href="/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/srv:operatesOn/@xlink:href"
-                         uuidref="/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/srv:operatesOn/@uuidref"/>
-      </srv:SV_ServiceIdentification>
-   </mdb:identificationInfo>
-   <mdb:contentInfo>
-      <mrc:MD_CoverageDescription>
-         <mrc:attributeDescription>
-            <gco:RecordType xlink:href="http://www.ngdc.noaa.gov/getRecordDescription/gov.noaa.class:AERO200"/>
-         </mrc:attributeDescription>
-         <mrc:attributeGroup>
-            <mrc:MD_AttributeGroup>
-               <mrc:contentType>
-                  <mrc:MD_CoverageContentTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_CoverageContentTypeCode"
-                                                  codeListValue="physicalMeasurement">/gmd:MD_Metadata/gmd:contentInfo/gmi:MI_CoverageDescription/gmd:contentType/gmd:MD_CoverageContentTypeCode</mrc:MD_CoverageContentTypeCode>
-               </mrc:contentType>
-               <mrc:attribute>
-                  <mrc:MD_SampleDimension>
-                     <mrc:sequenceIdentifier>
-                        <gco:MemberName>
-                           <gco:aName>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contentInfo/gmi:MI_CoverageDescription/gmd:dimension/gmd:MD_Band/gmd:sequenceIdentifier/gco:MemberName/gco:aName/gco:CharacterString</gco:CharacterString>
-                           </gco:aName>
-                           <gco:attributeType>
-                              <gco:TypeName>
-                                 <gco:aName>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:contentInfo/gmi:MI_CoverageDescription/gmd:dimension/gmd:MD_Band/gmd:sequenceIdentifier/gco:MemberName/gco:attributeType/gco:TypeName/gco:aName/gco:CharacterString</gco:CharacterString>
-                                 </gco:aName>
-                              </gco:TypeName>
-                           </gco:attributeType>
-                        </gco:MemberName>
-                     </mrc:sequenceIdentifier>
-                     <mrc:description>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:contentInfo/gmi:MI_CoverageDescription/gmd:dimension/gmd:MD_Band/gmd:descriptor/gco:CharacterString</gco:CharacterString>
-                     </mrc:description>
-                     <mrc:maxValue>
-                        <gco:Real>11.11145</gco:Real>
-                     </mrc:maxValue>
-                     <mrc:minValue>
-                        <gco:Real>22.2223</gco:Real>
-                     </mrc:minValue>
-                     <mrc:units xlink:href="http://TBD_UnitsDictionary#Optical_Thickness_Unit__X_1000"/>
-                     <mrc:scaleFactor>
-                        <gco:Real>33.3335</gco:Real>
-                     </mrc:scaleFactor>
-                  </mrc:MD_SampleDimension>
-               </mrc:attribute>
-               <mrc:attribute>
-                  <mrc:MD_SampleDimension>
-                     <mrc:sequenceIdentifier>
-                        <gco:MemberName>
-                           <gco:aName>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contentInfo/gmi:MI_CoverageDescription/gmd:dimension.2/gmd:MD_Band/gmd:sequenceIdentifier/gco:MemberName/gco:aName/gco:CharacterString</gco:CharacterString>
-                           </gco:aName>
-                           <gco:attributeType>
-                              <gco:TypeName>
-                                 <gco:aName>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:contentInfo/gmi:MI_CoverageDescription/gmd:dimension.2/gmd:MD_Band/gmd:sequenceIdentifier/gco:MemberName/gco:attributeType/gco:TypeName/gco:aName/gco:CharacterString</gco:CharacterString>
-                                 </gco:aName>
-                              </gco:TypeName>
-                           </gco:attributeType>
-                        </gco:MemberName>
-                     </mrc:sequenceIdentifier>
-                     <mrc:description>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:contentInfo/gmi:MI_CoverageDescription/gmd:dimension.2/gmd:MD_Band/gmd:descriptor/gco:CharacterString</gco:CharacterString>
-                     </mrc:description>
-                     <mrc:maxValue>
-                        <gco:Real>66.66</gco:Real>
-                     </mrc:maxValue>
-                     <mrc:minValue>
-                        <gco:Real>77.77</gco:Real>
-                     </mrc:minValue>
-                     <mrc:units xlink:href="http://TBD_UnitsDictionary#Optical_Thickness_Unit__X_1000"/>
-                     <mrc:scaleFactor>
-                        <gco:Real>88.88</gco:Real>
-                     </mrc:scaleFactor>
-                  </mrc:MD_SampleDimension>
-               </mrc:attribute>
-               <mrc:attribute>
-                  <mrc:MD_SampleDimension>
-                     <mrc:sequenceIdentifier>
-                        <gco:MemberName>
-                           <gco:aName>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contentInfo/gmi:MI_CoverageDescription/gmd:dimension.3/gmd:MD_Band/gmd:sequenceIdentifier/gco:MemberName/gco:aName/gco:CharacterString</gco:CharacterString>
-                           </gco:aName>
-                           <gco:attributeType>
-                              <gco:TypeName>
-                                 <gco:aName>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:contentInfo/gmi:MI_CoverageDescription/gmd:dimension.3/gmd:MD_Band/gmd:sequenceIdentifier/gco:MemberName/gco:attributeType/gco:TypeName/gco:aName/gco:CharacterString</gco:CharacterString>
-                                 </gco:aName>
-                              </gco:TypeName>
-                           </gco:attributeType>
-                        </gco:MemberName>
-                     </mrc:sequenceIdentifier>
-                     <mrc:description>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:contentInfo/gmi:MI_CoverageDescription/gmd:dimension.3/gmd:MD_Band/gmd:descriptor/gco:CharacterString</gco:CharacterString>
-                     </mrc:description>
-                     <mrc:maxValue>
-                        <gco:Real>33.33</gco:Real>
-                     </mrc:maxValue>
-                     <mrc:minValue>
-                        <gco:Real>44.445</gco:Real>
-                     </mrc:minValue>
-                     <mrc:units xlink:href="http://TBD_UnitsDictionary#units/100_km_(x_1000)"/>
-                     <mrc:scaleFactor>
-                        <gco:Real>55.55</gco:Real>
-                     </mrc:scaleFactor>
-                  </mrc:MD_SampleDimension>
-               </mrc:attribute>
-            </mrc:MD_AttributeGroup>
-         </mrc:attributeGroup>
-         <mrc:attributeGroup>
-            <mrc:MD_AttributeGroup>
-               <mrc:contentType>
-                  <mrc:MD_CoverageContentTypeCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_CoverageContentTypeCode"
-                                                  codeListValue="referenceInformation">/gmd:MD_Metadata/gmd:contentInfo.2/gmi:MI_CoverageDescription/gmd:contentType/gmd:MD_CoverageContentTypeCode</mrc:MD_CoverageContentTypeCode>
-               </mrc:contentType>
-               <mrc:attribute>
-                  <mrc:MD_SampleDimension>
-                     <mrc:sequenceIdentifier>
-                        <gco:MemberName>
-                           <gco:aName>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contentInfo.2/gmi:MI_CoverageDescription/gmd:dimension/gmd:MD_Band/gmd:sequenceIdentifier/gco:MemberName/gco:aName/gco:CharacterString</gco:CharacterString>
-                           </gco:aName>
-                           <gco:attributeType>
-                              <gco:TypeName>
-                                 <gco:aName>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:contentInfo.2/gmi:MI_CoverageDescription/gmd:dimension/gmd:MD_Band/gmd:sequenceIdentifier/gco:MemberName/gco:attributeType/gco:TypeName/gco:aName/gco:CharacterString</gco:CharacterString>
-                                 </gco:aName>
-                              </gco:TypeName>
-                           </gco:attributeType>
-                        </gco:MemberName>
-                     </mrc:sequenceIdentifier>
-                     <mrc:description>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:contentInfo.2/gmi:MI_CoverageDescription/gmd:dimension/gmd:MD_Band/gmd:descriptor/gco:CharacterString</gco:CharacterString>
-                     </mrc:description>
-                  </mrc:MD_SampleDimension>
-               </mrc:attribute>
-               <mrc:attribute>
-                  <mrc:MD_SampleDimension>
-                     <mrc:sequenceIdentifier>
-                        <gco:MemberName>
-                           <gco:aName>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:contentInfo.2/gmi:MI_CoverageDescription/gmd:dimension.2/gmd:MD_Band/gmd:sequenceIdentifier/gco:MemberName/gco:aName/gco:CharacterString</gco:CharacterString>
-                           </gco:aName>
-                           <gco:attributeType>
-                              <gco:TypeName>
-                                 <gco:aName>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:contentInfo.2/gmi:MI_CoverageDescription/gmd:dimension.2/gmd:MD_Band/gmd:sequenceIdentifier/gco:MemberName/gco:attributeType/gco:TypeName/gco:aName/gco:CharacterString</gco:CharacterString>
-                                 </gco:aName>
-                              </gco:TypeName>
-                           </gco:attributeType>
-                        </gco:MemberName>
-                     </mrc:sequenceIdentifier>
-                     <mrc:description>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:contentInfo.2/gmi:MI_CoverageDescription/gmd:dimension.2/gmd:MD_Band/gmd:descriptor/gco:CharacterString</gco:CharacterString>
-                     </mrc:description>
-                     <mrc:maxValue>
-                        <gco:Real>00.1111</gco:Real>
-                     </mrc:maxValue>
-                     <mrc:minValue>
-                        <gco:Real>11.1111</gco:Real>
-                     </mrc:minValue>
-                     <mrc:units xlink:href="http://TBD_UnitsDictionary#Degrees"/>
-                     <mrc:scaleFactor>
-                        <gco:Real>22.2222</gco:Real>
-                     </mrc:scaleFactor>
-                  </mrc:MD_SampleDimension>
-               </mrc:attribute>
-            </mrc:MD_AttributeGroup>
-         </mrc:attributeGroup>
-      </mrc:MD_CoverageDescription>
-   </mdb:contentInfo>
-   <mdb:contentInfo>
-      <mrc:MD_FeatureCatalogueDescription>
-         <mrc:includedWithDataset>
-            <gco:Boolean>true</gco:Boolean>
-         </mrc:includedWithDataset>
-         <mrc:featureTypes>
-            <mrc:MD_FeatureTypeInfo>
-               <mrc:featureTypeName>
-                  <gco:ScopedName codeSpace="scopedNameCodeSpace">
-          /gmd:MD_Metadata/gmd:contentInfo/gmd:MD_FeatureCatalogueDescription/gmd:featureTypes/gco:ScopedName
-        </gco:ScopedName>
-               </mrc:featureTypeName>
-            </mrc:MD_FeatureTypeInfo>
-         </mrc:featureTypes>
-         <mrc:featureCatalogueCitation gco:nilReason="unknown"/>
-         <mrc:featureCatalogueCitation>
-            <cit:CI_Citation>
-               <cit:title>
-                  <gco:CharacterString>/gmi:MI_Metadata/gmd:contentInfo/gmd:MD_FeatureCatalogueDescription/gmd:featureCatalogueCitation/gmd:CI_Citation/gmd:title/gco:CharacterString</gco:CharacterString>
-               </cit:title>
-               <cit:date>
-                  <cit:CI_Date>
-                     <cit:date>
-                        <gco:DateTime>2666-06-06T00:00:00</gco:DateTime>
-                     </cit:date>
-                     <cit:dateType>
-                        <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode"
-                                             codeListValue="/gmd:MD_Metadata/gmd:contentInfo/gmd:MD_FeatureCatalogueDescription/gmd:featureCatalogueCitation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode">/gmd:MD_Metadata/gmd:contentInfo/gmd:MD_FeatureCatalogueDescription/gmd:featureCatalogueCitation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode</cit:CI_DateTypeCode>
-                     </cit:dateType>
-                  </cit:CI_Date>
-               </cit:date>
-            </cit:CI_Citation>
-         </mrc:featureCatalogueCitation>
-      </mrc:MD_FeatureCatalogueDescription>
-   </mdb:contentInfo>
-   <mdb:contentInfo>
-      <mrc:MD_ImageDescription>
-         <mrc:attributeDescription gco:nilReason="unknown"/>
-         <mrc:processingLevelCode>
-            <mcc:MD_Identifier>
-               <mcc:code>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:contentInfo/gmd:MD_ImageDescription/gmd:processingLevelCode/gmd:MD_Identifier/gmd:code/gco:CharacterString</gco:CharacterString>
-               </mcc:code>
-            </mcc:MD_Identifier>
-         </mrc:processingLevelCode>
-      </mrc:MD_ImageDescription>
-   </mdb:contentInfo>
-   <mdb:distributionInfo>
-      <mrd:MD_Distribution>
-         <mrd:distributionFormat>
-            <mrd:MD_Format id="MD_Format_id">
-               <mrd:formatSpecificationCitation>
-                  <cit:CI_Citation>
-                     <cit:title>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:name/gco:CharacterString</gco:CharacterString>
-                     </cit:title>
-                     <cit:alternateTitle>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:specification/gco:CharacterString</gco:CharacterString>
-                     </cit:alternateTitle>
-                     <cit:date gco:nilReason="unknown"/>
-                     <cit:edition>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:version/gco:CharacterString</gco:CharacterString>
-                     </cit:edition>
-                     <cit:identifier>
-                        <mcc:MD_Identifier>
-                           <mcc:code>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:name/gco:CharacterString</gco:CharacterString>
-                           </mcc:code>
-                        </mcc:MD_Identifier>
-                     </cit:identifier>
-                  </cit:CI_Citation>
-               </mrd:formatSpecificationCitation>
-               <mrd:formatDistributor>
-                  <mrd:MD_Distributor>
-                     <mrd:distributorContact>
-                        <cit:CI_Responsibility>
-                           <cit:role>
-                              <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="distributor">distributor</cit:CI_RoleCode>
-                           </cit:role>
-                           <cit:party>
-                              <cit:CI_Organisation>
-                                 <cit:name>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:organisationName/gco:CharacterString</gco:CharacterString>
-                                 </cit:name>
-                                 <cit:contactInfo>
-                                    <cit:CI_Contact>
-                                       <cit:phone>
-                                          <cit:CI_Telephone>
-                                             <cit:number>
-                                                <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:voice/gco:CharacterString</gco:CharacterString>
-                                             </cit:number>
-                                             <cit:numberType>
-                                                <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode" codeListValue="voice">voice</cit:CI_TelephoneTypeCode>
-                                             </cit:numberType>
-                                          </cit:CI_Telephone>
-                                       </cit:phone>
-                                       <cit:phone>
-                                          <cit:CI_Telephone>
-                                             <cit:number>
-                                                <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:facsimile/gco:CharacterString</gco:CharacterString>
-                                             </cit:number>
-                                             <cit:numberType>
-                                                <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode"
-                                                                          codeListValue="facsimile">facsimile</cit:CI_TelephoneTypeCode>
-                                             </cit:numberType>
-                                          </cit:CI_Telephone>
-                                       </cit:phone>
-                                       <cit:address>
-                                          <cit:CI_Address>
-                                             <cit:deliveryPoint>
-                                                <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:deliveryPoint/gco:CharacterString</gco:CharacterString>
-                                             </cit:deliveryPoint>
-                                             <cit:city>
-                                                <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:city/gco:CharacterString</gco:CharacterString>
-                                             </cit:city>
-                                             <cit:administrativeArea>
-                                                <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:administrativeArea/gco:CharacterString</gco:CharacterString>
-                                             </cit:administrativeArea>
-                                             <cit:postalCode>
-                                                <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:postalCode/gco:CharacterString</gco:CharacterString>
-                                             </cit:postalCode>
-                                             <cit:country>
-                                                <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:country/gco:CharacterString</gco:CharacterString>
-                                             </cit:country>
-                                             <cit:electronicMailAddress>
-                                                <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:electronicMailAddress/gco:CharacterString</gco:CharacterString>
-                                             </cit:electronicMailAddress>
-                                          </cit:CI_Address>
-                                       </cit:address>
-                                       <cit:onlineResource>
-                                          <cit:CI_OnlineResource>
-                                             <cit:linkage>
-                                                <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:linkage/gmd:URL</gco:CharacterString>
-                                             </cit:linkage>
-                                             <cit:protocol>
-                                                <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:protocol/gco:CharacterString</gco:CharacterString>
-                                             </cit:protocol>
-                                          </cit:CI_OnlineResource>
-                                       </cit:onlineResource>
-                                    </cit:CI_Contact>
-                                 </cit:contactInfo>
-                                 <cit:individual>
-                                    <cit:CI_Individual>
-                                       <cit:name>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString</gco:CharacterString>
-                                       </cit:name>
-                                       <cit:positionName>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:positionName/gco:CharacterString</gco:CharacterString>
-                                       </cit:positionName>
-                                    </cit:CI_Individual>
-                                 </cit:individual>
-                              </cit:CI_Organisation>
-                           </cit:party>
-                        </cit:CI_Responsibility>
-                     </mrd:distributorContact>
-                     <mrd:distributionOrderProcess>
-                        <mrd:MD_StandardOrderProcess>
-                           <mrd:fees>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributionOrderProcess/gmd:MD_StandardOrderProcess/gmd:fees/gco:CharacterString</gco:CharacterString>
-                           </mrd:fees>
-                           <mrd:plannedAvailableDateTime>
-                              <gco:DateTime>2014-07-07T07:07:07</gco:DateTime>
-                           </mrd:plannedAvailableDateTime>
-                           <mrd:orderingInstructions>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributionOrderProcess/gmd:MD_StandardOrderProcess/gmd:orderingInstructions/gco:CharacterString</gco:CharacterString>
-                           </mrd:orderingInstructions>
-                           <mrd:turnaround>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributionOrderProcess/gmd:MD_StandardOrderProcess/gmd:turnaround/gco:CharacterString</gco:CharacterString>
-                           </mrd:turnaround>
-                        </mrd:MD_StandardOrderProcess>
-                     </mrd:distributionOrderProcess>
-                     <mrd:distributorTransferOptions>
-                        <mrd:MD_DigitalTransferOptions>
-                           <mrd:unitsOfDistribution>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:unitsOfDistribution/gco:CharacterString</gco:CharacterString>
-                           </mrd:unitsOfDistribution>
-                           <mrd:transferSize>
-                              <gco:Real>1</gco:Real>
-                           </mrd:transferSize>
-                           <mrd:onLine>
-                              <cit:CI_OnlineResource>
-                                 <cit:linkage>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:linkage/gmd:URL</gco:CharacterString>
-                                 </cit:linkage>
-                                 <cit:protocol>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:protocol/gco:CharacterString</gco:CharacterString>
-                                 </cit:protocol>
-                                 <cit:applicationProfile>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:applicationProfile/gco:CharacterString</gco:CharacterString>
-                                 </cit:applicationProfile>
-                                 <cit:name>
-                                    <gco:CharacterString>//gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:name/gco:CharacterString</gco:CharacterString>
-                                 </cit:name>
-                                 <cit:description>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:description/gco:CharacterString</gco:CharacterString>
-                                 </cit:description>
-                                 <cit:function>
-                                    <cit:CI_OnLineFunctionCode codeList="/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:function/gmd:CI_OnLineFunctionCode/@codeList"
-                                                               codeListValue="/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:function/gmd:CI_OnLineFunctionCode/@codeListValue">/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:formatDistributor/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:function/gmd:CI_OnLineFunctionCode</cit:CI_OnLineFunctionCode>
-                                 </cit:function>
-                              </cit:CI_OnlineResource>
-                           </mrd:onLine>
-                        </mrd:MD_DigitalTransferOptions>
-                     </mrd:distributorTransferOptions>
-                  </mrd:MD_Distributor>
-               </mrd:formatDistributor>
-            </mrd:MD_Format>
-         </mrd:distributionFormat>
-         <mrd:distributor>
-            <mrd:MD_Distributor>
-               <mrd:distributorContact>
-                  <cit:CI_Responsibility>
-                     <cit:role>
-                        <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="distributor">distributor</cit:CI_RoleCode>
-                     </cit:role>
-                     <cit:party>
-                        <cit:CI_Organisation>
-                           <cit:name>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:organisationName/gco:CharacterString</gco:CharacterString>
-                           </cit:name>
-                           <cit:contactInfo>
-                              <cit:CI_Contact>
-                                 <cit:phone>
-                                    <cit:CI_Telephone>
-                                       <cit:number>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:voice/gco:CharacterString</gco:CharacterString>
-                                       </cit:number>
-                                       <cit:numberType>
-                                          <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode" codeListValue="voice">voice</cit:CI_TelephoneTypeCode>
-                                       </cit:numberType>
-                                    </cit:CI_Telephone>
-                                 </cit:phone>
-                                 <cit:phone>
-                                    <cit:CI_Telephone>
-                                       <cit:number>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:facsimile/gco:CharacterString</gco:CharacterString>
-                                       </cit:number>
-                                       <cit:numberType>
-                                          <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode"
-                                                                    codeListValue="facsimile">facsimile</cit:CI_TelephoneTypeCode>
-                                       </cit:numberType>
-                                    </cit:CI_Telephone>
-                                 </cit:phone>
-                                 <cit:address>
-                                    <cit:CI_Address>
-                                       <cit:deliveryPoint>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:deliveryPoint/gco:CharacterString</gco:CharacterString>
-                                       </cit:deliveryPoint>
-                                       <cit:city>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:city/gco:CharacterString</gco:CharacterString>
-                                       </cit:city>
-                                       <cit:administrativeArea>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:administrativeArea/gco:CharacterString</gco:CharacterString>
-                                       </cit:administrativeArea>
-                                       <cit:postalCode>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:postalCode/gco:CharacterString</gco:CharacterString>
-                                       </cit:postalCode>
-                                       <cit:country>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:country/gco:CharacterString</gco:CharacterString>
-                                       </cit:country>
-                                       <cit:electronicMailAddress>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:electronicMailAddress/gco:CharacterString</gco:CharacterString>
-                                       </cit:electronicMailAddress>
-                                    </cit:CI_Address>
-                                 </cit:address>
-                                 <cit:hoursOfService>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:hoursOfService/gco:CharacterString</gco:CharacterString>
-                                 </cit:hoursOfService>
-                                 <cit:contactInstructions>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:contactInstructions/gco:CharacterString</gco:CharacterString>
-                                 </cit:contactInstructions>
-                              </cit:CI_Contact>
-                           </cit:contactInfo>
-                        </cit:CI_Organisation>
-                     </cit:party>
-                  </cit:CI_Responsibility>
-               </mrd:distributorContact>
-               <mrd:distributionOrderProcess>
-                  <mrd:MD_StandardOrderProcess>
-                     <mrd:fees>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributionOrderProcess/gmd:MD_StandardOrderProcess/gmd:fees/gco:CharacterString</gco:CharacterString>
-                     </mrd:fees>
-                     <mrd:plannedAvailableDateTime>
-                        <gco:DateTime>1999-09-09T09:09:09</gco:DateTime>
-                     </mrd:plannedAvailableDateTime>
-                     <mrd:orderingInstructions>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributionOrderProcess/gmd:MD_StandardOrderProcess/gmd:orderingInstructions/gco:CharacterString</gco:CharacterString>
-                     </mrd:orderingInstructions>
-                     <mrd:turnaround>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributionOrderProcess/gmd:MD_StandardOrderProcess/gmd:turnaround/gco:CharacterString</gco:CharacterString>
-                     </mrd:turnaround>
-                  </mrd:MD_StandardOrderProcess>
-               </mrd:distributionOrderProcess>
-               <mrd:distributorFormat>
-                  <mrd:MD_Format>
-                     <mrd:formatSpecificationCitation>
-                        <cit:CI_Citation>
-                           <cit:title>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorFormat/gmd:MD_Format/gmd:name/gco:CharacterString</gco:CharacterString>
-                           </cit:title>
-                           <cit:alternateTitle/>
-                           <cit:date gco:nilReason="unknown"/>
-                           <cit:edition>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorFormat/gmd:MD_Format/gmd:version/gco:CharacterString</gco:CharacterString>
-                           </cit:edition>
-                           <cit:identifier>
-                              <mcc:MD_Identifier>
-                                 <mcc:code>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorFormat/gmd:MD_Format/gmd:name/gco:CharacterString</gco:CharacterString>
-                                 </mcc:code>
-                              </mcc:MD_Identifier>
-                           </cit:identifier>
-                        </cit:CI_Citation>
-                     </mrd:formatSpecificationCitation>
-                  </mrd:MD_Format>
-               </mrd:distributorFormat>
-               <mrd:distributorTransferOptions>
-                  <mrd:MD_DigitalTransferOptions>
-                     <mrd:unitsOfDistribution>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:unitsOfDistribution/gco:CharacterString</gco:CharacterString>
-                     </mrd:unitsOfDistribution>
-                     <mrd:transferSize>
-                        <gco:Real>2</gco:Real>
-                     </mrd:transferSize>
-                     <mrd:onLine>
-                        <cit:CI_OnlineResource>
-                           <cit:linkage>
-                              <gco:CharacterString>http://www.example.com/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:linkage/gmd:URL</gco:CharacterString>
-                           </cit:linkage>
-                           <cit:protocol>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:protocol/gco:CharacterString</gco:CharacterString>
-                           </cit:protocol>
-                           <cit:applicationProfile>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:applicationProfile/gco:CharacterString</gco:CharacterString>
-                           </cit:applicationProfile>
-                           <cit:name>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:name/gco:CharacterString</gco:CharacterString>
-                           </cit:name>
-                           <cit:description>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:description/gco:CharacterString</gco:CharacterString>
-                           </cit:description>
-                           <cit:function>
-                              <cit:CI_OnLineFunctionCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode"
-                                                         codeListValue="download">/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:function/gmd:CI_OnLineFunctionCode</cit:CI_OnLineFunctionCode>
-                           </cit:function>
-                        </cit:CI_OnlineResource>
-                     </mrd:onLine>
-                  </mrd:MD_DigitalTransferOptions>
-               </mrd:distributorTransferOptions>
-            </mrd:MD_Distributor>
-         </mrd:distributor>
-         <mrd:distributor>
-            <mrd:MD_Distributor>
-               <mrd:distributorContact>
-                  <cit:CI_Responsibility>
-                     <cit:role>
-                        <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="distributor">distributor</cit:CI_RoleCode>
-                     </cit:role>
-                     <cit:party>
-                        <cit:CI_Organisation>
-                           <cit:name>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.2/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:organisationName/gco:CharacterString</gco:CharacterString>
-                           </cit:name>
-                           <cit:contactInfo>
-                              <cit:CI_Contact>
-                                 <cit:phone>
-                                    <cit:CI_Telephone>
-                                       <cit:number>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.2/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:voice/gco:CharacterString</gco:CharacterString>
-                                       </cit:number>
-                                       <cit:numberType>
-                                          <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode" codeListValue="voice">voice</cit:CI_TelephoneTypeCode>
-                                       </cit:numberType>
-                                    </cit:CI_Telephone>
-                                 </cit:phone>
-                                 <cit:phone>
-                                    <cit:CI_Telephone>
-                                       <cit:number>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.2/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:facsimile/gco:CharacterString</gco:CharacterString>
-                                       </cit:number>
-                                       <cit:numberType>
-                                          <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode"
-                                                                    codeListValue="facsimile">facsimile</cit:CI_TelephoneTypeCode>
-                                       </cit:numberType>
-                                    </cit:CI_Telephone>
-                                 </cit:phone>
-                                 <cit:address>
-                                    <cit:CI_Address>
-                                       <cit:deliveryPoint>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.2/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:deliveryPoint/gco:CharacterString</gco:CharacterString>
-                                       </cit:deliveryPoint>
-                                       <cit:city>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.2/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:city/gco:CharacterString</gco:CharacterString>
-                                       </cit:city>
-                                       <cit:administrativeArea>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.2/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:administrativeArea/gco:CharacterString</gco:CharacterString>
-                                       </cit:administrativeArea>
-                                       <cit:postalCode>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.2/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:postalCode/gco:CharacterString</gco:CharacterString>
-                                       </cit:postalCode>
-                                       <cit:country>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.2/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:country/gco:CharacterString</gco:CharacterString>
-                                       </cit:country>
-                                       <cit:electronicMailAddress>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.2/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:electronicMailAddress/gco:CharacterString</gco:CharacterString>
-                                       </cit:electronicMailAddress>
-                                    </cit:CI_Address>
-                                 </cit:address>
-                                 <cit:hoursOfService>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.2/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:hoursOfService/gco:CharacterString</gco:CharacterString>
-                                 </cit:hoursOfService>
-                                 <cit:contactInstructions>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.2/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:contactInstructions/gco:CharacterString</gco:CharacterString>
-                                 </cit:contactInstructions>
-                              </cit:CI_Contact>
-                           </cit:contactInfo>
-                        </cit:CI_Organisation>
-                     </cit:party>
-                  </cit:CI_Responsibility>
-               </mrd:distributorContact>
-               <mrd:distributionOrderProcess>
-                  <mrd:MD_StandardOrderProcess>
-                     <mrd:fees>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.2/gmd:MD_Distributor/gmd:distributionOrderProcess/gmd:MD_StandardOrderProcess/gmd:fees/gco:CharacterString</gco:CharacterString>
-                     </mrd:fees>
-                     <mrd:plannedAvailableDateTime>
-                        <gco:DateTime>2008-08-08T08:08:08</gco:DateTime>
-                     </mrd:plannedAvailableDateTime>
-                     <mrd:orderingInstructions>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributionOrderProcess/gmd:MD_StandardOrderProcess/gmd:orderingInstructions/gco:CharacterString</gco:CharacterString>
-                     </mrd:orderingInstructions>
-                     <mrd:turnaround>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.2/gmd:MD_Distributor/gmd:distributionOrderProcess/gmd:MD_StandardOrderProcess/gmd:turnaround/gco:CharacterString</gco:CharacterString>
-                     </mrd:turnaround>
-                  </mrd:MD_StandardOrderProcess>
-               </mrd:distributionOrderProcess>
-               <mrd:distributorFormat>
-                  <mrd:MD_Format>
-                     <mrd:formatSpecificationCitation>
-                        <cit:CI_Citation>
-                           <cit:title>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.2/gmd:MD_Distributor/gmd:distributorFormat/gmd:MD_Format/gmd:name/gco:CharacterString</gco:CharacterString>
-                           </cit:title>
-                           <cit:alternateTitle>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorFormat/gmd:MD_Format/gmd:specification/gco:CharacterString</gco:CharacterString>
-                           </cit:alternateTitle>
-                           <cit:date gco:nilReason="unknown"/>
-                           <cit:edition>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorFormat/gmd:MD_Format/gmd:version/gco:CharacterString</gco:CharacterString>
-                           </cit:edition>
-                           <cit:identifier>
-                              <mcc:MD_Identifier>
-                                 <mcc:code>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.2/gmd:MD_Distributor/gmd:distributorFormat/gmd:MD_Format/gmd:name/gco:CharacterString</gco:CharacterString>
-                                 </mcc:code>
-                              </mcc:MD_Identifier>
-                           </cit:identifier>
-                        </cit:CI_Citation>
-                     </mrd:formatSpecificationCitation>
-                     <mrd:amendmentNumber>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorFormat/gmd:MD_Format/gmd:amendmentNumber/gco:CharacterString</gco:CharacterString>
-                     </mrd:amendmentNumber>
-                     <mrd:fileDecompressionTechnique>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributorFormat/gmd:MD_Format/gmd:fileDecompressionTechnique/gco:CharacterString</gco:CharacterString>
-                     </mrd:fileDecompressionTechnique>
-                  </mrd:MD_Format>
-               </mrd:distributorFormat>
-               <mrd:distributorTransferOptions>
-                  <mrd:MD_DigitalTransferOptions>
-                     <mrd:onLine>
-                        <cit:CI_OnlineResource>
-                           <cit:linkage>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.2/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:linkage/gmd:URL</gco:CharacterString>
-                           </cit:linkage>
-                           <cit:protocol>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.2/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:protocol/gco:CharacterString</gco:CharacterString>
-                           </cit:protocol>
-                           <cit:applicationProfile>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.2/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:applicationProfile/gco:CharacterString</gco:CharacterString>
-                           </cit:applicationProfile>
-                           <cit:name>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.2/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:name/gco:CharacterString</gco:CharacterString>
-                           </cit:name>
-                           <cit:description>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.2/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:description/gco:CharacterString</gco:CharacterString>
-                           </cit:description>
-                           <cit:function>
-                              <cit:CI_OnLineFunctionCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode"
-                                                         codeListValue="download">/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.2/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:function/gmd:CI_OnLineFunctionCode</cit:CI_OnLineFunctionCode>
-                           </cit:function>
-                        </cit:CI_OnlineResource>
-                     </mrd:onLine>
-                  </mrd:MD_DigitalTransferOptions>
-               </mrd:distributorTransferOptions>
-            </mrd:MD_Distributor>
-         </mrd:distributor>
-         <mrd:distributor>
-            <mrd:MD_Distributor>
-               <mrd:distributorContact>
-                  <cit:CI_Responsibility id="fgdccontact_1609.114857.63875">
-                     <cit:role>
-                        <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue="distributor">distributor</cit:CI_RoleCode>
-                     </cit:role>
-                     <cit:party>
-                        <cit:CI_Organisation>
-                           <cit:name>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.3/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:organisationName/gco:CharacterString</gco:CharacterString>
-                           </cit:name>
-                           <cit:contactInfo>
-                              <cit:CI_Contact>
-                                 <cit:phone>
-                                    <cit:CI_Telephone>
-                                       <cit:number>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.3/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:voice/gco:CharacterString</gco:CharacterString>
-                                       </cit:number>
-                                       <cit:numberType>
-                                          <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode" codeListValue="voice">voice</cit:CI_TelephoneTypeCode>
-                                       </cit:numberType>
-                                    </cit:CI_Telephone>
-                                 </cit:phone>
-                                 <cit:phone>
-                                    <cit:CI_Telephone>
-                                       <cit:number>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.3/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:phone/gmd:CI_Telephone/gmd:facsimile/gco:CharacterString</gco:CharacterString>
-                                       </cit:number>
-                                       <cit:numberType>
-                                          <cit:CI_TelephoneTypeCode codeList="codeListLocation#CI_TelephoneTypeCode"
-                                                                    codeListValue="facsimile">facsimile</cit:CI_TelephoneTypeCode>
-                                       </cit:numberType>
-                                    </cit:CI_Telephone>
-                                 </cit:phone>
-                                 <cit:address>
-                                    <cit:CI_Address>
-                                       <cit:deliveryPoint>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.3/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:deliveryPoint/gco:CharacterString</gco:CharacterString>
-                                       </cit:deliveryPoint>
-                                       <cit:city>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.3/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:city/gco:CharacterString</gco:CharacterString>
-                                       </cit:city>
-                                       <cit:administrativeArea>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.3/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:administrativeArea/gco:CharacterString</gco:CharacterString>
-                                       </cit:administrativeArea>
-                                       <cit:postalCode>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.3/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:postalCode/gco:CharacterString</gco:CharacterString>
-                                       </cit:postalCode>
-                                       <cit:country>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.3/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:country/gco:CharacterString</gco:CharacterString>
-                                       </cit:country>
-                                       <cit:electronicMailAddress>
-                                          <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.3/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:electronicMailAddress/gco:CharacterString</gco:CharacterString>
-                                       </cit:electronicMailAddress>
-                                    </cit:CI_Address>
-                                 </cit:address>
-                                 <cit:hoursOfService>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.3/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:hoursOfService/gco:CharacterString</gco:CharacterString>
-                                 </cit:hoursOfService>
-                                 <cit:contactInstructions>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.3/gmd:MD_Distributor/gmd:distributorContact/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:contactInstructions/gco:CharacterString</gco:CharacterString>
-                                 </cit:contactInstructions>
-                              </cit:CI_Contact>
-                           </cit:contactInfo>
-                        </cit:CI_Organisation>
-                     </cit:party>
-                  </cit:CI_Responsibility>
-               </mrd:distributorContact>
-               <mrd:distributionOrderProcess>
-                  <mrd:MD_StandardOrderProcess>
-                     <mrd:fees>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.3/gmd:MD_Distributor/gmd:distributionOrderProcess/gmd:MD_StandardOrderProcess/gmd:fees/gco:CharacterString</gco:CharacterString>
-                     </mrd:fees>
-                     <mrd:plannedAvailableDateTime>
-                        <gco:DateTime>2006-06-06T06:06:06</gco:DateTime>
-                     </mrd:plannedAvailableDateTime>
-                     <mrd:orderingInstructions>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor/gmd:MD_Distributor/gmd:distributionOrderProcess/gmd:MD_StandardOrderProcess/gmd:orderingInstructions/gco:CharacterString</gco:CharacterString>
-                     </mrd:orderingInstructions>
-                     <mrd:turnaround>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.3/gmd:MD_Distributor/gmd:distributionOrderProcess/gmd:MD_StandardOrderProcess/gmd:turnaround/gco:CharacterString</gco:CharacterString>
-                     </mrd:turnaround>
-                  </mrd:MD_StandardOrderProcess>
-               </mrd:distributionOrderProcess>
-               <mrd:distributorFormat>
-                  <mrd:MD_Format>
-                     <mrd:formatSpecificationCitation>
-                        <cit:CI_Citation>
-                           <cit:title>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.3/gmd:MD_Distributor/gmd:distributorFormat/gmd:MD_Format/gmd:name/gco:CharacterString</gco:CharacterString>
-                           </cit:title>
-                           <cit:alternateTitle/>
-                           <cit:date gco:nilReason="unknown"/>
-                           <cit:edition>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.3/gmd:MD_Distributor/gmd:distributorFormat/gmd:MD_Format/gmd:version/gco:CharacterString</gco:CharacterString>
-                           </cit:edition>
-                           <cit:identifier>
-                              <mcc:MD_Identifier>
-                                 <mcc:code>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.3/gmd:MD_Distributor/gmd:distributorFormat/gmd:MD_Format/gmd:name/gco:CharacterString</gco:CharacterString>
-                                 </mcc:code>
-                              </mcc:MD_Identifier>
-                           </cit:identifier>
-                        </cit:CI_Citation>
-                     </mrd:formatSpecificationCitation>
-                  </mrd:MD_Format>
-               </mrd:distributorFormat>
-               <mrd:distributorTransferOptions>
-                  <mrd:MD_DigitalTransferOptions>
-                     <mrd:onLine>
-                        <cit:CI_OnlineResource>
-                           <cit:linkage>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.3/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:linkage/gmd:URL</gco:CharacterString>
-                           </cit:linkage>
-                           <cit:protocol>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.3/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:protocol/gco:CharacterString</gco:CharacterString>
-                           </cit:protocol>
-                           <cit:applicationProfile>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.3/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:applicationProfile/gco:CharacterString</gco:CharacterString>
-                           </cit:applicationProfile>
-                           <cit:name>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.3/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:name/gco:CharacterString</gco:CharacterString>
-                           </cit:name>
-                           <cit:description>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.3/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:description/gco:CharacterString</gco:CharacterString>
-                           </cit:description>
-                           <cit:function>
-                              <cit:CI_OnLineFunctionCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode"
-                                                         codeListValue="download">/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor.3/gmd:MD_Distributor/gmd:distributorTransferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:function/gmd:CI_OnLineFunctionCode</cit:CI_OnLineFunctionCode>
-                           </cit:function>
-                        </cit:CI_OnlineResource>
-                     </mrd:onLine>
-                  </mrd:MD_DigitalTransferOptions>
-               </mrd:distributorTransferOptions>
-            </mrd:MD_Distributor>
-         </mrd:distributor>
-         <mrd:transferOptions>
-            <mrd:MD_DigitalTransferOptions>
-               <mrd:unitsOfDistribution>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:unitsOfDistribution/gco:CharacterString</gco:CharacterString>
-               </mrd:unitsOfDistribution>
-               <mrd:onLine>
-                  <cit:CI_OnlineResource>
-                     <cit:linkage>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:linkage/gmd:URL</gco:CharacterString>
-                     </cit:linkage>
-                     <cit:protocol>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:protocol/gco:CharacterString</gco:CharacterString>
-                     </cit:protocol>
-                     <cit:applicationProfile>
-                        <gco:CharacterString>/gco:/gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:applicationProfile/gco:CharacterString</gco:CharacterString>
-                     </cit:applicationProfile>
-                     <cit:name>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:name/gco:CharacterString</gco:CharacterString>
-                     </cit:name>
-                     <cit:description>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:description/gco:CharacterString</gco:CharacterString>
-                     </cit:description>
-                     <cit:function>
-                        <cit:CI_OnLineFunctionCode codeList="/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:function/gmd:CI_OnLineFunctionCode/@codeList"
-                                                   codeListValue="/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:function/gmd:CI_OnLineFunctionCode/@codeListValue">/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:function/gmd:CI_OnLineFunctionCode</cit:CI_OnLineFunctionCode>
-                     </cit:function>
-                  </cit:CI_OnlineResource>
-               </mrd:onLine>
-            </mrd:MD_DigitalTransferOptions>
-         </mrd:transferOptions>
-         <mrd:transferOptions>
-            <mrd:MD_DigitalTransferOptions>
-               <mrd:onLine>
-                  <cit:CI_OnlineResource>
-                     <cit:linkage gco:nilReason="/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:linkage/@gco:nilReason"/>
-                     <cit:protocol gco:nilReason="/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:protocol/@gco:nilReason"/>
-                     <cit:applicationProfile gco:nilReason="/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:applicationProfile/@gco:nilReason"/>
-                     <cit:name gco:nilReason="/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:name/@gco:nilReason"/>
-                     <cit:description gco:nilReason="/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:description/@gco:nilReason"/>
-                     <cit:function gco:nilReason="/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:function/@gco:nilReason"/>
-                  </cit:CI_OnlineResource>
-               </mrd:onLine>
-            </mrd:MD_DigitalTransferOptions>
-         </mrd:transferOptions>
-         <mrd:transferOptions>
-            <mrd:MD_DigitalTransferOptions>
-               <mrd:offLine>
-                  <mrd:MD_Medium>
-                     <mrd:name>
-                        <cit:CI_Citation>
-                           <cit:title>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:offLine/gmd:MD_Medium/gmd:name/gmd:MD_MediumNameCode/@codeListValue</gco:CharacterString>
-                           </cit:title>
-                        </cit:CI_Citation>
-                     </mrd:name>
-                  </mrd:MD_Medium>
-               </mrd:offLine>
-            </mrd:MD_DigitalTransferOptions>
-         </mrd:transferOptions>
-      </mrd:MD_Distribution>
-   </mdb:distributionInfo>
-   <mdb:dataQualityInfo>
-      <mdq:DQ_DataQuality>
-         <mdq:scope>
-            <mcc:MD_Scope>
-               <mcc:level>
-                  <mcc:MD_ScopeCode codeList="" codeListValue="">/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:scope/gmd:DQ_Scope/gmd:level/gmd:MD_ScopeCode</mcc:MD_ScopeCode>
-               </mcc:level>
-               <mcc:extent>
-                  <gex:EX_Extent>
-                     <gex:description>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:scope/gmd:DQ_Scope/gmd:extent/gmd:EX_Extent/gmd:description/gco:CharacterString</gco:CharacterString>
-                     </gex:description>
-                  </gex:EX_Extent>
-               </mcc:extent>
-               <mcc:levelDescription>
-                  <mcc:MD_ScopeDescription>
-                     <mcc:other>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:scope/gmd:DQ_Scope/gmd:levelDescription/gmd:MD_ScopeDescription/gmd:other/gco:CharacterString</gco:CharacterString>
-                     </mcc:other>
-                  </mcc:MD_ScopeDescription>
-               </mcc:levelDescription>
-            </mcc:MD_Scope>
-         </mdq:scope>
-         <mdq:report>
-            <mdq:DQ_QuantitativeAttributeAccuracy>
-               <mdq:measure>
-                  <mdq:DQ_MeasureReference>
-                     <mdq:measureIdentification>
-                        <mcc:MD_Identifier>
-                           <mcc:code>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:report/gmd:DQ_QuantitativeAttributeAccuracy/gmd:measureIdentification/gmd:MD_Identifier/gmd:code</gco:CharacterString>
-                           </mcc:code>
-                        </mcc:MD_Identifier>
-                     </mdq:measureIdentification>
-                     <mdq:nameOfMeasure>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:report/gmd:DQ_QuantitativeAttributeAccuracy/gmd:nameOfMeasure/gco:CharacterString</gco:CharacterString>
-                     </mdq:nameOfMeasure>
-                     <mdq:measureDescription>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:report/gmd:DQ_QuantitativeAttributeAccuracy/gmd:measureDescription/gco:CharacterString</gco:CharacterString>
-                     </mdq:measureDescription>
-                  </mdq:DQ_MeasureReference>
-               </mdq:measure>
-               <mdq:evaluationMethod>
-                  <mdq:DQ_FullInspection>
-                     <mdq:dateTime>
-                        <gco:DateTime>2012-10-02T15:44:00</gco:DateTime>
-                     </mdq:dateTime>
-                     <mdq:evaluationMethodDescription>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:report/gmd:DQ_QuantitativeAttributeAccuracy/gmd:evaluationMethodDescription/gco:CharacterString</gco:CharacterString>
-                     </mdq:evaluationMethodDescription>
-                     <mdq:evaluationProcedure>
-                        <cit:CI_Citation>
-                           <cit:title>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:report/gmd:DQ_QuantitativeAttributeAccuracy/gmd:evaluationProcedure/gmd:CI_Citation/gmd:title/gco:CharacterString</gco:CharacterString>
-                           </cit:title>
-                           <cit:date gco:nilReason="inapplicable"/>
-                        </cit:CI_Citation>
-                     </mdq:evaluationProcedure>
-                     <mdq:evaluationMethodType>
-                        <mdq:DQ_EvaluationMethodTypeCode codeList="codeListLocation#DQ_EvaluationMethodTypeCode"
-                                                         codeListValue=""/>
-                     </mdq:evaluationMethodType>
-                  </mdq:DQ_FullInspection>
-               </mdq:evaluationMethod>
-               <mdq:result>
-                  <mdq:DQ_QuantitativeResult>
-                     <mdq:value>
-                        <gco:Record>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:report/gmd:DQ_QuantitativeAttributeAccuracy/gmd:result/gmd:DQ_QuantitativeResult/gmd:value/gco:Record</gco:Record>
-                     </mdq:value>
-                     <mdq:valueUnit xlink:href="AnyValidURI"/>
-                  </mdq:DQ_QuantitativeResult>
-               </mdq:result>
-            </mdq:DQ_QuantitativeAttributeAccuracy>
-         </mdq:report>
-         <mdq:report>
-            <mdq:DQ_CompletenessOmission>
-               <mdq:measure>
-                  <mdq:DQ_MeasureReference>
-                     <mdq:nameOfMeasure>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:report.3/gmd:DQ_CompletenessOmission/gmd:nameOfMeasure/gco:CharacterString</gco:CharacterString>
-                     </mdq:nameOfMeasure>
-                  </mdq:DQ_MeasureReference>
-               </mdq:measure>
-               <mdq:evaluationMethod>
-                  <mdq:DQ_FullInspection>
-                     <mdq:evaluationProcedure/>
-                  </mdq:DQ_FullInspection>
-               </mdq:evaluationMethod>
-               <mdq:result>
-                  <mdq:DQ_ConformanceResult>
-                     <mdq:specification>
-                        <cit:CI_Citation>
-                           <cit:title>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:report/gmd:DQ_CompletenessOmission/gmd:result/gmd:DQ_ConformanceResult/gmd:specification/gmd:CI_Citation/gmd:title/gco:CharacterString</gco:CharacterString>
-                           </cit:title>
-                           <cit:date>
-                              <cit:CI_Date>
-                                 <cit:date>
-                                    <gco:DateTime>2012-10-02T00:00:00</gco:DateTime>
-                                 </cit:date>
-                                 <cit:dateType>
-                                    <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode"
-                                                         codeListValue="/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:report/gmd:DQ_CompletenessOmission/gmd:result/gmd:DQ_ConformanceResult/gmd:specification/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode">/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:report/gmd:DQ_CompletenessOmission/gmd:result/gmd:DQ_ConformanceResult/gmd:specification/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode</cit:CI_DateTypeCode>
-                                 </cit:dateType>
-                              </cit:CI_Date>
-                           </cit:date>
-                        </cit:CI_Citation>
-                     </mdq:specification>
-                     <mdq:explanation>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:report/gmd:DQ_CompletenessOmission/gmd:result/gmd:DQ_ConformanceResult/gmd:explanation/gco:CharacterString</gco:CharacterString>
-                     </mdq:explanation>
-                     <mdq:pass>
-                        <gco:Boolean>false</gco:Boolean>
-                     </mdq:pass>
-                  </mdq:DQ_ConformanceResult>
-               </mdq:result>
-            </mdq:DQ_CompletenessOmission>
-         </mdq:report>
-         <mdq:report>
-            <mdq:DQ_AbsoluteExternalPositionalAccuracy>
-               <mdq:measure>
-                  <mdq:DQ_MeasureReference>
-                     <mdq:nameOfMeasure>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:report.5/gmd:DQ_AbsoluteExternalPositionalAccuracy/gmd:nameOfMeasure/gco:CharacterString</gco:CharacterString>
-                     </mdq:nameOfMeasure>
-                  </mdq:DQ_MeasureReference>
-               </mdq:measure>
-               <mdq:evaluationMethod>
-                  <mdq:DQ_FullInspection>
-                     <mdq:evaluationProcedure/>
-                  </mdq:DQ_FullInspection>
-               </mdq:evaluationMethod>
-               <mdq:result>
-                  <mdq:DQ_QuantitativeResult>
-                     <mdq:value>
-                        <gco:Record>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:report/gmd:DQ_AbsoluteExternalPositionalAccuracy/gmd:result/gmd:DQ_QuantitativeResult/gmd:value/gco:Record</gco:Record>
-                     </mdq:value>
-                     <mdq:valueUnit/>
-                     <mdq:valueRecordType>
-                        <gco:RecordType xlink:href="anyValidURI">/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:report/gmd:DQ_AbsoluteExternalPositionalAccuracy/gmd:result/gmd:DQ_QuantitativeResult/gmd:valueType/gco:RecordType</gco:RecordType>
-                     </mdq:valueRecordType>
-                  </mdq:DQ_QuantitativeResult>
-               </mdq:result>
-            </mdq:DQ_AbsoluteExternalPositionalAccuracy>
-         </mdq:report>
-         <mdq:report>
-            <mdq:DQ_DomainConsistency>
-               <mdq:measure>
-                  <mdq:DQ_MeasureReference/>
-               </mdq:measure>
-               <mdq:evaluationMethod>
-                  <mdq:DQ_FullInspection>
-                     <mdq:evaluationProcedure/>
-                  </mdq:DQ_FullInspection>
-               </mdq:evaluationMethod>
-               <mdq:result>
-                  <mdq:DQ_ConformanceResult>
-                     <mdq:specification>
-                        <cit:CI_Citation>
-                           <cit:title>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:report/gmd:DQ_DomainConsistency/gmd:result/gmd:DQ_ConformanceResult/gmd:specification/gmd:CI_Citation/gmd:title/gco:CharacterString</gco:CharacterString>
-                           </cit:title>
-                           <cit:date>
-                              <cit:CI_Date>
-                                 <cit:date>
-                                    <gco:DateTime>2222-02-22T00:00:00</gco:DateTime>
-                                 </cit:date>
-                                 <cit:dateType>
-                                    <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode"
-                                                         codeListValue="/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:report/gmd:DQ_DomainConsistency/gmd:result/gmd:DQ_ConformanceResult/gmd:specification/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode">/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:report/gmd:DQ_DomainConsistency/gmd:result/gmd:DQ_ConformanceResult/gmd:specification/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode</cit:CI_DateTypeCode>
-                                 </cit:dateType>
-                              </cit:CI_Date>
-                           </cit:date>
-                        </cit:CI_Citation>
-                     </mdq:specification>
-                     <mdq:explanation>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:report/gmd:DQ_DomainConsistency/gmd:result/gmd:DQ_ConformanceResult/gmd:explanation/gco:CharacterString</gco:CharacterString>
-                     </mdq:explanation>
-                     <mdq:pass>
-                        <gco:Boolean>true</gco:Boolean>
-                     </mdq:pass>
-                  </mdq:DQ_ConformanceResult>
-               </mdq:result>
-            </mdq:DQ_DomainConsistency>
-         </mdq:report>
-      </mdq:DQ_DataQuality>
-   </mdb:dataQualityInfo>
-   <mdb:resourceLineage>
-      <mrl:LI_Lineage>
-         <mrl:statement>
-            <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:statement/gco:CharacterString</gco:CharacterString>
-         </mrl:statement>
-         <mrl:scope>
-            <mcc:MD_Scope>
-               <mcc:level>
-                  <mcc:MD_ScopeCode codeList="codeListLocation#MD_ScopeCode" codeListValue=""/>
-               </mcc:level>
-               <mcc:extent>
-                  <gex:EX_Extent>
-                     <gex:description>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:scope/gmd:DQ_Scope/gmd:extent/gmd:EX_Extent/gmd:description/gco:CharacterString</gco:CharacterString>
-                     </gex:description>
-                  </gex:EX_Extent>
-               </mcc:extent>
-               <mcc:levelDescription>
-                  <mcc:MD_ScopeDescription>
-                     <mcc:other>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:scope/gmd:DQ_Scope/gmd:levelDescription/gmd:MD_ScopeDescription/gmd:other/gco:CharacterString</gco:CharacterString>
-                     </mcc:other>
-                  </mcc:MD_ScopeDescription>
-               </mcc:levelDescription>
-            </mcc:MD_Scope>
-         </mrl:scope>
-         <mrl:source>
-            <mrl:LI_Source id="lineageSource">
-               <mrl:description>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:source/gmd:LI_Source/gmd:description/gco:CharacterString</gco:CharacterString>
-               </mrl:description>
-               <mrl:sourceSpatialResolution>
-                  <mri:MD_Resolution>
-                     <mri:equivalentScale>
-                        <mri:MD_RepresentativeFraction>
-                           <mri:denominator>
-                              <gco:Integer>9999997</gco:Integer>
-                           </mri:denominator>
-                        </mri:MD_RepresentativeFraction>
-                     </mri:equivalentScale>
-                  </mri:MD_Resolution>
-               </mrl:sourceSpatialResolution>
-               <mrl:sourceReferenceSystem>
-                  <mrs:MD_ReferenceSystem>
-                     <mrs:referenceSystemIdentifier>
-                        <mcc:MD_Identifier>
-                           <mcc:code>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:source/gmd:LI_Source/gmd:sourceReferenceSystem/gmd:MD_ReferenceSystem/gmd:referenceSystemIdentifier/gmd:RS_Identifier/gmd:code/gco:CharacterString</gco:CharacterString>
-                           </mcc:code>
-                        </mcc:MD_Identifier>
-                     </mrs:referenceSystemIdentifier>
-                  </mrs:MD_ReferenceSystem>
-               </mrl:sourceReferenceSystem>
-               <mrl:sourceCitation>
-                  <cit:CI_Citation>
-                     <cit:title>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:source/gmd:LI_Source/gmd:sourceCitation/gmd:CI_Citation/gmd:title/gco:CharacterString</gco:CharacterString>
-                     </cit:title>
-                     <cit:date gco:nilReason="missing"/>
-                  </cit:CI_Citation>
-               </mrl:sourceCitation>
-               <mrl:scope>
-                  <mcc:MD_Scope>
-                     <mcc:level/>
-                     <mcc:extent>
-                        <gex:EX_Extent>
-                           <gex:description>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:source/gmd:LI_Source/gmd:sourceExtent/gmd:EX_Extent/gmd:description/gco:CharacterString</gco:CharacterString>
-                           </gex:description>
-                        </gex:EX_Extent>
-                     </mcc:extent>
-                     <mcc:levelDescription/>
-                  </mcc:MD_Scope>
-               </mrl:scope>
-               <mrl:sourceStep xlink:href="#lineageProcessStep"/>
-               <mrl:sourceStep>
-                  <mrl:LI_ProcessStep id="embeddedLineageProcessStep">
-                     <mrl:description>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:processStep/gmd:LI_ProcessStep/gmd:description/gco:CharacterString</gco:CharacterString>
-                     </mrl:description>
-                     <mrl:stepDateTime>
-                        <gml:TimeInstant gml:id="d6e2553">
-                           <gml:timePosition>2005-05-05T05:05:05</gml:timePosition>
-                        </gml:TimeInstant>
-                     </mrl:stepDateTime>
-                     <mrl:processor/>
-                  </mrl:LI_ProcessStep>
-               </mrl:sourceStep>
-            </mrl:LI_Source>
-         </mrl:source>
-         <mrl:processStep>
-            <mrl:LI_ProcessStep id="lineageProcessStep">
-               <mrl:description>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo.3/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:processStep/gmd:LI_ProcessStep/gmd:description/gco:CharacterString</gco:CharacterString>
-               </mrl:description>
-               <mrl:stepDateTime>
-                  <gml:TimeInstant gml:id="d6e2486">
-                     <gml:timePosition>2005-05-05T05:05:06</gml:timePosition>
-                  </gml:TimeInstant>
-               </mrl:stepDateTime>
-               <mrl:processor>
-                  <cit:CI_Responsibility>
-                     <cit:role>
-                        <cit:CI_RoleCode codeList="codeListLocation#CI_RoleCode" codeListValue=""/>
-                     </cit:role>
-                     <cit:party>
-                        <cit:CI_Individual>
-                           <cit:name>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:processStep/gmd:LI_ProcessStep/gmd:processor/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString</gco:CharacterString>
-                           </cit:name>
-                        </cit:CI_Individual>
-                     </cit:party>
-                  </cit:CI_Responsibility>
-               </mrl:processor>
-               <mrl:source xlink:href="#lineageSource"/>
-               <mrl:source>
-                  <mrl:LI_Source id="embeddedLineageSource">
-                     <mrl:description>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:source/gmd:LI_Source/gmd:description/gco:CharacterString</gco:CharacterString>
-                     </mrl:description>
-                     <mrl:sourceSpatialResolution>
-                        <mri:MD_Resolution>
-                           <mri:equivalentScale>
-                              <mri:MD_RepresentativeFraction>
-                                 <mri:denominator>
-                                    <gco:Integer>9999998</gco:Integer>
-                                 </mri:denominator>
-                              </mri:MD_RepresentativeFraction>
-                           </mri:equivalentScale>
-                        </mri:MD_Resolution>
-                     </mrl:sourceSpatialResolution>
-                     <mrl:sourceCitation>
-                        <cit:CI_Citation>
-                           <cit:title>
-                              <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:source/gmd:LI_Source/gmd:sourceCitation/gmd:CI_Citation/gmd:title/gco:CharacterString</gco:CharacterString>
-                           </cit:title>
-                           <cit:date gco:nilReason="missing"/>
-                        </cit:CI_Citation>
-                     </mrl:sourceCitation>
-                     <mrl:scope>
-                        <mcc:MD_Scope>
-                           <mcc:level/>
-                           <mcc:extent>
-                              <gex:EX_Extent>
-                                 <gex:description>
-                                    <gco:CharacterString>/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:source/gmd:LI_Source/gmd:sourceExtent/gmd:EX_Extent/gmd:description/gco:CharacterString</gco:CharacterString>
-                                 </gex:description>
-                              </gex:EX_Extent>
-                           </mcc:extent>
-                           <mcc:levelDescription/>
-                        </mcc:MD_Scope>
-                     </mrl:scope>
-                  </mrl:LI_Source>
-               </mrl:source>
-            </mrl:LI_ProcessStep>
-         </mrl:processStep>
-      </mrl:LI_Lineage>
-   </mdb:resourceLineage>
-   <mdb:portrayalCatalogueInfo>
-      <mpc:MD_PortrayalCatalogueReference>
-         <mpc:portrayalCatalogueCitation>
-            <cit:CI_Citation>
-               <cit:title>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:portrayalCatalogueInfo/gmd:MD_PortrayalCatalogueReference/gmd:portrayalCatalogueCitation/gmd:CI_Citation/gmd:title/gco:CharacterString</gco:CharacterString>
-               </cit:title>
-               <cit:alternateTitle>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:portrayalCatalogueInfo/gmd:MD_PortrayalCatalogueReference/gmd:portrayalCatalogueCitation/gmd:CI_Citation/gmd:alternateTitle/gco:CharacterString</gco:CharacterString>
-               </cit:alternateTitle>
-               <cit:date>
-                  <cit:CI_Date>
-                     <cit:date>
-                        <gco:DateTime>2000-01-05T00:00:00</gco:DateTime>
-                     </cit:date>
-                     <cit:dateType>
-                        <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode"
-                                             codeListValue="/gmd:MD_Metadata/gmd:portrayalCatalogueInfo/gmd:MD_PortrayalCatalogueReference/gmd:portrayalCatalogueCitation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode">/gmd:MD_Metadata/gmd:portrayalCatalogueInfo/gmd:MD_PortrayalCatalogueReference/gmd:portrayalCatalogueCitation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode</cit:CI_DateTypeCode>
-                     </cit:dateType>
-                  </cit:CI_Date>
-               </cit:date>
-               <cit:edition>
-                  <gco:CharacterString>/gmd:MD_Metadata/gmd:portrayalCatalogueInfo/gmd:MD_PortrayalCatalogueReference/gmd:portrayalCatalogueCitation/gmd:CI_Citation/gmd:edition/gco:CharacterString</gco:CharacterString>
-               </cit:edition>
-               <cit:editionDate>
-                  <gco:DateTime>2000-02-05T00:00:00</gco:DateTime>
-               </cit:editionDate>
-               <cit:identifier>
-                  <mcc:MD_Identifier>
-                     <mcc:authority>
-                        <cit:CI_Citation>
-                           <cit:title>
-                              <gco:CharacterString>/gmd:portrayalCatalogueInfo/gmd:MD_PortrayalCatalogueReference/gmd:portrayalCatalogueCitation/gmd:CI_Citation/gmd:identifier/gmd:MD_Identifier/gmd:authority/gmd:CI_Citation/gmd:title</gco:CharacterString>
-                           </cit:title>
-                           <cit:date>
-                              <cit:CI_Date>
-                                 <cit:date>
-                                    <gco:DateTime>2000-01-01T02:02:02</gco:DateTime>
-                                 </cit:date>
-                                 <cit:dateType>
-                                    <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode"
-                                                         codeListValue="/gmd:MD_Metadata/gmd:portrayalCatalogueInfo/gmd:MD_PortrayalCatalogueReference/gmd:portrayalCatalogueCitation/gmd:CI_Citation/gmd:identifier/gmd:MD_Identifier/gmd:authority/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode">/gmd:MD_Metadata/gmd:portrayalCatalogueInfo/gmd:MD_PortrayalCatalogueReference/gmd:portrayalCatalogueCitation/gmd:CI_Citation/gmd:identifier/gmd:MD_Identifier/gmd:authority/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:dateType/gmd:CI_DateTypeCode</cit:CI_DateTypeCode>
-                                 </cit:dateType>
-                              </cit:CI_Date>
-                           </cit:date>
-                        </cit:CI_Citation>
-                     </mcc:authority>
-                     <mcc:code>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:portrayalCatalogueInfo/gmd:MD_PortrayalCatalogueReference/gmd:portrayalCatalogueCitation/gmd:CI_Citation/gmd:identifier/gmd:MD_Identifier/gmd:code/gco:CharacterString</gco:CharacterString>
-                     </mcc:code>
-                  </mcc:MD_Identifier>
-               </cit:identifier>
-               <cit:citedResponsibleParty/>
-               <cit:onlineResource>
-                  <cit:CI_OnlineResource>
-                     <cit:linkage>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:portrayalCatalogueInfo/gmd:MD_PortrayalCatalogueReference/gmd:portrayalCatalogueCitation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:linkage/gmd:URL</gco:CharacterString>
-                     </cit:linkage>
-                     <cit:name>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:portrayalCatalogueInfo/gmd:MD_PortrayalCatalogueReference/gmd:portrayalCatalogueCitation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:name/gco:CharacterString</gco:CharacterString>
-                     </cit:name>
-                     <cit:description>
-                        <gco:CharacterString>/gmd:MD_Metadata/gmd:portrayalCatalogueInfo/gmd:MD_PortrayalCatalogueReference/gmd:portrayalCatalogueCitation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:description/gco:CharacterString</gco:CharacterString>
-                     </cit:description>
-                     <cit:function>
-                        <cit:CI_OnLineFunctionCode codeList="" codeListValue="">/gmd:MD_Metadata/gmd:portrayalCatalogueInfo/gmd:MD_PortrayalCatalogueReference/gmd:portrayalCatalogueCitation/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:onlineResource/gmd:CI_OnlineResource/gmd:function/gmd:CI_OnLineFunctionCode</cit:CI_OnLineFunctionCode>
-                     </cit:function>
-                  </cit:CI_OnlineResource>
-               </cit:onlineResource>
-            </cit:CI_Citation>
-         </mpc:portrayalCatalogueCitation>
-      </mpc:MD_PortrayalCatalogueReference>
-   </mdb:portrayalCatalogueInfo>
-   <mdb:metadataConstraints>
-      <mco:MD_LegalConstraints>
-         <mco:useLimitation>
-            <gco:CharacterString>/gmd:MD_Metadata/gmd:metadataConstraints/gmd:MD_LegalConstraints/gmd:useLimitation/gco:CharacterString</gco:CharacterString>
-         </mco:useLimitation>
-      </mco:MD_LegalConstraints>
-   </mdb:metadataConstraints>
-   <mdb:metadataConstraints>
-      <mco:MD_LegalConstraints>
-         <mco:accessConstraints>
-            <mco:MD_RestrictionCode codeList=""
-                                    codeListValue="/gmd:MD_Metadata/gmd:metadataConstraints/gmd:MD_LegalConstraints/gmd:accessConstraints/gmd:MD_RestrictionCode/@codeListValue">/gmd:MD_Metadata/gmd:metadataConstraints/gmd:MD_LegalConstraints/gmd:accessConstraints/gmd:MD_RestrictionCode</mco:MD_RestrictionCode>
-         </mco:accessConstraints>
-         <mco:useConstraints>
-            <mco:MD_RestrictionCode codeList=""
-                                    codeListValue="/gmd:MD_Metadata/gmd:metadataConstraints/gmd:MD_LegalConstraints/gmd:useConstraints/gmd:MD_RestrictionCode/@codeListValue">/gmd:MD_Metadata/gmd:metadataConstraints/gmd:MD_LegalConstraints/gmd:useConstraints/gmd:MD_RestrictionCode</mco:MD_RestrictionCode>
-         </mco:useConstraints>
-      </mco:MD_LegalConstraints>
-   </mdb:metadataConstraints>
-   <mdb:metadataConstraints>
-      <mco:MD_SecurityConstraints>
-         <mco:useLimitation>
-            <gco:CharacterString>/gmd:MD_Metadata/gmd:metadataConstraints/gmd:MD_SecurityConstraints/gmd:useLimitation/gco:CharacterString</gco:CharacterString>
-         </mco:useLimitation>
-         <mco:classification>
-            <mco:MD_ClassificationCode codeList="http://librairies.ign.fr/geoportail/resources/CodeLists.xml#MD_ClassificationCode"
-                                       codeListValue="unclassified">/gmd:MD_Metadata/gmd:metadataConstraints/gmd:MD_SecurityConstraints/gmd:classification/gmd:MD_ClassificationCode</mco:MD_ClassificationCode>
-         </mco:classification>
-      </mco:MD_SecurityConstraints>
-   </mdb:metadataConstraints>
-   <mdb:metadataMaintenance>
-      <mmi:MD_MaintenanceInformation>
-         <mmi:maintenanceAndUpdateFrequency>
-            <mmi:MD_MaintenanceFrequencyCode codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_MaintenanceFrequencyCode"
-                                             codeListValue=""/>
-         </mmi:maintenanceAndUpdateFrequency>
-         <mmi:maintenanceDate>
-            <cit:CI_Date>
-               <cit:date>
-                  <gco:DateTime>1998-08-08T00:00:00</gco:DateTime>
-               </cit:date>
-               <cit:dateType>
-                  <cit:CI_DateTypeCode codeList="codeListLocation#CI_DateTypeCode" codeListValue="update">update</cit:CI_DateTypeCode>
-               </cit:dateType>
-            </cit:CI_Date>
-         </mmi:maintenanceDate>
-         <mmi:maintenanceNote>
-            <gco:CharacterString>/gmd:MD_Metadata/gmd:metadataMaintenance/gmd:MD_MaintenanceInformation/gmd:maintenanceNote/gco:CharacterString</gco:CharacterString>
-         </mmi:maintenanceNote>
-      </mmi:MD_MaintenanceInformation>
-   </mdb:metadataMaintenance>
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/mdt.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/mdt.xsd
deleted file mode 100644
index 4c4c86b1e..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/mdt.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0" 
-  xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0" xmlns:mda="http://standards.iso.org/iso/19115/-3/mda/1.0" 
-  xmlns:mdt="http://standards.iso.org/iso/19115/-3/mdt/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mdt/1.0" version="1.0">
-  <annotation>
-    <documentation>Namespace for XML elements &lt;font color="#1f497d"&gt;required to implement data transfer packages with bundled metadata, data files, and registries defining package content&lt;/font&gt;.</documentation>
-  </annotation>
-  <include schemaLocation="metadataTransfer.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/cat/1.0" schemaLocation="../../../../19115/-3/cat/1.0/cat.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gcx/1.0" schemaLocation="../../../../19115/-3/gcx/1.0/gcx.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mda/1.0" schemaLocation="../../../../19115/-3/mda/1.0/mda.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/mdt.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/mdt.zip
deleted file mode 100644
index 6e9ebae6f..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/mdt.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/metadataTransfer.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/metadataTransfer.xsd
deleted file mode 100644
index 97529e18e..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mdt/1.0/metadataTransfer.xsd
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0" xmlns:mda="http://standards.iso.org/iso/19115/-3/mda/1.0" xmlns:mdt="http://standards.iso.org/iso/19115/-3/mdt/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mdt/1.0" version="1.0">
-  <include schemaLocation="mdt.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/cat/1.0" schemaLocation="../../../../19115/-3/cat/1.0/cat.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gcx/1.0" schemaLocation="../../../../19115/-3/gcx/1.0/gcx.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mda/1.0" schemaLocation="../../../../19115/-3/mda/1.0/mda.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="MX_Aggregate" substitutionGroup="mda:AbstractDS_Aggregate" type="mdt:MX_Aggregate_Type"/>
-  <complexType name="MX_Aggregate_Type">
-    <complexContent>
-      <extension base="mda:AbstractDS_Aggregate_Type">
-        <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="aggregateCatalogue" type="cat:AbstractCT_Catalogue_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="aggregateFile" type="mdt:MX_SupportFile_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MX_Aggregate_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mdt:MX_Aggregate"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MX_DataFile" substitutionGroup="mdt:AbstractMX_File" type="mdt:MX_DataFile_Type"/>
-  <complexType name="MX_DataFile_Type">
-    <complexContent>
-      <extension base="mdt:AbstractMX_File_Type">
-        <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="featureTypes" type="gco:GenericName_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MX_DataFile_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mdt:MX_DataFile"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MX_DataSet" substitutionGroup="gco:AbstractObject" type="mdt:MX_DataSet_Type"/>
-  <complexType name="MX_DataSet_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="datasetCatalogue" type="cat:AbstractCT_Catalogue_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="supportFile" type="mdt:MX_SupportFile_PropertyType"/>
-          <element maxOccurs="unbounded" name="dataFile" type="mdt:MX_DataFile_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MX_DataSet_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mdt:MX_DataSet"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="AbstractMX_File" substitutionGroup="gco:AbstractObject" type="mdt:AbstractMX_File_Type"/>
-  <complexType abstract="true" name="AbstractMX_File_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="fileName" type="gcx:FileName_PropertyType"/>
-          <element name="fileDescription" type="gco:CharacterString_PropertyType"/>
-          <element name="fileType" type="gcx:MimeFileType_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="AbstractMX_File_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mdt:AbstractMX_File"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MX_ScopeCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type"/>
-  <complexType name="MX_ScopeCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mdt:MX_ScopeCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MX_SupportFile" substitutionGroup="mdt:AbstractMX_File" type="mdt:MX_SupportFile_Type"/>
-  <complexType name="MX_SupportFile_Type">
-    <complexContent>
-      <extension base="mdt:AbstractMX_File_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MX_SupportFile_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mdt:MX_SupportFile"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/codelists.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/codelists.html
deleted file mode 100644
index 2ce7f14c1..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/codelists.html
+++ /dev/null
@@ -1,257 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0" xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>
-         Codelists from the Metadata with Schema Extensions (mex) Namespace
-         
-      </title>
-   </head>
-   <body><a name="top"></a><h1>ISO 19115-3 Codelist Report</h1>
-      <h2>
-         Codelists from the Metadata with Schema Extensions (mex) Namespace
-         
-      </h2>
-      <table>
-         <tr><b>
-               <td>Scope</td></b><td>
-               Codelists from the Metadata with Schema Extensions (mex) Namespace
-               
-            </td>
-         </tr>
-         <tr><b>
-               <td>Field of Application</td></b><td>
-               ISO TC211 Metadata Standards
-               
-            </td>
-         </tr>
-         <tr><b>
-               <td>Version (Date)</td></b><td>
-               1.0
-                ()
-            </td>
-         </tr>
-      </table>
-      <h2>
-         MD_DatatypeCode
-          (
-         MD_DatatypeCode
-         ):
-      </h2><b>Description: </b>
-      datatype of element or entity
-      
-      <table width="95%" border="1" cellpadding="2" cellspacing="2">
-         <tr>
-            <th valign="top">Entry</th>
-            <th valign="top">Definition</th>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_DatatypeCode_class
-               
-            </td>
-            <td valign="top">
-               descriptor of a set of objects that share the same
-               attributes, operations, methods, relationships, and
-               behaviour
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_DatatypeCode_codelist
-               
-            </td>
-            <td valign="top">
-               flexible enumeration useful for expressing a long list of
-               values, can be extended
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_DatatypeCode_enumeration
-               
-            </td>
-            <td valign="top">
-               data type whose instances form a list of named literal
-               values, not extendable
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_DatatypeCode_codelistElement
-               
-            </td>
-            <td valign="top">
-               permissible value for a codelist or enumeration
-               
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_DatatypeCode_abstractClass
-               
-            </td>
-            <td valign="top">
-               class that cannot be directly
-               instantiated
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_DatatypeCode_aggregateClass
-               
-            </td>
-            <td valign="top">
-               class that is composed of classes it is connected to by an
-               aggregate relationship
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_DatatypeCode_specifiedClass
-               
-            </td>
-            <td valign="top">
-               subclass that may be substituted for its
-               superclass
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_DatatypeCode_datatypeClass
-               
-            </td>
-            <td valign="top">
-               class with few or no operations whose primary purpose is to
-               hold the abstract state of another class for transmittal, storage, encoding or
-               persistent storage
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_DatatypeCode_interfaceClass
-               
-            </td>
-            <td valign="top">
-               named set of operations that characterize the behaviour of an
-               element
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_DatatypeCode_unionClass
-               
-            </td>
-            <td valign="top">
-               class describing a selection of one of the specified
-               types
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_DatatypeCode_metaClass
-               
-            </td>
-            <td valign="top">
-               class whose instances are classes
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_DatatypeCode_typeClass
-               
-            </td>
-            <td valign="top">
-               class used for specification of a domain of instances
-               (objects), together with the operations applicable to the objects. A type may
-               have attributes and associations
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_DatatypeCode_characterString
-               
-            </td>
-            <td valign="top">
-               textual information
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_DatatypeCode_integer
-               
-            </td>
-            <td valign="top">
-               numerical field
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_DatatypeCode_association
-               
-            </td>
-            <td valign="top">
-               semantic relationship between two classes that involves
-               connections among their instances
-               
-            </td>
-         </tr>
-      </table><a href="#top">top</a><h2>
-         MD_ObligationCode
-          (
-         MD_ObligationCode
-         ):
-      </h2><b>Description: </b>
-      obligation of the element or entity
-      
-      <table width="95%" border="1" cellpadding="2" cellspacing="2">
-         <tr>
-            <th valign="top">Entry</th>
-            <th valign="top">Definition</th>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_ObligationCode_mandatory
-               
-            </td>
-            <td valign="top">
-               element is always required
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_ObligationCode_optional
-               
-            </td>
-            <td valign="top">
-               element is not required
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_ObligationCode_conditional
-               
-            </td>
-            <td valign="top">
-               element is required when a specific condition is
-               met
-               
-            </td>
-         </tr>
-      </table><a href="#top">top</a><hr/><i>Stylesheet: CT_CodelistHTML.xsl Version: 2015-04-17</i></body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/codelists.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/codelists.xml
deleted file mode 100644
index 0a8423844..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/codelists.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cat:CT_CodelistCatalogue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/cat/1.0 ../../../-3/cat/1.0/cat.xsd"
- xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0"
- xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:gml="http://www.opengis.net/gml/3.2">
-   <!--=====Catalogue description=====-->
-   <cat:name>
-      <gco:CharacterString>Codelists from the Metadata with Schema Extensions (mex) Namespace</gco:CharacterString>
-   </cat:name>
-   <cat:scope>
-      <gco:CharacterString>Codelists from the Metadata with Schema Extensions (mex) Namespace</gco:CharacterString>
-   </cat:scope>
-   <cat:fieldOfApplication>
-      <gco:CharacterString>ISO TC211 Metadata Standards</gco:CharacterString>
-   </cat:fieldOfApplication>
-   <cat:versionNumber>
-      <gco:CharacterString>1.0</gco:CharacterString>
-   </cat:versionNumber>
-   <cat:versionDate>
-      <gco:Date>2015-04-18</gco:Date>
-   </cat:versionDate>
-   <cat:locale>
-      <lan:PT_Locale>
-         <lan:language>
-            <lan:LanguageCode codeList="standards.iso.org/19115/-3/lan/1.0/codelists.xml#LanguageCode" codeListValue="eng">eng</lan:LanguageCode>
-         </lan:language>
-         <lan:characterEncoding>
-            <lan:MD_CharacterSetCode codeList="standards.iso.org/19115/-3/lan/1.0/codelists.xml#MD_CharacterSetCode" codeListValue="UTF-8">UTF-8</lan:MD_CharacterSetCode>
-         </lan:characterEncoding>
-      </lan:PT_Locale>
-   </cat:locale>
-   <!--============================= Codelists =======================================-->
-   <!-- MD_DatatypeCode  -->
-   <cat:codelistItem>
-      <cat:CT_Codelist id="MD_DatatypeCode">
-         <cat:identifier>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >MD_DatatypeCode</gco:ScopedName>
-         </cat:identifier>
-         <cat:name>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >MD_DatatypeCode</gco:ScopedName>
-         </cat:name>
-         <cat:definition>
-            <gco:CharacterString>datatype of element or entity</gco:CharacterString>
-         </cat:definition>
-         <cat:description>
-            <gco:CharacterString>datatype of element or entity</gco:CharacterString>
-         </cat:description>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_DatatypeCode_class">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_DatatypeCode_class</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>descriptor of a set of objects that share the same
-                     attributes, operations, methods, relationships, and
-                     behaviour</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_DatatypeCode_codelist">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_DatatypeCode_codelist</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>flexible enumeration useful for expressing a long list of
-                     values, can be extended</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_DatatypeCode_enumeration">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_DatatypeCode_enumeration</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>data type whose instances form a list of named literal
-                     values, not extendable</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_DatatypeCode_codelistElement">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_DatatypeCode_codelistElement</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>permissible value for a codelist or enumeration
-                  </gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_DatatypeCode_abstractClass">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_DatatypeCode_abstractClass</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>class that cannot be directly
-                     instantiated</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_DatatypeCode_aggregateClass">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_DatatypeCode_aggregateClass</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>class that is composed of classes it is connected to by an
-                     aggregate relationship</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_DatatypeCode_specifiedClass">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_DatatypeCode_specifiedClass</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>subclass that may be substituted for its
-                     superclass</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_DatatypeCode_datatypeClass">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_DatatypeCode_datatypeClass</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>class with few or no operations whose primary purpose is to
-                     hold the abstract state of another class for transmittal, storage, encoding or
-                     persistent storage</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_DatatypeCode_interfaceClass">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_DatatypeCode_interfaceClass</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>named set of operations that characterize the behaviour of an
-                     element</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_DatatypeCode_unionClass">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_DatatypeCode_unionClass</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>class describing a selection of one of the specified
-                     types</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_DatatypeCode_metaClass">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_DatatypeCode_metaClass</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>class whose instances are classes</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_DatatypeCode_typeClass">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_DatatypeCode_typeClass</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>class used for specification of a domain of instances
-                     (objects), together with the operations applicable to the objects. A type may
-                     have attributes and associations</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_DatatypeCode_characterString">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_DatatypeCode_characterString</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>textual information</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_DatatypeCode_integer">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_DatatypeCode_integer</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>numerical field</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_DatatypeCode_association">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_DatatypeCode_association</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>semantic relationship between two classes that involves
-                     connections among their instances</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-      </cat:CT_Codelist>
-   </cat:codelistItem>
-   <!-- MD_ObligationCode  -->
-   <cat:codelistItem>
-      <cat:CT_Codelist id="MD_ObligationCode">
-         <cat:identifier>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >MD_ObligationCode</gco:ScopedName>
-         </cat:identifier>
-         <cat:name>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >MD_ObligationCode</gco:ScopedName>
-         </cat:name>
-         <cat:definition>
-            <gco:CharacterString>obligation of the element or entity</gco:CharacterString>
-         </cat:definition>
-         <cat:description>
-            <gco:CharacterString>obligation of the element or entity</gco:CharacterString>
-         </cat:description>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ObligationCode_mandatory">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_ObligationCode_mandatory</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>element is always required</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ObligationCode_optional">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_ObligationCode_optional</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>element is not required</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ObligationCode_conditional">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_ObligationCode_conditional</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>element is required when a specific condition is
-                     met</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-      </cat:CT_Codelist>
-   </cat:codelistItem>
-   <!--=== EOF ===-->
-</cat:CT_CodelistCatalogue>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/index.html
deleted file mode 100644
index 3ea3dee84..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/index.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Metadata with Schema Extensions (MEX) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Metadata with Schema Extensions (MEX) Version: 1.0</h1><img src="mex.png"><h2>Description</h2>
-      <p>MEX 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.12.  It includes elements describing extensions to metadata standards. The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>Sample XML files for mex 1.0</h2><a href="mex_invalid.xml">mex_invalid.xml</a> <a href="mex_valid.xml">mex_valid.xml</a> 
-      <h2>CodeLists for mex 1.0</h2><a href="codelists.html">codelists.html</a> <a href="codelists.xml">codelists.xml</a> 
-      <h2>XML Namespace for mex 1.0</h2>
-      <p>The namespace URI for mex 1.0 is <b>http://standards.iso.org/iso/19115/-3/mex/1.0</b>.
-      </p>
-      <h2>XML Schema for mex 1.0</h2>
-      <p><b><a href="mex.xsd">mex.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the mex 1.0 namespace or by XML Schema documents importing the mex 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the mex namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for mex 1.0 are available <a href="mex.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for mex 1.0</h2>
-      <p><b><a href="metadataExtension.xsd">metadataExtension.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.12. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): <b>MD_DatatypeCode</b>, MD_ExtendedElementInformation, MD_MetadataExtensionInformation, and <b>MD_ObligationCode</b></p>
-      <h2>Related XML Namespaces for mex 1.0</h2> The mex 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Geographic COmmon</td>
-            <td>gco</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gco/1.0">http://standards.iso.org/iso/19115/-3/gco/1.0</a></td>
-            <td>../../../../19115/-3/gco/1.0/gco.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata Common Classes</td>
-            <td>mcc</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mcc/1.0">http://standards.iso.org/iso/19115/-3/mcc/1.0</a></td>
-            <td>../../../../19115/-3/mcc/1.0/mcc.xsd</td>
-         </tr>
-      </table>
-      <h2>Schematron Validation Rules for mex 1.0</h2> Schematron rules for validating instance documents of the mex 1.0 namespace are in <a href="mex.sch">mex.sch</a>. Other schematron rule sets that are
-      required for a complete validation are: gco.sch, mcc.sch, and mcc.sch
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/metadataExtension.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/metadataExtension.xsd
deleted file mode 100644
index 5822a5393..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/metadataExtension.xsd
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:mex="http://standards.iso.org/iso/19115/-3/mex/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mex/1.0" version="1.0">
-  <annotation>
-    <documentation>Method used to represent geographic information in the dataset</documentation>
-  </annotation>
-  <include schemaLocation="mex.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="MD_DatatypeCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>datatype of element or entity</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_DatatypeCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mex:MD_DatatypeCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_ExtendedElementInformation" substitutionGroup="gco:AbstractObject" type="mex:MD_ExtendedElementInformation_Type">
-    <annotation>
-      <documentation>new metadata element, not found in ISO 19115, which is required to describe geographic data</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_ExtendedElementInformation_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="name" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>name of the extended metadata element</documentation>
-            </annotation>
-          </element>
-          <element name="definition" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>definition of the extended element</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="obligation" type="mex:MD_ObligationCode_PropertyType">
-            <annotation>
-              <documentation>obligation of the extended element</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="condition" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>condition under which the extended element is mandatory</documentation>
-            </annotation>
-          </element>
-          <element name="dataType" type="mex:MD_DatatypeCode_PropertyType">
-            <annotation>
-              <documentation>code which identifies the kind of value provided in the extended element</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="maximumOccurrence" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>maximum occurrence of the extended element</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="domainValue" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>valid values that can be assigned to the extended element</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" name="parentEntity" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>name of the metadata entity(s) under which this extended metadata element may appear. The name(s) may be standard metadata element(s) or other extended metadata element(s)</documentation>
-            </annotation>
-          </element>
-          <element name="rule" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>specifies how the extended element relates to other existing elements and entities</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="rationale" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>reason for creating the extended element</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" name="source" type="mcc:Abstract_Responsibility_PropertyType">
-            <annotation>
-              <documentation>name of the person or organisation creating the extended element</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="conceptName" type="gco:CharacterString_PropertyType"/>
-          <element minOccurs="0" name="code" type="gco:CharacterString_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_ExtendedElementInformation_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mex:MD_ExtendedElementInformation"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_MetadataExtensionInformation" substitutionGroup="mcc:Abstract_MetadataExtension" type="mex:MD_MetadataExtensionInformation_Type">
-    <annotation>
-      <documentation>information describing metadata extensions</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_MetadataExtensionInformation_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_MetadataExtension_Type">
-        <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="extensionOnLineResource" type="mcc:Abstract_OnlineResource_PropertyType">
-            <annotation>
-              <documentation>information about on-line sources containing the community profile name and the extended metadata elements. Information for all new metadata elements</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="extendedElementInformation" type="mex:MD_ExtendedElementInformation_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_MetadataExtensionInformation_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mex:MD_MetadataExtensionInformation"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_ObligationCode" substitutionGroup="gco:CharacterString" type="mex:MD_ObligationCode_Type">
-    <annotation>
-      <documentation>obligation of the element or entity</documentation>
-    </annotation>
-  </element>
-  <simpleType name="MD_ObligationCode_Type">
-    <annotation>
-      <documentation>obligation of the element or entity</documentation>
-    </annotation>
-    <restriction base="string">
-      <enumeration value="mandatory">
-        <annotation>
-          <documentation>element is always required</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="optional">
-        <annotation>
-          <documentation>element is not required</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="conditional">
-        <annotation>
-          <documentation>element is required when a specific condition is met</documentation>
-        </annotation>
-      </enumeration>
-    </restriction>
-  </simpleType>
-  <complexType name="MD_ObligationCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mex:MD_ObligationCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/mex.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/mex.png
deleted file mode 100644
index e09aba1e9..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/mex.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/mex.sch b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/mex.sch
deleted file mode 100644
index 26a5b478f..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/mex.sch
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron">
-  <sch:ns prefix="cit" uri="http://standards.iso.org/iso/19115/-3/cit/1.0"/>
-  <sch:ns prefix="mri" uri="http://standards.iso.org/iso/19115/-3/mri/1.0"/>
-  <sch:ns prefix="mex" uri="http://standards.iso.org/iso/19115/-3/mex/1.0"/>
-  <sch:ns prefix="mcc" uri="http://standards.iso.org/iso/19115/-3/mcc/1.0"/>
-  <sch:ns prefix="lan" uri="http://standards.iso.org/iso/19115/-3/lan/1.0"/>
-  <sch:ns prefix="gco" uri="http://standards.iso.org/iso/19115/-3/gco/1.0"/>
-
-  <!--
-    ISO 19115-3 base requirements for metadata instance documents
-    
-    See ISO19115-1:2014(E) page 21, Figure 16 Metadata extension information classes
-  -->
-  
-  <!-- 
-    Rule: MD_ExtendedElementInformation
-    Ref: {if dataType notEqual codelist, enumeration, or codelistElement, 
-          then
-          obligation, maximumOccurence and domainValue are mandatory}
-  -->
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.mex.datatypedetails-maxocc-failure-en"
-      xml:lang="en">
-      Extended element information "<sch:value-of select="$name"/>"
-      of type "<sch:value-of select="$dataType"/>"
-      does not specified max occurence.</sch:diagnostic>
-    <sch:diagnostic id="rule.mex.datatypedetails-maxocc-failure-fr"
-      xml:lang="fr">
-      L'élément d'extension "<sch:value-of select="$name"/>"
-      de type "<sch:value-of select="$dataType"/>"
-      ne précise pas le nombre d'occurences maximum.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.mex.datatypedetails-maxocc-success-en"
-      xml:lang="en">
-      Extended element information "<sch:value-of select="$name"/>"
-      of type "<sch:value-of select="$dataType"/>"
-      has max occurence: "<sch:value-of select="$maximumOccurrence"/>".
-    </sch:diagnostic>
-    <sch:diagnostic id="rule.mex.datatypedetails-maxocc-success-fr"
-      xml:lang="fr">
-      L'élément d'extension "<sch:value-of select="$name"/>"
-      de type "<sch:value-of select="$dataType"/>"
-      a pour nombre d'occurences maximum : "<sch:value-of select="$maximumOccurrence"/>".
-    </sch:diagnostic>
-    
-    
-    
-    <sch:diagnostic id="rule.mex.datatypedetails-domain-failure-en"
-      xml:lang="en">
-      Extended element information "<sch:value-of select="$name"/>"
-      of type "<sch:value-of select="$dataType"/>"
-      does not specified domain value.</sch:diagnostic>
-    <sch:diagnostic id="rule.mex.datatypedetails-domain-failure-fr"
-      xml:lang="fr">
-      L'élément d'extension "<sch:value-of select="$name"/>"
-      de type "<sch:value-of select="$dataType"/>"
-      ne précise pas la valeur du domaine.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.mex.datatypedetails-domain-success-en"
-      xml:lang="en">
-      Extended element information "<sch:value-of select="$name"/>"
-      of type "<sch:value-of select="$dataType"/>"
-      has domain value: "<sch:value-of select="$domainValue"/>".
-    </sch:diagnostic>
-    <sch:diagnostic id="rule.mex.datatypedetails-domain-success-fr"
-      xml:lang="fr">
-      L'élément d'extension "<sch:value-of select="$name"/>"
-      de type "<sch:value-of select="$dataType"/>"
-      a pour valeur du domaine : "<sch:value-of select="$domainValue"/>".
-    </sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.mex.datatypedetails">
-    <sch:title xml:lang="en">Extended element information 
-      which are not codelist, enumeration or codelistElement 
-      MUST specified max occurence and domain value</sch:title>
-    <sch:title xml:lang="fr">Un élément d'extension qui n'est
-      ni une codelist, ni une énumération, ni un élément de codelist
-      DOIT préciser le nombre maximum d'occurences 
-      ainsi que la valeur du domaine</sch:title>
-    
-    <sch:rule context="//mex:MD_ExtendedElementInformation[
-      mex:dataType/mex:MD_DatatypeCode/@codeListValue != 'codelist' and
-      mex:dataType/mex:MD_DatatypeCode/@codeListValue != 'enumeration' and
-      mex:dataType/mex:MD_DatatypeCode/@codeListValue != 'codelistElement'
-      ]">
-      
-      <sch:let name="name" 
-        value="normalize-space(mex:name/*)"/>
-      
-      <sch:let name="dataType" 
-        value="normalize-space(mex:dataType/mex:MD_DatatypeCode/@codeListValue)"/>
-      
-      
-      <sch:let name="maximumOccurrence" 
-        value="normalize-space(mex:maximumOccurrence/*)"/>
-      
-      <sch:let name="hasMaximumOccurrence" 
-        value="$maximumOccurrence != ''"/>
-      
-      <sch:assert test="$hasMaximumOccurrence"
-        diagnostics="rule.mex.datatypedetails-maxocc-failure-en 
-                     rule.mex.datatypedetails-maxocc-failure-fr"/>
-      
-      <sch:report test="$hasMaximumOccurrence"
-        diagnostics="rule.mex.datatypedetails-maxocc-success-en 
-                     rule.mex.datatypedetails-maxocc-success-fr"/>
-      
-      
-      <sch:let name="domainValue" 
-        value="normalize-space(mex:domainValue/*)"/>
-      
-      <sch:let name="hasDomainValue" 
-        value="$domainValue != ''"/>
-      
-      <sch:assert test="$hasDomainValue"
-        diagnostics="rule.mex.datatypedetails-domain-failure-en 
-                     rule.mex.datatypedetails-domain-failure-fr"/>
-      
-      <sch:report test="$hasDomainValue"
-        diagnostics="rule.mex.datatypedetails-domain-success-en 
-                     rule.mex.datatypedetails-domain-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
-  
-  <!-- 
-    Rule: MD_ExtendedElementInformation
-    Ref:  {if obligation = conditional then condition is mandatory}
-  -->
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.mex.conditional-failure-en"
-      xml:lang="en">
-      The conditional extended element "<sch:value-of select="$name"/>"
-      does not specified the condition.</sch:diagnostic>
-    <sch:diagnostic id="rule.mex.conditional-failure-fr"
-      xml:lang="fr">
-      L'élément d'extension conditionnel "<sch:value-of select="$name"/>"
-      ne précise pas les termes de la condition.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.mex.conditional-success-en"
-      xml:lang="en">
-      The conditional extended element "<sch:value-of select="$name"/>"
-      has for condition: "<sch:value-of select="$condition"/>".
-    </sch:diagnostic>
-    <sch:diagnostic id="rule.mex.conditional-success-fr"
-      xml:lang="fr">
-      L'élément d'extension conditionnel "<sch:value-of select="$name"/>"
-      a pour condition : "<sch:value-of select="$condition"/>".
-    </sch:diagnostic>
-    
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.mex.conditional">
-    <sch:title xml:lang="en">Extended element information 
-      which are conditional MUST explained the condition</sch:title>
-    <sch:title xml:lang="fr">Un élément d'extension conditionnel
-      DOIT préciser les termes de la condition</sch:title>
-    
-    <sch:rule context="//mex:MD_ExtendedElementInformation[
-      mex:obligation/mex:MD_ObligationCode = 'conditional'
-      ]">
-      
-      <sch:let name="name" 
-        value="normalize-space(mex:name/*)"/>
-      
-      <sch:let name="condition" 
-        value="normalize-space(mex:condition/*)"/>
-      
-      <sch:let name="hasCondition" 
-        value="$condition != ''"/>
-      
-      <sch:assert test="$hasCondition"
-        diagnostics="rule.mex.conditional-failure-en 
-                     rule.mex.conditional-failure-fr"/>
-      
-      <sch:report test="$hasCondition"
-        diagnostics="rule.mex.conditional-success-en 
-                     rule.mex.conditional-success-fr"/>
-      
-    </sch:rule>
-  </sch:pattern>
-  
-  
-  
-  
-  
-  <!-- 
-    Rule: MD_ExtendedElementInformation
-    Ref: {if dataType = codelistElement, enumeration, or codelist then code is
-        mandatory}
-        
-    Ref: {if dataType = codelistElement, enumeration, or codelist then
-        conceptName is mandatory}
-  -->
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.mex.mandatorycode-failure-en"
-      xml:lang="en">
-      The extended element "<sch:value-of select="$name"/>"
-      of type "<sch:value-of select="$dataType"/>"
-      does not specified a code.</sch:diagnostic>
-    <sch:diagnostic id="rule.mex.mandatorycode-failure-fr"
-      xml:lang="fr">
-      L'élément d'extension "<sch:value-of select="$name"/>"
-      de type "<sch:value-of select="$dataType"/>"
-      ne précise pas de code.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.mex.mandatorycode-success-en"
-      xml:lang="en">
-      The extended element "<sch:value-of select="$name"/>"
-      of type "<sch:value-of select="$dataType"/>"
-      has for code: "<sch:value-of select="$code"/>".
-    </sch:diagnostic>
-    <sch:diagnostic id="rule.mex.mandatorycode-success-fr"
-      xml:lang="fr">
-      L'élément d'extension "<sch:value-of select="$name"/>"
-      de type "<sch:value-of select="$dataType"/>"
-      a pour code : "<sch:value-of select="$code"/>".
-    </sch:diagnostic>
-    
-    
-    
-    
-    
-    <sch:diagnostic id="rule.mex.mex.mandatoryconceptname-failure-en"
-      xml:lang="en">
-      The extended element "<sch:value-of select="$name"/>"
-      of type "<sch:value-of select="$dataType"/>"
-      does not specified a concept name.</sch:diagnostic>
-    <sch:diagnostic id="rule.mex.mex.mandatoryconceptname-failure-fr"
-      xml:lang="fr">
-      L'élément d'extension "<sch:value-of select="$name"/>"
-      de type "<sch:value-of select="$dataType"/>"
-      ne précise pas de nom de concept.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.mex.mex.mandatoryconceptname-success-en"
-      xml:lang="en">
-      The extended element "<sch:value-of select="$name"/>"
-      of type "<sch:value-of select="$dataType"/>"
-      has for concept name: "<sch:value-of select="$conceptName"/>".
-    </sch:diagnostic>
-    <sch:diagnostic id="rule.mex.mex.mandatoryconceptname-success-fr"
-      xml:lang="fr">
-      L'élément d'extension "<sch:value-of select="$name"/>"
-      de type "<sch:value-of select="$dataType"/>"
-      a pour nom de concept : "<sch:value-of select="$conceptName"/>".
-    </sch:diagnostic>
-    
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.mex.mandatorycode">
-    <sch:title xml:lang="en">Extended element information 
-      which are codelist, enumeration or codelistElement 
-      MUST specified a code and a concept name</sch:title>
-    <sch:title xml:lang="fr">Un élément d'extension qui est
-      une codelist, une énumération, un élément de codelist
-      DOIT préciser un code et un nom de concept</sch:title>
-    
-    <sch:rule context="//mex:MD_ExtendedElementInformation[
-      mex:dataType/mex:MD_DatatypeCode/@codeListValue = 'codelist' or
-      mex:dataType/mex:MD_DatatypeCode/@codeListValue = 'enumeration' or
-      mex:dataType/mex:MD_DatatypeCode/@codeListValue = 'codelistElement'
-      ]">
-      
-      <sch:let name="name" 
-        value="normalize-space(mex:name/*)"/>
-      
-      <sch:let name="dataType" 
-        value="normalize-space(mex:dataType/mex:MD_DatatypeCode/@codeListValue)"/>
-      
-      <sch:let name="code" 
-        value="normalize-space(mex:code/*)"/>
-      
-      <sch:let name="hasCode" 
-        value="$code != ''"/>
-      
-      <sch:assert test="$hasCode"
-        diagnostics="rule.mex.mandatorycode-failure-en 
-                     rule.mex.mandatorycode-failure-fr"/>
-      
-      <sch:report test="$hasCode"
-        diagnostics="rule.mex.mandatorycode-success-en 
-                     rule.mex.mandatorycode-success-fr"/>
-      
-      
-      
-      <sch:let name="conceptName" 
-        value="normalize-space(mex:conceptName/*)"/>
-      
-      <sch:let name="hasConceptName" 
-        value="$conceptName != ''"/>
-      
-      <sch:assert test="$hasConceptName"
-        diagnostics="rule.mex.mex.mandatoryconceptname-failure-en 
-                     rule.mex.mex.mandatoryconceptname-failure-fr"/>
-      
-      <sch:report test="$hasConceptName"
-        diagnostics="rule.mex.mex.mandatoryconceptname-success-en 
-                     rule.mex.mex.mandatoryconceptname-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
-  
-  
-  
-  <!-- 
-    Rule: MD_ExtendedElementInformation
-    Ref: {if dataType = codelist, enumeration, or codelistElement then name is
-        not used}
-    Comment: No test. Should we set the element invalid if name is set ? TODO-QUESTION
-  -->
-  
-  
-  
-</sch:schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/mex.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/mex.xsd
deleted file mode 100644
index a4aa065b2..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/mex.xsd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:mex="http://standards.iso.org/iso/19115/-3/mex/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mex/1.0" version="1.0">
-  <annotation>
-    <documentation>Namespace for XML elements &lt;font color="#1f497d"&gt;used to document user-defined metadata extensions&lt;/font&gt;.</documentation>
-  </annotation>
-  <include schemaLocation="metadataExtension.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/mex.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/mex.zip
deleted file mode 100644
index 6081b74af..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/mex.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/mex_invalid.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/mex_invalid.xml
deleted file mode 100644
index 814d2df74..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/mex_invalid.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mdt/1.0 ../../mdt/1.0/mdt.xsd" 
- xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
- xmlns:mex="http://standards.iso.org/iso/19115/-3/mex/1.0">
-   <mdb:metadataIdentifier></mdb:metadataIdentifier>
-   <mdb:contact></mdb:contact>
-   <mdb:dateInfo></mdb:dateInfo>
-   <mdb:metadataExtensionInfo>
-      <mex:MD_MetadataExtensionInformation>
-         
-         <!-- Invalid for rule.mex.datatypedetails -->
-         <mex:extendedElementInformation>
-            <mex:MD_ExtendedElementInformation>
-               <mex:name>
-                  <gco:CharacterString>sss01</gco:CharacterString>
-               </mex:name>
-               <mex:definition></mex:definition>
-               <mex:dataType>
-                  <mex:MD_DatatypeCode 
-                     codeList="" 
-                     codeListValue="datatypeClass"/>
-               </mex:dataType>
-               <mex:maximumOccurrence>
-                  <gco:CharacterString>3</gco:CharacterString>
-               </mex:maximumOccurrence>
-               <mex:domainValue>
-                  <gco:CharacterString></gco:CharacterString>
-               </mex:domainValue>
-               <mex:parentEntity></mex:parentEntity>
-               <mex:rule></mex:rule>
-               <mex:source></mex:source>
-            </mex:MD_ExtendedElementInformation>
-         </mex:extendedElementInformation>
-         
-         <mex:extendedElementInformation>
-            <mex:MD_ExtendedElementInformation>
-               <mex:name>
-                  <gco:CharacterString>sss02</gco:CharacterString>
-               </mex:name>
-               <mex:definition></mex:definition>
-               <mex:dataType>
-                  <mex:MD_DatatypeCode 
-                     codeList="" 
-                     codeListValue="datatypeClass"/>
-               </mex:dataType>
-               <mex:domainValue>
-                  <gco:CharacterString>Sin Sin Sin</gco:CharacterString>
-               </mex:domainValue>
-               <mex:parentEntity></mex:parentEntity>
-               <mex:rule></mex:rule>
-               <mex:source></mex:source>
-            </mex:MD_ExtendedElementInformation>
-         </mex:extendedElementInformation>
-         
-         
-         <mex:extendedElementInformation>
-            <mex:MD_ExtendedElementInformation>
-               <mex:name>
-                  <gco:CharacterString>sss03</gco:CharacterString>
-               </mex:name>
-               <mex:definition></mex:definition>
-               <mex:dataType>
-                  <mex:MD_DatatypeCode 
-                     codeList="" 
-                     codeListValue="datatypeClass"/>
-               </mex:dataType>
-               <mex:maximumOccurrence>
-                  <gco:CharacterString></gco:CharacterString>
-               </mex:maximumOccurrence>
-               <mex:parentEntity></mex:parentEntity>
-               <mex:rule></mex:rule>
-               <mex:source></mex:source>
-            </mex:MD_ExtendedElementInformation>
-         </mex:extendedElementInformation>
-         
-         <!-- Invalid for rule.mex.conditional -->
-         <mex:extendedElementInformation>
-            <mex:MD_ExtendedElementInformation>
-               <mex:name>
-                  <gco:CharacterString>conditional element</gco:CharacterString>
-               </mex:name>
-               <mex:definition></mex:definition>
-               <mex:obligation>
-                  <mex:MD_ObligationCode>conditional</mex:MD_ObligationCode>
-               </mex:obligation>
-               <mex:condition>
-                  <gco:CharacterString></gco:CharacterString>
-               </mex:condition>
-               <mex:dataType></mex:dataType>
-               <mex:parentEntity></mex:parentEntity>
-               <mex:rule></mex:rule>
-               <mex:source></mex:source>
-            </mex:MD_ExtendedElementInformation>
-         </mex:extendedElementInformation>
-          
-         <!-- Invalid for rule.mex.mandatorycode -->
-         <mex:extendedElementInformation>
-            <mex:MD_ExtendedElementInformation>
-               <mex:name>
-                  <gco:CharacterString>codelist</gco:CharacterString>
-               </mex:name>
-               <mex:definition></mex:definition>
-               <mex:dataType>
-                  <mex:MD_DatatypeCode 
-                     codeList="" 
-                     codeListValue="codelist"/>
-               </mex:dataType>
-               <mex:parentEntity></mex:parentEntity>
-               <mex:rule></mex:rule>
-               <mex:source></mex:source>
-               <mex:code>
-                  <gco:CharacterString></gco:CharacterString>
-               </mex:code>
-            </mex:MD_ExtendedElementInformation>
-         </mex:extendedElementInformation>
-         
-      </mex:MD_MetadataExtensionInformation>
-   </mdb:metadataExtensionInfo>
-   <mdb:identificationInfo/>
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/mex_valid.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/mex_valid.xml
deleted file mode 100644
index 5eccb2274..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mex/1.0/mex_valid.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mdt/1.0 ../../mdt/1.0/mdt.xsd" 
- xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0" 
- xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
- xmlns:mex="http://standards.iso.org/iso/19115/-3/mex/1.0">
-   <mdb:metadataIdentifier></mdb:metadataIdentifier>
-   <mdb:contact></mdb:contact>
-   <mdb:dateInfo></mdb:dateInfo>
-   <mdb:metadataExtensionInfo>
-      <mex:MD_MetadataExtensionInformation>
-         
-         <!-- Valid for rule.mex.datatypedetails -->
-         <mex:extendedElementInformation>
-            <mex:MD_ExtendedElementInformation>
-               <mex:name>
-                  <gco:CharacterString>sss</gco:CharacterString>
-               </mex:name>
-               <mex:definition></mex:definition>
-               <mex:dataType>
-                  <mex:MD_DatatypeCode 
-                     codeList="" 
-                     codeListValue="datatypeClass"/>
-               </mex:dataType>
-               <mex:maximumOccurrence>
-                  <gco:CharacterString>3</gco:CharacterString>
-               </mex:maximumOccurrence>
-               <mex:domainValue>
-                  <gco:CharacterString>Sin Sin Sin</gco:CharacterString>
-               </mex:domainValue>
-               <mex:parentEntity></mex:parentEntity>
-               <mex:rule></mex:rule>
-               <mex:source></mex:source>
-            </mex:MD_ExtendedElementInformation>
-         </mex:extendedElementInformation>
-         
-         
-         
-         <!-- Valid for rule.mex.conditional -->
-         <mex:extendedElementInformation>
-            <mex:MD_ExtendedElementInformation>
-               <mex:name>
-                  <gco:CharacterString>conditional element</gco:CharacterString>
-               </mex:name>
-               <mex:definition></mex:definition>
-               <mex:obligation>
-                  <mex:MD_ObligationCode>conditional</mex:MD_ObligationCode>
-               </mex:obligation>
-               <mex:condition>
-                  <gco:CharacterString>if ... then ...</gco:CharacterString>
-               </mex:condition>
-               <mex:dataType></mex:dataType>
-               <mex:parentEntity></mex:parentEntity>
-               <mex:rule></mex:rule>
-               <mex:source></mex:source>
-            </mex:MD_ExtendedElementInformation>
-         </mex:extendedElementInformation>
-         
-         
-         
-         
-         
-         <!-- Valid for rule.mex.mandatorycode -->
-         <mex:extendedElementInformation>
-            <mex:MD_ExtendedElementInformation>
-               <mex:name>
-                  <gco:CharacterString>codelist</gco:CharacterString>
-               </mex:name>
-               <mex:definition></mex:definition>
-               <mex:dataType>
-                  <mex:MD_DatatypeCode 
-                     codeList="" 
-                     codeListValue="codelist"/>
-               </mex:dataType>
-               <mex:parentEntity></mex:parentEntity>
-               <mex:rule></mex:rule>
-               <mex:source></mex:source>
-               <mex:conceptName>
-                  <gco:CharacterString>concept name</gco:CharacterString>
-               </mex:conceptName>
-               <mex:code>
-                  <gco:CharacterString>CD_3</gco:CharacterString>
-               </mex:code>
-            </mex:MD_ExtendedElementInformation>
-         </mex:extendedElementInformation>
-         <mex:extendedElementInformation>
-            <mex:MD_ExtendedElementInformation>
-               <mex:name>
-                  <gco:CharacterString>codelist element</gco:CharacterString>
-               </mex:name>
-               <mex:definition></mex:definition>
-               <mex:dataType>
-                  <mex:MD_DatatypeCode 
-                     codeList="" 
-                     codeListValue="codelistElement"/>
-               </mex:dataType>
-               <mex:parentEntity></mex:parentEntity>
-               <mex:rule></mex:rule>
-               <mex:source></mex:source>
-               <mex:conceptName>
-                  <gco:CharacterString>concept name</gco:CharacterString>
-               </mex:conceptName>
-               <mex:code>
-                  <gco:CharacterString>CDE_3</gco:CharacterString>
-               </mex:code>
-            </mex:MD_ExtendedElementInformation>
-         </mex:extendedElementInformation>
-         <mex:extendedElementInformation>
-            <mex:MD_ExtendedElementInformation>
-               <mex:name>
-                  <gco:CharacterString>enumeration</gco:CharacterString>
-               </mex:name>
-               <mex:definition></mex:definition>
-               <mex:dataType>
-                  <mex:MD_DatatypeCode 
-                     codeList="" 
-                     codeListValue="enumeration"/>
-               </mex:dataType>
-               <mex:parentEntity></mex:parentEntity>
-               <mex:rule></mex:rule>
-               <mex:source></mex:source>
-               <mex:conceptName>
-                  <gco:CharacterString>concept name</gco:CharacterString>
-               </mex:conceptName>
-               <mex:code>
-                  <gco:CharacterString>ENU_3</gco:CharacterString>
-               </mex:code>
-            </mex:MD_ExtendedElementInformation>
-         </mex:extendedElementInformation>
-         
-         
-         
-      </mex:MD_MetadataExtensionInformation>
-   </mdb:metadataExtensionInfo>
-   <mdb:identificationInfo/>
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/codelists.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/codelists.html
deleted file mode 100644
index 2dfcaf687..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/codelists.html
+++ /dev/null
@@ -1,203 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0" xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>
-         Codelists from the Metadata for Maintenance Information (mex) Namespace
-         
-      </title>
-   </head>
-   <body><a name="top"></a><h1>ISO 19115-3 Codelist Report</h1>
-      <h2>
-         Codelists from the Metadata for Maintenance Information (mex) Namespace
-         
-      </h2>
-      <table>
-         <tr><b>
-               <td>Scope</td></b><td>
-               Codelists from the Metadata for Maintenance Information (mex) Namespace
-               
-            </td>
-         </tr>
-         <tr><b>
-               <td>Field of Application</td></b><td>
-               ISO TC211 Metadata Standards
-               
-            </td>
-         </tr>
-         <tr><b>
-               <td>Version (Date)</td></b><td>
-               1.0
-                ()
-            </td>
-         </tr>
-      </table>
-      <h2>
-         MD_MaintenanceFrequencyCode
-          (
-         MD_MaintenanceFrequencyCode
-         ):
-      </h2><b>Description: </b>
-      frequency with which modifications and deletions are made to the
-      data after it is first produced
-      
-      <table width="95%" border="1" cellpadding="2" cellspacing="2">
-         <tr>
-            <th valign="top">Entry</th>
-            <th valign="top">Definition</th>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_MaintenanceFrequencyCode_continual
-               
-            </td>
-            <td valign="top">
-               resource is repeatedly and frequently
-               updated
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_MaintenanceFrequencyCode_daily
-               
-            </td>
-            <td valign="top">
-               resource is updated each day
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_MaintenanceFrequencyCode_weekly
-               
-            </td>
-            <td valign="top">
-               resource is updated on a weekly basis
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_MaintenanceFrequencyCode_fortnightly
-               
-            </td>
-            <td valign="top">
-               resource is updated every two weeks
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_MaintenanceFrequencyCode_monthly
-               
-            </td>
-            <td valign="top">
-               resource is updated each month
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_MaintenanceFrequencyCode_quarterly
-               
-            </td>
-            <td valign="top">
-               resource is updated every three months
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_MaintenanceFrequencyCode_biannually
-               
-            </td>
-            <td valign="top">
-               resource is updated twice each year
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_MaintenanceFrequencyCode_annually
-               
-            </td>
-            <td valign="top">
-               resource is updated every year
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_MaintenanceFrequencyCode_asNeeded
-               
-            </td>
-            <td valign="top">
-               resource is updated as deemed necessary
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_MaintenanceFrequencyCode_irregular
-               
-            </td>
-            <td valign="top">
-               resource is updated in intervals that are uneven in
-               duration
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_MaintenanceFrequencyCode_notPlanned
-               
-            </td>
-            <td valign="top">
-               there are no plans to update the data
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_MaintenanceFrequencyCode_unknown
-               
-            </td>
-            <td valign="top">
-               frequency of maintenance for the data is not
-               known
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_MaintenanceFrequencyCode_periodic
-               
-            </td>
-            <td valign="top">
-               resource is updated at regular
-               intervals
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_MaintenanceFrequencyCode_semimonthly
-               
-            </td>
-            <td valign="top">
-               resource updated twice a monthly
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_MaintenanceFrequencyCode_biennially
-               
-            </td>
-            <td valign="top">
-               resource is updated every 2 years
-               
-            </td>
-         </tr>
-      </table><a href="#top">top</a><hr/><i>Stylesheet: CT_CodelistHTML.xsl Version: 2015-04-17</i></body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/codelists.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/codelists.xml
deleted file mode 100644
index ae64cfbba..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/codelists.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cat:CT_CodelistCatalogue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/cat/1.0 ../../../-3/cat/1.0/cat.xsd"
-   xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0"
-   xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:gml="http://www.opengis.net/gml/3.2">
-   <!--=====Catalogue description=====-->
-   <cat:name>
-      <gco:CharacterString>Codelists from the Metadata for Maintenance Information (mex) Namespace</gco:CharacterString>
-   </cat:name>
-   <cat:scope>
-      <gco:CharacterString>Codelists from the Metadata for Maintenance Information (mex) Namespace</gco:CharacterString>
-   </cat:scope>
-   <cat:fieldOfApplication>
-      <gco:CharacterString>ISO TC211 Metadata Standards</gco:CharacterString>
-   </cat:fieldOfApplication>
-   <cat:versionNumber>
-      <gco:CharacterString>1.0</gco:CharacterString>
-   </cat:versionNumber>
-   <cat:versionDate>
-      <gco:Date>2015-04-18</gco:Date>
-   </cat:versionDate>
-   <cat:locale>
-      <lan:PT_Locale>
-         <lan:language>
-            <lan:LanguageCode codeList="standards.iso.org/19115/-3/lan/1.0/codelists.xml#LanguageCode" codeListValue="eng">eng</lan:LanguageCode>
-         </lan:language>
-         <lan:characterEncoding>
-            <lan:MD_CharacterSetCode codeList="standards.iso.org/19115/-3/lan/1.0/codelists.xml#MD_CharacterSetCode" codeListValue="UTF-8">UTF-8</lan:MD_CharacterSetCode>
-         </lan:characterEncoding>
-      </lan:PT_Locale>
-   </cat:locale>
-   <!--============================= Codelists =======================================-->
-   <!-- MD_MaintenanceFrequencyCode  -->
-   <cat:codelistItem>
-      <cat:CT_Codelist id="MD_MaintenanceFrequencyCode">
-         <cat:identifier>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_MaintenanceFrequencyCode</gco:ScopedName>
-         </cat:identifier>
-         <cat:name>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_MaintenanceFrequencyCode</gco:ScopedName>
-         </cat:name>
-         <cat:definition>
-            <gco:CharacterString>frequency with which modifications and deletions are made to the
-               data after it is first produced</gco:CharacterString>
-         </cat:definition>
-         <cat:description>
-            <gco:CharacterString>frequency with which modifications and deletions are made to the
-               data after it is first produced</gco:CharacterString>
-         </cat:description>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_MaintenanceFrequencyCode_continual">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_MaintenanceFrequencyCode_continual</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>resource is repeatedly and frequently
-                     updated</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_MaintenanceFrequencyCode_daily">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_MaintenanceFrequencyCode_daily</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>resource is updated each day</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_MaintenanceFrequencyCode_weekly">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_MaintenanceFrequencyCode_weekly</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>resource is updated on a weekly basis</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_MaintenanceFrequencyCode_fortnightly">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_MaintenanceFrequencyCode_fortnightly</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>resource is updated every two weeks</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_MaintenanceFrequencyCode_monthly">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_MaintenanceFrequencyCode_monthly</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>resource is updated each month</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_MaintenanceFrequencyCode_quarterly">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_MaintenanceFrequencyCode_quarterly</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>resource is updated every three months</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_MaintenanceFrequencyCode_biannually">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_MaintenanceFrequencyCode_biannually</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>resource is updated twice each year</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_MaintenanceFrequencyCode_annually">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_MaintenanceFrequencyCode_annually</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>resource is updated every year</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_MaintenanceFrequencyCode_asNeeded">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_MaintenanceFrequencyCode_asNeeded</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>resource is updated as deemed necessary</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_MaintenanceFrequencyCode_irregular">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_MaintenanceFrequencyCode_irregular</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>resource is updated in intervals that are uneven in
-                     duration</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_MaintenanceFrequencyCode_notPlanned">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_MaintenanceFrequencyCode_notPlanned</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>there are no plans to update the data</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_MaintenanceFrequencyCode_unknown">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_MaintenanceFrequencyCode_unknown</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>frequency of maintenance for the data is not
-                     known</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_MaintenanceFrequencyCode_periodic">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_MaintenanceFrequencyCode_periodic</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>resource is updated at regular
-                     intervals</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_MaintenanceFrequencyCode_semimonthly">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_MaintenanceFrequencyCode_semimonthly</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>resource updated twice a monthly</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_MaintenanceFrequencyCode_biennially">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115">MD_MaintenanceFrequencyCode_biennially</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>resource is updated every 2 years</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-      </cat:CT_Codelist>
-   </cat:codelistItem>
-   <!--=== EOF ===-->
-</cat:CT_CodelistCatalogue>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/index.html
deleted file mode 100644
index c2428528d..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/index.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Metadata for Maintenance Information (MMI) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Metadata for Maintenance Information (MMI) Version: 1.0</h1><img src="mmi.png"><h2>Description</h2>
-      <p>MMI 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.6.  It includes elements describing resource and metadata maintenance. The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>Sample XML files for mmi 1.0</h2><a href="mmi_invalid.xml">mmi_invalid.xml</a> <a href="mmi_valid.xml">mmi_valid.xml</a> 
-      <h2>CodeLists for mmi 1.0</h2><a href="codelists.html">codelists.html</a> <a href="codelists.xml">codelists.xml</a> 
-      <h2>XML Namespace for mmi 1.0</h2>
-      <p>The namespace URI for mmi 1.0 is <b>http://standards.iso.org/iso/19115/-3/mmi/1.0</b>.
-      </p>
-      <h2>XML Schema for mmi 1.0</h2>
-      <p><b><a href="mmi.xsd">mmi.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the mmi 1.0 namespace or by XML Schema documents importing the mmi 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the mmi namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for mmi 1.0 are available <a href="mmi.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for mmi 1.0</h2>
-      <p><b><a href="maintenance.xsd">maintenance.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.6. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): <b>MD_MaintenanceFrequencyCode</b>, and MD_MaintenanceInformation
-      </p>
-      <h2>Related XML Namespaces for mmi 1.0</h2> The mmi 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Geographic COmmon</td>
-            <td>gco</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gco/1.0">http://standards.iso.org/iso/19115/-3/gco/1.0</a></td>
-            <td>../../../../19115/-3/gco/1.0/gco.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata Common Classes</td>
-            <td>mcc</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mcc/1.0">http://standards.iso.org/iso/19115/-3/mcc/1.0</a></td>
-            <td>../../../../19115/-3/mcc/1.0/mcc.xsd</td>
-         </tr>
-      </table>
-      <h2>Schematron Validation Rules for mmi 1.0</h2> Schematron rules for validating instance documents of the mmi 1.0 namespace are in <a href="mmi.sch">mmi.sch</a>. Other schematron rule sets that are
-      required for a complete validation are: gco.sch, mcc.sch, and mcc.sch
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/maintenance.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/maintenance.xsd
deleted file mode 100644
index 982d0c4f3..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/maintenance.xsd
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" 
-  xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"  
-  xmlns:gmw="http://standards.iso.org/iso/19115/-3/gmw/1.0"
-  xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" 
-  xmlns:mmi="http://standards.iso.org/iso/19115/-3/mmi/1.0" 
-  elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mmi/1.0" version="1.0">
-  <annotation>
-    <documentation>Status of the dataset or progress of a review</documentation>
-  </annotation>
-<!--  <include schemaLocation="mmi.xsd"/>-->
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
- <!-- <import namespace="http://standards.iso.org/iso/19115/-3/gmw/1.0" schemaLocation="../../../../19115/-3/gmw/1.0/gmw.xsd"/>-->
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="MD_MaintenanceFrequencyCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>frequency with which modifications and deletions are made to the data after it is first produced</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_MaintenanceFrequencyCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mmi:MD_MaintenanceFrequencyCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_MaintenanceInformation" substitutionGroup="mcc:Abstract_MaintenanceInformation" type="mmi:MD_MaintenanceInformation_Type">
-    <annotation>
-      <documentation>information about the scope and frequency of updating</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_MaintenanceInformation_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_MaintenanceInformation_Type">
-        <sequence>
-          <element minOccurs="0" name="maintenanceAndUpdateFrequency" type="mmi:MD_MaintenanceFrequencyCode_PropertyType">
-            <annotation>
-              <documentation>frequency with which changes and additions are made to the resource after the initial resource is completed</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="maintenanceDate" type="mcc:Abstract_TypedDate_PropertyType">
-            <annotation>
-              <documentation>date information associated with maintenance of resource</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="userDefinedMaintenanceFrequency" type="gco:TM_PeriodDuration_PropertyType">
-            <annotation>
-              <documentation>maintenance period other than those defined</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="maintenanceScope" type="mcc:MD_Scope_PropertyType">
-            <annotation>
-              <documentation>information about the scope and extent of maintenance</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="maintenanceNote" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>information regarding specific requirements for maintaining the resource</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="contact" type="mcc:Abstract_Responsibility_PropertyType">
-            <annotation>
-              <documentation>identification of, and means of communicating with, person(s) and organisation(s) with responsibility for maintaining the metadata</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_MaintenanceInformation_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mmi:MD_MaintenanceInformation"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/mmi.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/mmi.png
deleted file mode 100644
index 25f52e791..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/mmi.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/mmi.sch b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/mmi.sch
deleted file mode 100644
index cebf4807a..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/mmi.sch
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron">
-  <sch:ns prefix="mmi" uri="http://standards.iso.org/iso/19115/-3/mmi/1.0"/>
-  <sch:ns prefix="gco" uri="http://standards.iso.org/iso/19115/-3/gco/1.0"/>
-  <!--
-    ISO 19115-3 base requirements for metadata instance documents
-    
-    See ISO19115-1:2014(E) page 15, Figure 10 Maintenance information classes
-  -->
-  
-  <!-- 
-    Rule: MD_MaintenanceInformation
-    Ref: {count(maintenanceAndUpdateFrequency + 
-                userDefinedMaintenanceFrequency) > 0}
-    -->
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.mmi-updatefrequency-failure-en"
-      xml:lang="en">
-      The maintenance information does not define update frequency.</sch:diagnostic>
-    <sch:diagnostic id="rule.mmi-updatefrequency-failure-fr"
-      xml:lang="fr">
-      L'information sur la maintenance ne définit pas de fréquence de mise à jour.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.mmi-updatefrequency-success-en"
-      xml:lang="en">
-      The update frequency is "<sch:value-of select="$maintenanceAndUpdateFrequency"/>".
-    </sch:diagnostic>
-    <sch:diagnostic id="rule.mmi-updatefrequency-success-fr"
-      xml:lang="fr">
-      La fréquence de mise à jour est "<sch:value-of select="$maintenanceAndUpdateFrequency"/>".
-    </sch:diagnostic>
-    
-    <sch:diagnostic id="rule.mmi-updatefrequency-user-success-en"
-      xml:lang="en">
-      The user defined update frequency is 
-      "<sch:value-of select="normalize-space($userDefinedMaintenanceFrequency)"/>".
-    </sch:diagnostic>
-    <sch:diagnostic id="rule.mmi-updatefrequency-user-success-fr"
-      xml:lang="fr">
-      La fréquence de mise à jour définie par l'utilisateur est 
-      "<sch:value-of select="normalize-space($userDefinedMaintenanceFrequency)"/>".
-    </sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.mmi-updatefrequency">
-    <sch:title xml:lang="en">Maintenance information MUST
-    specified an update frequency</sch:title>
-    <sch:title xml:lang="fr">L'information sur la maintenance
-      DOIT définir une fréquence de mise à jour</sch:title>
-    
-    <sch:rule context="//mmi:MD_MaintenanceInformation">
-      
-      <sch:let name="userDefinedMaintenanceFrequency" 
-        value="mmi:userDefinedMaintenanceFrequency/
-                gco:TM_PeriodDuration[normalize-space(.) != '']"/>
-      
-      <sch:let name="maintenanceAndUpdateFrequency" 
-        value="mmi:maintenanceAndUpdateFrequency/
-                mmi:MD_MaintenanceFrequencyCode/@codeListValue[normalize-space(.) != '']"/>
-      
-      <sch:let name="hasCodeOrUserFreq" 
-        value="count($maintenanceAndUpdateFrequency) + 
-               count($userDefinedMaintenanceFrequency) > 0"/>
-      
-      <sch:assert test="$hasCodeOrUserFreq"
-        diagnostics="rule.mmi-updatefrequency-failure-en 
-                     rule.mmi-updatefrequency-failure-fr"/>
-      
-      <sch:report test="count($userDefinedMaintenanceFrequency)"
-        diagnostics="rule.mmi-updatefrequency-user-success-en 
-                     rule.mmi-updatefrequency-user-success-fr"/>
-      
-      <sch:report test="count($maintenanceAndUpdateFrequency)"
-        diagnostics="rule.mmi-updatefrequency-success-en 
-                     rule.mmi-updatefrequency-success-fr"/>
-      
-    </sch:rule>
-  </sch:pattern>
-  
-</sch:schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/mmi.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/mmi.xsd
deleted file mode 100644
index 62e3246bd..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/mmi.xsd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:mmi="http://standards.iso.org/iso/19115/-3/mmi/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mmi/1.0" version="1.0">
-  <annotation>
-    <documentation>Namespace for XML elements &lt;font color="#1f497d"&gt;used to document the maintenance history and scheduling for a resource&lt;/font&gt;.</documentation>
-  </annotation>
-  <include schemaLocation="maintenance.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/mmi.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/mmi.zip
deleted file mode 100644
index 6fabfbfb5..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/mmi.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/mmi_invalid.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/mmi_invalid.xml
deleted file mode 100644
index 554787ce3..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/mmi_invalid.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mds/1.0 ../../mds/1.0/mds.xsd" 
- xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0" 
- xmlns:mmi="http://standards.iso.org/iso/19115/-3/mmi/1.0"
- xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" 
- xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0">
-   <mdb:metadataIdentifier></mdb:metadataIdentifier>
-   
-   <!-- Some rules applies to dataset only -->
-   <mdb:metadataScope>
-      <mdb:MD_MetadataScope>
-         <mdb:resourceScope>
-            <mcc:MD_ScopeCode codeList="codeListLocation#MD_ScopeCode" 
-               codeListValue="dataset">dataset</mcc:MD_ScopeCode>
-         </mdb:resourceScope>
-      </mdb:MD_MetadataScope>
-   </mdb:metadataScope>
-   
-   <mdb:contact></mdb:contact>
-   <mdb:dateInfo></mdb:dateInfo>
-   <mdb:identificationInfo>
-      <mri:MD_DataIdentification>
-         <mri:citation></mri:citation>
-         <mri:abstract></mri:abstract>
-         
-         <!-- Invalid for rule.mmi-updatefrequency -->
-         <mri:resourceMaintenance>
-            <mmi:MD_MaintenanceInformation>
-            </mmi:MD_MaintenanceInformation>
-         </mri:resourceMaintenance>         
-         
-      </mri:MD_DataIdentification>
-   </mdb:identificationInfo>
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/mmi_valid.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/mmi_valid.xml
deleted file mode 100644
index 7dcc27299..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mmi/1.0/mmi_valid.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mds/1.0 ../../mds/1.0/mds.xsd" 
- xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
- xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0" 
- xmlns:mmi="http://standards.iso.org/iso/19115/-3/mmi/1.0"
- xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" 
- xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0">
-   <mdb:metadataIdentifier></mdb:metadataIdentifier>
-   
-   <!-- Some rules applies to dataset only -->
-   <mdb:metadataScope>
-      <mdb:MD_MetadataScope>
-         <mdb:resourceScope>
-            <mcc:MD_ScopeCode codeList="codeListLocation#MD_ScopeCode" 
-               codeListValue="dataset">dataset</mcc:MD_ScopeCode>
-         </mdb:resourceScope>
-      </mdb:MD_MetadataScope>
-   </mdb:metadataScope>
-   
-   <mdb:contact></mdb:contact>
-   <mdb:dateInfo></mdb:dateInfo>
-   <mdb:identificationInfo>
-      <mri:MD_DataIdentification>
-         <mri:citation></mri:citation>
-         <mri:abstract></mri:abstract>
-         
-         <!-- Valid for rule.mmi-updatefrequency -->
-         <mri:resourceMaintenance>
-            <mmi:MD_MaintenanceInformation>
-               <mmi:maintenanceAndUpdateFrequency>
-                  <mmi:MD_MaintenanceFrequencyCode 
-                     codeList="" 
-                     codeListValue="asNeeded"/>
-               </mmi:maintenanceAndUpdateFrequency>
-            </mmi:MD_MaintenanceInformation>
-         </mri:resourceMaintenance>         
-         
-         <mri:resourceMaintenance>
-            <mmi:MD_MaintenanceInformation>
-               <mmi:userDefinedMaintenanceFrequency>
-                  <gco:TM_PeriodDuration>
-                     P2Y
-                  </gco:TM_PeriodDuration>
-               </mmi:userDefinedMaintenanceFrequency>
-            </mmi:MD_MaintenanceInformation>
-         </mri:resourceMaintenance>
-      </mri:MD_DataIdentification>
-   </mdb:identificationInfo>
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mpc/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mpc/1.0/index.html
deleted file mode 100644
index c51160c57..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mpc/1.0/index.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Metadata for Portrayal Catalog (MPC) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Metadata for Portrayal Catalog (MPC) Version: 1.0</h1><img src="mpc.png"><h2>Description</h2>
-      <p>MPC 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.10.  It includes elements for referencing portrayal catalogs. The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>XML Namespace for mpc 1.0</h2>
-      <p>The namespace URI for mpc 1.0 is <b>http://standards.iso.org/iso/19115/-3/mpc/1.0</b>.
-      </p>
-      <h2>XML Schema for mpc 1.0</h2>
-      <p><b><a href="mpc.xsd">mpc.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the mpc 1.0 namespace or by XML Schema documents importing the mpc 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the mpc namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for mpc 1.0 are available <a href="mpc.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for mpc 1.0</h2>
-      <p><b><a href="portrayalCatalogue.xsd">portrayalCatalogue.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.10. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): MD_PortrayalCatalogueReference
-      </p>
-      <h2>Related XML Namespaces for mpc 1.0</h2> The mpc 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Geographic COmmon</td>
-            <td>gco</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gco/1.0">http://standards.iso.org/iso/19115/-3/gco/1.0</a></td>
-            <td>../../../../19115/-3/gco/1.0/gco.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata Common Classes</td>
-            <td>mcc</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mcc/1.0">http://standards.iso.org/iso/19115/-3/mcc/1.0</a></td>
-            <td>../../../../19115/-3/mcc/1.0/mcc.xsd</td>
-         </tr>
-      </table>
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mpc/1.0/mpc.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mpc/1.0/mpc.png
deleted file mode 100644
index 13b68af17..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mpc/1.0/mpc.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mpc/1.0/mpc.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mpc/1.0/mpc.xsd
deleted file mode 100644
index 39d8895d2..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mpc/1.0/mpc.xsd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:mpc="http://standards.iso.org/iso/19115/-3/mpc/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mpc/1.0" version="1.0">
-  <annotation>
-    <documentation>Namespace for XML elements &lt;font color="#1f497d"&gt;used to document a portrayal catalogue associated with a resource that specifies how to visualize the resource content.&lt;/font&gt;</documentation>
-  </annotation>
-  <include schemaLocation="portrayalCatalogue.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mpc/1.0/mpc.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mpc/1.0/mpc.zip
deleted file mode 100644
index 30450e6f8..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mpc/1.0/mpc.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mpc/1.0/portrayalCatalogue.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mpc/1.0/portrayalCatalogue.xsd
deleted file mode 100644
index 67ff91491..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mpc/1.0/portrayalCatalogue.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:mpc="http://standards.iso.org/iso/19115/-3/mpc/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mpc/1.0" version="1.0">
-  <include schemaLocation="mpc.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="MD_PortrayalCatalogueReference" substitutionGroup="mcc:Abstract_PortrayalCatalogueInformation" type="mpc:MD_PortrayalCatalogueReference_Type">
-    <annotation>
-      <documentation>information identifying the portrayal catalogue used</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_PortrayalCatalogueReference_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_PortrayalCatalogueInformation_Type">
-        <sequence>
-          <element maxOccurs="unbounded" name="portrayalCatalogueCitation" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>bibliographic reference to the portrayal catalogue cited</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_PortrayalCatalogueReference_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mpc:MD_PortrayalCatalogueReference"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/codelists.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/codelists.html
deleted file mode 100644
index 15c1c3f64..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/codelists.html
+++ /dev/null
@@ -1,277 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0" xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>
-         Codelists from the Metadata for Resource Content (mrc) Namespace
-         
-      </title>
-   </head>
-   <body><a name="top"></a><h1>ISO 19115-3 Codelist Report</h1>
-      <h2>
-         Codelists from the Metadata for Resource Content (mrc) Namespace
-         
-      </h2>
-      <table>
-         <tr><b>
-               <td>Scope</td></b><td>
-               Codelists related to Metadata for Resource Content (mrc) Namespace
-               
-            </td>
-         </tr>
-         <tr><b>
-               <td>Field of Application</td></b><td>
-               ISO TC211 Metadata Standards
-               
-            </td>
-         </tr>
-         <tr><b>
-               <td>Version (Date)</td></b><td>
-               1.0
-                ()
-            </td>
-         </tr>
-      </table>
-      <h2>
-         MD_CoverageContentTypeCode
-          (
-         MD_CoverageContentTypeCode
-         ):
-      </h2><b>Description: </b>
-      specific type of information represented in the
-      cell
-      
-      <table width="95%" border="1" cellpadding="2" cellspacing="2">
-         <tr>
-            <th valign="top">Entry</th>
-            <th valign="top">Definition</th>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_CoverageContentTypeCode_image
-               
-            </td>
-            <td valign="top">
-               meaningful numerical representation of a physical parameter
-               that is not the actual value of the physical parameter
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_CoverageContentTypeCode_thematicClassification
-               
-            </td>
-            <td valign="top">
-               code value with no quantitative meaning, used to represent a
-               physical quantity
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_CoverageContentTypeCode_physicalMeasurement
-               
-            </td>
-            <td valign="top">
-               value in physical units of the quantity being
-               measured
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_CoverageContentTypeCode_auxillaryInformation
-               
-            </td>
-            <td valign="top">
-               data, usually a physical measurement, used to support the
-               calculation of the primary physicalMeasurement coverages in the dataset (e.g.
-               grid of aerosol optical thickness used in the calculation of a sea surface
-               temperature product).
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_CoverageContentTypeCode_qualityInformation
-               
-            </td>
-            <td valign="top">
-               data used to characterize the quality of the
-               physicalMeasurement coverages in the dataset. Typically included in a
-               gmi:QE_CoverageResult.
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_CoverageContentTypeCode_referenceInformation
-               
-            </td>
-            <td valign="top">
-               reference information used to support the calculation or use
-               of the physicalMeasurement coverages in the dataset (e.g. grids of
-               latitude/longitude used to geolocate the physical
-               measurements).
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_CoverageContentTypeCode_modelResult
-               
-            </td>
-            <td valign="top">
-               resources with values that are calculated using a model
-               rather than being observed or calculated from
-               observations.
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_CoverageContentTypeCode_coordinate
-               
-            </td>
-            <td valign="top">
-               data used to provide coordinate axis values
-               
-               
-            </td>
-         </tr>
-      </table><a href="#top">top</a><h2>
-         MD_ImagingConditionCode
-          (
-         MD_ImagingConditionCode
-         ):
-      </h2><b>Description: </b>
-      code which indicates conditions which may affect the
-      image
-      
-      <table width="95%" border="1" cellpadding="2" cellspacing="2">
-         <tr>
-            <th valign="top">Entry</th>
-            <th valign="top">Definition</th>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_ImagingConditionCode_blurredImage
-               
-            </td>
-            <td valign="top">
-               portion of the image is blurred
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_ImagingConditionCode_cloud
-               
-            </td>
-            <td valign="top">
-               portion of the image is partially obscured by cloud
-               cover
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_ImagingConditionCode_degradingObliquity
-               
-            </td>
-            <td valign="top">
-               acute angle between the plane of the ecliptic (the plane of
-               the Earth s orbit) and the plane of the celestial equator
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_ImagingConditionCode_fog
-               
-            </td>
-            <td valign="top">
-               portion of the image is partially obscured by
-               fog
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_ImagingConditionCode_heavySmokeOrDust
-               
-            </td>
-            <td valign="top">
-               portion of the image is partially obscured by heavy smoke or
-               dust
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_ImagingConditionCode_night
-               
-            </td>
-            <td valign="top">
-               image was taken at night
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_ImagingConditionCode_rain
-               
-            </td>
-            <td valign="top">
-               image was taken during rainfall
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_ImagingConditionCode_semiDarkness
-               
-            </td>
-            <td valign="top">
-               image was taken during semi-dark conditions; twilight
-               conditions
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_ImagingConditionCode_shadow
-               
-            </td>
-            <td valign="top">
-               portion of the image is obscured by
-               shadow
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_ImagingConditionCode_snow
-               
-            </td>
-            <td valign="top">
-               portion of the image is obscured by
-               snow
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_ImagingConditionCode_terrainMasking
-               
-            </td>
-            <td valign="top">
-               the absence of collection data of a given point or area
-               caused by the relative location of topographic features which obstruct the
-               collection path between the collector(s) and the subject(s) of
-               interest
-               
-            </td>
-         </tr>
-      </table><a href="#top">top</a><hr/><i>Stylesheet: CT_CodelistHTML.xsl Version: 2015-04-17</i></body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/codelists.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/codelists.xml
deleted file mode 100644
index 772368cf4..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/codelists.xml
+++ /dev/null
@@ -1,310 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cat:CT_CodelistCatalogue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/cat/1.0 ../../../-3/cat/1.0/cat.xsd"
- xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0"
- xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:gml="http://www.opengis.net/gml/3.2">
-   <!--=====Catalogue description=====-->
-   <cat:name>
-      <gco:CharacterString>Codelists from the Metadata for Resource Content (mrc) Namespace</gco:CharacterString>
-   </cat:name>
-   <cat:scope>
-      <gco:CharacterString>Codelists related to Metadata for Resource Content (mrc) Namespace</gco:CharacterString>
-   </cat:scope>
-   <cat:fieldOfApplication>
-      <gco:CharacterString>ISO TC211 Metadata Standards</gco:CharacterString>
-   </cat:fieldOfApplication>
-   <cat:versionNumber>
-      <gco:CharacterString>1.0</gco:CharacterString>
-   </cat:versionNumber>
-   <cat:versionDate>
-      <gco:Date>2015-04-18</gco:Date>
-   </cat:versionDate>
-   <cat:locale>
-      <lan:PT_Locale>
-         <lan:language>
-            <lan:LanguageCode codeList="standards.iso.org/19115/-3/lan/1.0/codelists.xml#LanguageCode" codeListValue="eng">eng</lan:LanguageCode>
-         </lan:language>
-         <lan:characterEncoding>
-            <lan:MD_CharacterSetCode codeList="standards.iso.org/19115/-3/lan/1.0/codelists.xml#MD_CharacterSetCode" codeListValue="UTF-8">UTF-8</lan:MD_CharacterSetCode>
-         </lan:characterEncoding>
-      </lan:PT_Locale>
-   </cat:locale>
-   <!--============================= Codelists =======================================-->
-   <!-- MD_CoverageContentTypeCode  -->
-   <cat:codelistItem>
-      <cat:CT_Codelist id="MD_CoverageContentTypeCode">
-         <cat:identifier>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >MD_CoverageContentTypeCode</gco:ScopedName>
-         </cat:identifier>
-         <cat:name>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >MD_CoverageContentTypeCode</gco:ScopedName>
-         </cat:name>
-         <cat:definition>
-            <gco:CharacterString>specific type of information represented in the
-               cell</gco:CharacterString>
-         </cat:definition>
-         <cat:description>
-            <gco:CharacterString>specific type of information represented in the
-               cell</gco:CharacterString>
-         </cat:description>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_CoverageContentTypeCode_image">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_CoverageContentTypeCode_image</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>meaningful numerical representation of a physical parameter
-                     that is not the actual value of the physical parameter</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_CoverageContentTypeCode_thematicClassification">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_CoverageContentTypeCode_thematicClassification</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>code value with no quantitative meaning, used to represent a
-                     physical quantity</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_CoverageContentTypeCode_physicalMeasurement">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_CoverageContentTypeCode_physicalMeasurement</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>value in physical units of the quantity being
-                     measured</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_CoverageContentTypeCode_auxillaryInformation">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_CoverageContentTypeCode_auxillaryInformation</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>data, usually a physical measurement, used to support the
-                     calculation of the primary physicalMeasurement coverages in the dataset (e.g.
-                     grid of aerosol optical thickness used in the calculation of a sea surface
-                     temperature product).</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_CoverageContentTypeCode_qualityInformation">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_CoverageContentTypeCode_qualityInformation</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>data used to characterize the quality of the
-                     physicalMeasurement coverages in the dataset. Typically included in a
-                     gmi:QE_CoverageResult.</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_CoverageContentTypeCode_referenceInformation">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_CoverageContentTypeCode_referenceInformation</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>reference information used to support the calculation or use
-                     of the physicalMeasurement coverages in the dataset (e.g. grids of
-                     latitude/longitude used to geolocate the physical
-                     measurements).</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_CoverageContentTypeCode_modelResult">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_CoverageContentTypeCode_modelResult</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>resources with values that are calculated using a model
-                     rather than being observed or calculated from
-                     observations.</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_CoverageContentTypeCode_coordinate">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_CoverageContentTypeCode_coordinate</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>data used to provide coordinate axis values
-                  </gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-      </cat:CT_Codelist>
-   </cat:codelistItem>
-   <!-- MD_ImagingConditionCode  -->
-   <cat:codelistItem>
-      <cat:CT_Codelist id="MD_ImagingConditionCode">
-         <cat:identifier>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >MD_ImagingConditionCode</gco:ScopedName>
-         </cat:identifier>
-         <cat:name>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >MD_ImagingConditionCode</gco:ScopedName>
-         </cat:name>
-         <cat:definition>
-            <gco:CharacterString>code which indicates conditions which may affect the
-               image</gco:CharacterString>
-         </cat:definition>
-         <cat:description>
-            <gco:CharacterString>code which indicates conditions which may affect the
-               image</gco:CharacterString>
-         </cat:description>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ImagingConditionCode_blurredImage">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ImagingConditionCode_blurredImage</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>portion of the image is blurred</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ImagingConditionCode_cloud">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ImagingConditionCode_cloud</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>portion of the image is partially obscured by cloud
-                     cover</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ImagingConditionCode_degradingObliquity">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ImagingConditionCode_degradingObliquity</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>acute angle between the plane of the ecliptic (the plane of
-                     the Earth s orbit) and the plane of the celestial equator</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ImagingConditionCode_fog">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ImagingConditionCode_fog</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>portion of the image is partially obscured by
-                     fog</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ImagingConditionCode_heavySmokeOrDust">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ImagingConditionCode_heavySmokeOrDust</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>portion of the image is partially obscured by heavy smoke or
-                     dust</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ImagingConditionCode_night">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ImagingConditionCode_night</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>image was taken at night</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ImagingConditionCode_rain">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ImagingConditionCode_rain</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>image was taken during rainfall</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ImagingConditionCode_semiDarkness">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ImagingConditionCode_semiDarkness</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>image was taken during semi-dark conditions; twilight
-                     conditions</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ImagingConditionCode_shadow">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ImagingConditionCode_shadow</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>portion of the image is obscured by
-                     shadow</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ImagingConditionCode_snow">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ImagingConditionCode_snow</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>portion of the image is obscured by
-                     snow</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ImagingConditionCode_terrainMasking">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ImagingConditionCode_terrainMasking</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>the absence of collection data of a given point or area
-                     caused by the relative location of topographic features which obstruct the
-                     collection path between the collector(s) and the subject(s) of
-                     interest</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-      </cat:CT_Codelist>
-   </cat:codelistItem>
-   <!--=== EOF ===-->
-</cat:CT_CodelistCatalogue>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/content.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/content.xsd
deleted file mode 100644
index 69a450d62..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/content.xsd
+++ /dev/null
@@ -1,416 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" 
-xmlns:fcc="http://standards.iso.org/iso/19110/fcc/1.0" 
-xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" 
-xmlns:gmw="http://standards.iso.org/iso/19115/-3/gmw/1.0"  
-xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" 
-xmlns:mrc="http://standards.iso.org/iso/19115/-3/mrc/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mrc/1.0" version="1.0">
-<!--  <include schemaLocation="mrc.xsd"/>-->
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gmw/1.0" schemaLocation="../../../../19115/-3/gmw/1.0/gmw.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19110/fcc/1.0" schemaLocation="../../../../19110/fcc/1.0/fcc.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/lan/1.0" schemaLocation="../../../../19115/-3/lan/1.0/lan.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="MD_AttributeGroup" substitutionGroup="gco:AbstractObject" type="mrc:MD_AttributeGroup_Type"/>
-  <complexType name="MD_AttributeGroup_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element maxOccurs="unbounded" name="contentType" type="mrc:MD_CoverageContentTypeCode_PropertyType">
-            <annotation>
-              <documentation>type of information represented by the value</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="attribute" type="mrc:MD_RangeDimension_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_AttributeGroup_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrc:MD_AttributeGroup"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_Band" substitutionGroup="mrc:MD_SampleDimension" type="mrc:MD_Band_Type">
-    <annotation>
-      <documentation>range of wavelengths in the electromagnetic spectrum</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_Band_Type">
-    <complexContent>
-      <extension base="mrc:MD_SampleDimension_Type">
-        <sequence>
-          <element minOccurs="0" name="boundMax" type="gco:Real_PropertyType"/>
-          <element minOccurs="0" name="boundMin" type="gco:Real_PropertyType"/>
-          <element minOccurs="0" name="boundUnits" type="gmw:UomLength_PropertyType"/>
-          <element minOccurs="0" name="peakResponse" type="gco:Real_PropertyType">
-            <annotation>
-              <documentation>wavelength at which the response is the highest</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="toneGradation" type="gco:Integer_PropertyType">
-            <annotation>
-              <documentation>number of discrete numerical values in the grid data</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_Band_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrc:MD_Band"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="AbstractMD_ContentInformation" substitutionGroup="gco:AbstractObject" type="mrc:AbstractMD_ContentInformation_Type">
-    <annotation>
-      <documentation>description of the content of a resource.
-
-Note in 19115-3 implementation, this class is implemented by abstract class _ContentInformation in the Abstract Common Classes package</documentation>
-    </annotation>
-  </element>
-  <complexType abstract="true" name="AbstractMD_ContentInformation_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="AbstractMD_ContentInformation_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrc:AbstractMD_ContentInformation"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_CoverageContentTypeCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>specific type of information represented in the cell</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_CoverageContentTypeCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrc:MD_CoverageContentTypeCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_CoverageDescription" substitutionGroup="mcc:Abstract_ContentInformation" type="mrc:MD_CoverageDescription_Type">
-    <annotation>
-      <documentation>details about the content of a resource</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_CoverageDescription_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_ContentInformation_Type">
-        <sequence>
-          <element name="attributeDescription" type="gco:RecordType_PropertyType">
-            <annotation>
-              <documentation>description of the attribute described by the measurement value</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="processingLevelCode" type="mcc:MD_Identifier_PropertyType">
-            <annotation>
-              <documentation>Code and codespace that identifies the level of processing that has been applied to the resource</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="attributeGroup" type="mrc:MD_AttributeGroup_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_CoverageDescription_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrc:MD_CoverageDescription"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_FeatureCatalogue" substitutionGroup="mcc:Abstract_ContentInformation" type="mrc:MD_FeatureCatalogue_Type">
-    <annotation>
-      <documentation>a catalogue of feature types</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_FeatureCatalogue_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_ContentInformation_Type">
-        <sequence>
-          <element maxOccurs="unbounded" name="featureCatalogue" type="fcc:Abstract_FeatureCatalogue_PropertyType">
-            <annotation>
-              <documentation>the catalogue of feature types, attribution, operations, and relationships used by the resource</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_FeatureCatalogue_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrc:MD_FeatureCatalogue"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_FeatureCatalogueDescription" substitutionGroup="mcc:Abstract_ContentInformation" type="mrc:MD_FeatureCatalogueDescription_Type">
-    <annotation>
-      <documentation>information identifying the feature catalogue or the conceptual schema</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_FeatureCatalogueDescription_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_ContentInformation_Type">
-        <sequence>
-          <element minOccurs="0" name="complianceCode" type="gco:Boolean_PropertyType">
-            <annotation>
-              <documentation>indication of whether or not the cited feature catalogue complies with ISO 19110</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="locale" type="lan:PT_Locale_PropertyType">
-            <annotation>
-              <documentation>language(s) used within the catalogue</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="includedWithDataset" type="gco:Boolean_PropertyType">
-            <annotation>
-              <documentation>indication of whether or not the feature catalogue is included with the resource</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="featureTypes" type="mrc:MD_FeatureTypeInfo_PropertyType">
-            <annotation>
-              <documentation>subset of feature types from cited feature catalogue occurring in dataset</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="featureCatalogueCitation" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>complete bibliographic reference to one or more external feature catalogues</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_FeatureCatalogueDescription_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrc:MD_FeatureCatalogueDescription"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_FeatureTypeInfo" substitutionGroup="gco:AbstractObject" type="mrc:MD_FeatureTypeInfo_Type"/>
-  <complexType name="MD_FeatureTypeInfo_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="featureTypeName" type="gco:GenericName_PropertyType"/>
-          <element minOccurs="0" name="featureInstanceCount" type="gco:Integer_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_FeatureTypeInfo_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrc:MD_FeatureTypeInfo"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_ImageDescription" substitutionGroup="mrc:MD_CoverageDescription" type="mrc:MD_ImageDescription_Type">
-    <annotation>
-      <documentation>information about an image's suitability for use</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_ImageDescription_Type">
-    <complexContent>
-      <extension base="mrc:MD_CoverageDescription_Type">
-        <sequence>
-          <element minOccurs="0" name="illuminationElevationAngle" type="gco:Real_PropertyType">
-            <annotation>
-              <documentation>illumination elevation measured in degrees clockwise from the target plane at intersection of the optical line of sight with the Earth's surface. For images from a scanning device, refer to the centre pixel of the image</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="illuminationAzimuthAngle" type="gco:Real_PropertyType">
-            <annotation>
-              <documentation>illumination azimuth measured in degrees clockwise from true north at the time the image is taken. For images from a scanning device, refer to the centre pixel of the image</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="imagingCondition" type="mrc:MD_ImagingConditionCode_PropertyType">
-            <annotation>
-              <documentation>conditions affected the image</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="imageQualityCode" type="mcc:MD_Identifier_PropertyType">
-            <annotation>
-              <documentation>code in producers code space that specifies the image quality</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="cloudCoverPercentage" type="gco:Real_PropertyType">
-            <annotation>
-              <documentation>area of the dataset obscured by clouds, expressed as a percentage of the spatial extent</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="compressionGenerationQuantity" type="gco:Integer_PropertyType">
-            <annotation>
-              <documentation>count of the number of lossy compression cycles performed on the image</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="triangulationIndicator" type="gco:Boolean_PropertyType">
-            <annotation>
-              <documentation>indication of whether or not triangulation has been performed upon the image</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="radiometricCalibrationDataAvailability" type="gco:Boolean_PropertyType">
-            <annotation>
-              <documentation>indication of whether or not the radiometric calibration information for generating the radiometrically calibrated standard data product is available</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="cameraCalibrationInformationAvailability" type="gco:Boolean_PropertyType">
-            <annotation>
-              <documentation>indication of whether or not constants are available which allow for camera calibration corrections</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="filmDistortionInformationAvailability" type="gco:Boolean_PropertyType">
-            <annotation>
-              <documentation>indication of whether or not Calibration Reseau information is available</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="lensDistortionInformationAvailability" type="gco:Boolean_PropertyType">
-            <annotation>
-              <documentation>indication of whether or not lens aberration correction information is available</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_ImageDescription_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrc:MD_ImageDescription"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_ImagingConditionCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>code which indicates conditions which may affect the image</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_ImagingConditionCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrc:MD_ImagingConditionCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_RangeDimension" substitutionGroup="gco:AbstractObject" type="mrc:MD_RangeDimension_Type">
-    <annotation>
-      <documentation>information on the range of attribute values</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_RangeDimension_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element minOccurs="0" name="sequenceIdentifier" type="gco:MemberName_PropertyType">
-            <annotation>
-              <documentation>number that uniquely identifies instances of bands of wavelengths on which a sensor operates</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="description" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>description of the range of a cell measurement value</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="name" type="mcc:MD_Identifier_PropertyType">
-            <annotation>
-              <documentation>identifiers for each attribute included in the resource. These identifiers can be used to provide names for the resource's attribute from a standard set of names</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_RangeDimension_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrc:MD_RangeDimension"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_SampleDimension" substitutionGroup="mrc:MD_RangeDimension" type="mrc:MD_SampleDimension_Type">
-    <annotation>
-      <documentation>the characteristics of each dimension (layer) included in the resource</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_SampleDimension_Type">
-    <complexContent>
-      <extension base="mrc:MD_RangeDimension_Type">
-        <sequence>
-          <element minOccurs="0" name="maxValue" type="gco:Real_PropertyType">
-            <annotation>
-              <documentation>maximum value of data values in each dimension included in the resource. Restricted to UomLength in the MD_Band class.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="minValue" type="gco:Real_PropertyType">
-            <annotation>
-              <documentation>minimum value of data values in each dimension included in the resource. Restricted to UomLength in the MD_Band class.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="units" type="gmw:UnitOfMeasure_PropertyType">
-            <annotation>
-              <documentation>units of data in each dimension included in the resource. Note that the type of this is UnitOfMeasure and that it is restricted to UomLength in the MD_Band class.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="scaleFactor" type="gco:Real_PropertyType">
-            <annotation>
-              <documentation>scale factor which has been applied to the cell value</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="offset" type="gco:Real_PropertyType">
-            <annotation>
-              <documentation>the physical value corresponding to a cell value of zero</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="meanValue" type="gco:Real_PropertyType">
-            <annotation>
-              <documentation>mean value of data values in each dimension included in the resource</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="numberOfValues" type="gco:Integer_PropertyType">
-            <annotation>
-              <documentation>this gives the number of values used in a thematicClassification resource EX:. the number of classes in a Land Cover Type coverage or the number of cells with data in other types of coverages</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="standardDeviation" type="gco:Real_PropertyType">
-            <annotation>
-              <documentation>standard deviation of data values in each dimension included in the resource</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="otherPropertyType" type="gco:RecordType_PropertyType">
-            <annotation>
-              <documentation>type of other attribute description (i.e. netcdf/variable in ncml.xsd)</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="otherProperty" type="gco:Record_PropertyType">
-            <annotation>
-              <documentation>instance of otherAttributeType that defines attributes not explicitly included in MD_CoverageType</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="bitsPerValue" type="gco:Integer_PropertyType">
-            <annotation>
-              <documentation>maximum number of significant bits in the uncompressed representation for the value in each band of each pixel</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_SampleDimension_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrc:MD_SampleDimension"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/contentInformationImagery.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/contentInformationImagery.xsd
deleted file mode 100644
index 7e371b9e7..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/contentInformationImagery.xsd
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:mrc="http://standards.iso.org/iso/19115/-3/mrc/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mrc/1.0" version="1.0">
-  <annotation>
-    <documentation>Name: Content
-Position: 5</documentation>
-  </annotation>
-  <include schemaLocation="content.xsd"/>
-  <include schemaLocation="mrc.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="MI_Band" substitutionGroup="mrc:MD_Band" type="mrc:MI_Band_Type">
-    <annotation>
-      <documentation>Description: extensions to electromagnetic spectrum wavelength description
-shortName: BandExt</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_Band_Type">
-    <complexContent>
-      <extension base="mrc:MD_Band_Type">
-        <sequence>
-          <element minOccurs="0" name="bandBoundaryDefinition" type="mrc:MI_BandDefinition_PropertyType">
-            <annotation>
-              <documentation>Description: Designation of criterion for defining maximum and minimum wavelengths for a spectral band
-FGDC: Band_Boundry_Definition
-Position: 1
-shortName: bBndDef</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="nominalSpatialResolution" type="gco:Real_PropertyType">
-            <annotation>
-              <documentation>Description: Smallest distance between which separate points can be distinguished, as specified in instrument design
-FGDC: Nominal_Spatial_Resolution
-Position: 4
-shortName: bndRes</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="transferFunctionType" type="mrc:MI_TransferFunctionTypeCode_PropertyType">
-            <annotation>
-              <documentation>Description: transform function to be used when scaling a physical value for a given element
-shortName: scalXfrFunc</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="transmittedPolarisation" type="mrc:MI_PolarisationOrientationCode_PropertyType">
-            <annotation>
-              <documentation>Description: polarisation of the transmitter or detector
-shortName: polarisation</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="detectedPolarisation" type="mrc:MI_PolarisationOrientationCode_PropertyType">
-            <annotation>
-              <documentation>Description: polarisation of the transmitter or detector
-shortName: polarisation</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MI_Band_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrc:MI_Band"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_BandDefinition" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>Description: Designation of criterion for defining maximum and minimum wavelengths for a spectral band
-FGDC: Band_Boundry_Definition
-shortName: BndDef</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_BandDefinition_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrc:MI_BandDefinition"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_CoverageDescription" substitutionGroup="mrc:MD_CoverageDescription" type="mrc:MI_CoverageDescription_Type">
-    <annotation>
-      <documentation>Description: information about the content of a coverage, including the description of specific range elements
-shortName: CCovDesc</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_CoverageDescription_Type">
-    <complexContent>
-      <extension base="mrc:MD_CoverageDescription_Type">
-        <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="rangeElementDescription" type="mrc:MI_RangeElementDescription_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MI_CoverageDescription_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrc:MI_CoverageDescription"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_ImageDescription" substitutionGroup="mrc:MD_ImageDescription" type="mrc:MI_ImageDescription_Type">
-    <annotation>
-      <documentation>Description: information about the content of an image, including the description of specific range elements
-shortName: ICovDesc</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_ImageDescription_Type">
-    <complexContent>
-      <extension base="mrc:MD_ImageDescription_Type">
-        <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="rangeElementDescription" type="mrc:MI_RangeElementDescription_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MI_ImageDescription_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrc:MI_ImageDescription"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_PolarisationOrientationCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>Description: polarisation of the antenna relative to the waveform
-shortName: PolarOrienCode</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_PolarisationOrientationCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrc:MI_PolarisationOrientationCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_RangeElementDescription" substitutionGroup="gco:AbstractObject" type="mrc:MI_RangeElementDescription_Type">
-    <annotation>
-      <documentation>Description: description of specific range elements
-shortName: RgEltDesc</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_RangeElementDescription_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="name" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>Description: designation associated with a set of range elements
-shortName: rgEltName</documentation>
-            </annotation>
-          </element>
-          <element name="definition" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>Description: description of a set of specific range elements
-shortName: rgEltDef</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" name="rangeElement" type="gco:Record_PropertyType">
-            <annotation>
-              <documentation>Description: specific range elements, i.e. range elements associated with a name and definition defining their meaning
-shortName: rgElt</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MI_RangeElementDescription_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrc:MI_RangeElementDescription"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_TransferFunctionTypeCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>Description: transform function to be used when scaling a physical value for a given element
-shortName: XfrFuncTypeCode</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_TransferFunctionTypeCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrc:MI_TransferFunctionTypeCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/index.html
deleted file mode 100644
index c06884636..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/index.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Metadata for Resource Content (MRC) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Metadata for Resource Content (MRC) Version: 1.0</h1><img src="mrc.png"><h2>Description</h2>
-      <p>MRC 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.9.  It includes elements for describing resource structure and content. The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>Sample XML files for mrc 1.0</h2><a href="mrc_invalid.xml">mrc_invalid.xml</a> <a href="mrc_valid.xml">mrc_valid.xml</a> 
-      <h2>CodeLists for mrc 1.0</h2><a href="codelists.html">codelists.html</a> <a href="codelists.xml">codelists.xml</a> 
-      <h2>XML Namespace for mrc 1.0</h2>
-      <p>The namespace URI for mrc 1.0 is <b>http://standards.iso.org/iso/19115/-3/mrc/1.0</b>.
-      </p>
-      <h2>XML Schema for mrc 1.0</h2>
-      <p><b><a href="mrc.xsd">mrc.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the mrc 1.0 namespace or by XML Schema documents importing the mrc 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the mrc namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for mrc 1.0 are available <a href="mrc.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for mrc 1.0</h2>
-      <p><b><a href="content.xsd">content.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.9. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): MD_AttributeGroup, MD_Band, AbstractMD_ContentInformation, <b>MD_CoverageContentTypeCode</b>, MD_CoverageDescription, MD_FeatureCatalogue, MD_FeatureCatalogueDescription, MD_FeatureTypeInfo, MD_ImageDescription, <b>MD_ImagingConditionCode</b>, MD_RangeDimension, and MD_SampleDimension
-      </p>
-      <p><b><a href="contentInformationImagery.xsd">contentInformationImagery.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.9. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): MI_Band, MI_BandDefinition, MI_CoverageDescription, MI_ImageDescription, <b>MI_PolarisationOrientationCode</b>, MI_RangeElementDescription, and <b>MI_TransferFunctionTypeCode</b></p>
-      <h2>Related XML Namespaces for mrc 1.0</h2> The mrc 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Feature Catalog Common</td>
-            <td>fcc</td>
-            <td><a href="http://standards.iso.org/iso/19110/fcc/1.0">http://standards.iso.org/iso/19110/fcc/1.0</a></td>
-            <td>../../../../19110/fcc/1.0/fcc.xsd</td>
-         </tr>
-         <tr>
-            <td>Geographic COmmon</td>
-            <td>gco</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gco/1.0">http://standards.iso.org/iso/19115/-3/gco/1.0</a></td>
-            <td>../../../../19115/-3/gco/1.0/gco.xsd</td>
-         </tr>
-         <tr>
-            <td>Geographic Markup Wrappers</td>
-            <td>gmw</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gmw/1.0">http://standards.iso.org/iso/19115/-3/gmw/1.0</a></td>
-            <td>../../../../19115/-3/gmw/1.0/gmw.xsd</td>
-         </tr>
-         <tr>
-            <td>Language localization</td>
-            <td>lan</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/lan/1.0">http://standards.iso.org/iso/19115/-3/lan/1.0</a></td>
-            <td>../../../../19115/-3/lan/1.0/lan.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata Common Classes</td>
-            <td>mcc</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mcc/1.0">http://standards.iso.org/iso/19115/-3/mcc/1.0</a></td>
-            <td>../../../../19115/-3/mcc/1.0/mcc.xsd</td>
-         </tr>
-      </table>
-      <h2>Schematron Validation Rules for mrc 1.0</h2> Schematron rules for validating instance documents of the mrc 1.0 namespace are in <a href="mrc.sch">mrc.sch</a>. Other schematron rule sets that are
-      required for a complete validation are: gco.sch, gmw.sch, fcc.sch, lan.sch, mcc.sch, gco.sch, fcc.sch, lan.sch, and mcc.sch
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/mrc.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/mrc.png
deleted file mode 100644
index 93128e113..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/mrc.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/mrc.sch b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/mrc.sch
deleted file mode 100644
index 198bc9503..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/mrc.sch
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron">
-  <sch:ns prefix="mrc" uri="http://standards.iso.org/iso/19115/-3/mrc/1.0"/>
-  <!--
-    ISO 19115-3 base requirements for metadata instance documents
-    
-    See ISO19115-1:2014(E) page 18, Figure 13 Content information classes
-  -->
-  
-  
-  
-  <!-- 
-    Rule: MD_FeatureCatalogueDescription
-    Ref: {if FeatureCatalogue not included with resource and
-          MD_FeatureCatalogue not provided then
-            featureCatalogueCitation > 0}
-    Comment: No test because feature catalogue with resource can't be asserted (TODO-QUESTION)
-    -->
-  
-  
-  
-  <!-- 
-    Rule: MD_SampleDimension
-    Ref: {if count(maxValue + minValue + meanValue) > 0 then units is
-          mandatory}
-    -->
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.mrc.sampledimension-failure-en"
-      xml:lang="en">The sample dimension does not provide max, min or mean value.</sch:diagnostic>
-    <sch:diagnostic id="rule.mrc.sampledimension-failure-fr"
-      xml:lang="fr">La dimension ne précise pas de valeur maximum ou minimum ni de moyenne.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.mrc.sampledimension-max-success-en"
-      xml:lang="en">
-      The sample dimension max value is 
-      "<sch:value-of select="normalize-space($max)"/>".
-    </sch:diagnostic>
-    <sch:diagnostic id="rule.mrc.sampledimension-max-success-fr"
-      xml:lang="fr">
-      La valeur maximum de la dimension de l'échantillon est
-      "<sch:value-of select="normalize-space($max)"/>".
-    </sch:diagnostic>
-    
-    <sch:diagnostic id="rule.mrc.sampledimension-min-success-en"
-      xml:lang="en">
-      The sample dimension min value is 
-      "<sch:value-of select="normalize-space($min)"/>".
-    </sch:diagnostic>
-    <sch:diagnostic id="rule.mrc.sampledimension-min-success-fr"
-      xml:lang="fr">
-      La valeur minimum de la dimension de l'échantillon est
-      "<sch:value-of select="normalize-space($min)"/>".
-    </sch:diagnostic>
-    
-    <sch:diagnostic id="rule.mrc.sampledimension-mean-success-en"
-      xml:lang="en">
-      The sample dimension mean value is 
-      "<sch:value-of select="normalize-space($mean)"/>".
-    </sch:diagnostic>
-    <sch:diagnostic id="rule.mrc.sampledimension-mean-success-fr"
-      xml:lang="fr">
-      La valeur moyenne de la dimension de l'échantillon est
-      "<sch:value-of select="normalize-space($mean)"/>".
-    </sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.mrc.sampledimension">
-    <sch:title xml:lang="en">Sample dimension MUST provide a max, 
-      a min or a mean value</sch:title>
-    <sch:title xml:lang="fr">La dimension de l'échantillon DOIT préciser
-      une valeur maximum, une valeur minimum ou une moyenne</sch:title>
-    
-    <sch:rule context="//mrc:MD_SampleDimension">
-      
-      <sch:let name="max" 
-        value="mrc:maxValue[normalize-space(*) != '']"/>
-      <sch:let name="min" 
-        value="mrc:minValue[normalize-space(*) != '']"/>
-      <sch:let name="mean" 
-        value="mrc:meanValue[normalize-space(*) != '']"/>
-      
-      <sch:let name="hasMaxOrMinOrMean" 
-        value="count($max) + count($min) + count($mean) > 0"/>
-      
-      <sch:assert test="$hasMaxOrMinOrMean"
-        diagnostics="rule.mrc.sampledimension-failure-en 
-                     rule.mrc.sampledimension-failure-fr"/>
-      
-      <sch:report test="count($max)"
-        diagnostics="rule.mrc.sampledimension-max-success-en 
-                     rule.mrc.sampledimension-max-success-fr"/>
-      <sch:report test="count($min)"
-        diagnostics="rule.mrc.sampledimension-min-success-en 
-                     rule.mrc.sampledimension-min-success-fr"/>
-      <sch:report test="count($mean)"
-        diagnostics="rule.mrc.sampledimension-mean-success-en 
-                     rule.mrc.sampledimension-mean-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
-  
-  
-  
-  <!-- 
-    Rule: MD_Band
-    Ref: {if count(boundMax + boundMin) > 0 then boundUnits is mandatory}
-    -->
-  
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.mrc.bandunit-failure-en"
-      xml:lang="en">The band defined a bound without unit.</sch:diagnostic>
-    <sch:diagnostic id="rule.mrc.bandunit-failure-fr"
-      xml:lang="fr">La bande définit une borne minimum et/ou maximum
-      sans préciser d'unité.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.mrc.bandunit-success-en"
-      xml:lang="en">
-      The band bound [<sch:value-of select="$min"/>-<sch:value-of select="$max"/>] unit is 
-      "<sch:value-of select="$units"/>".
-    </sch:diagnostic>
-    <sch:diagnostic id="rule.mrc.bandunit-success-fr"
-      xml:lang="fr">
-      L'unité de la borne [<sch:value-of select="$min"/>-<sch:value-of select="$max"/>] est 
-      "<sch:value-of select="$units"/>".
-    </sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.mrc.bandunit">
-    <sch:title xml:lang="en">Band MUST specified bounds units 
-      when a bound max or bound min is defined</sch:title>
-    <sch:title xml:lang="fr">Une bande DOIT préciser l'unité 
-      lorsqu'une borne maximum ou minimum est définie</sch:title>
-    
-    <sch:rule context="//mrc:MD_Band[
-      normalize-space(mrc:boundMax/*) != '' or 
-      normalize-space(mrc:boundMin/*) != ''
-      ]">
-      
-      <sch:let name="max" 
-        value="normalize-space(mrc:boundMax/*)"/>
-      <sch:let name="min" 
-        value="normalize-space(mrc:boundMin/*)"/>
-      <sch:let name="units" 
-        value="normalize-space(mrc:boundUnits[normalize-space(*) != ''])"/>
-      
-      <sch:let name="hasUnits" 
-        value="$units != ''"/>
-      
-      <sch:assert test="$hasUnits"
-        diagnostics="rule.mrc.bandunit-failure-en 
-        rule.mrc.bandunit-failure-fr"/>
-      
-      <sch:report test="$hasUnits"
-        diagnostics="rule.mrc.bandunit-success-en 
-                     rule.mrc.bandunit-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
-</sch:schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/mrc.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/mrc.xsd
deleted file mode 100644
index 85cb1a124..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/mrc.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:fcc="http://standards.iso.org/iso/19110/fcc/1.0" xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:mrc="http://standards.iso.org/iso/19115/-3/mrc/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mrc/1.0" version="1.0">
-  <annotation>
-    <documentation>Namespace for XML elements &lt;font color="#1f497d"&gt;used to document schema and amount of content in a structured resource.&lt;/font&gt;</documentation>
-  </annotation>
-  <include schemaLocation="content.xsd"/>
-  <include schemaLocation="contentInformationImagery.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19110/fcc/1.0" schemaLocation="../../../../19110/fcc/1.0/fcc.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/lan/1.0" schemaLocation="../../../../19115/-3/lan/1.0/lan.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/mrc.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/mrc.zip
deleted file mode 100644
index 3c9a4c077..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/mrc.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/mrc_invalid.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/mrc_invalid.xml
deleted file mode 100644
index d67edc831..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/mrc_invalid.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mds/1.0 ../../mds/1.0/mds.xsd" 
- xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0" 
- xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
- xmlns:mrc="http://standards.iso.org/iso/19115/-3/mrc/1.0"
- xmlns:gfc="http://standards.iso.org/iso/19110/gfc/1.1">
-   <mdb:metadataIdentifier></mdb:metadataIdentifier>
-   <mdb:contact></mdb:contact>
-   <mdb:dateInfo></mdb:dateInfo>
-   <mdb:spatialRepresentationInfo></mdb:spatialRepresentationInfo>
-   <mdb:identificationInfo></mdb:identificationInfo>
-   <mdb:contentInfo>
-      <mrc:MD_FeatureCatalogueDescription>
-         <mrc:featureCatalogueCitation></mrc:featureCatalogueCitation>
-      </mrc:MD_FeatureCatalogueDescription>
-   </mdb:contentInfo>
-   <mdb:contentInfo>
-      <mrc:MD_FeatureCatalogue>
-         <mrc:featureCatalogue>
-            <gfc:FC_FeatureCatalogue>
-               <gfc:producer></gfc:producer>
-            </gfc:FC_FeatureCatalogue>
-         </mrc:featureCatalogue>
-      </mrc:MD_FeatureCatalogue>
-   </mdb:contentInfo>
-   <mdb:contentInfo>
-      <mrc:MD_CoverageDescription>
-         <mrc:attributeDescription></mrc:attributeDescription>
-         <mrc:attributeGroup>
-            
-            <mrc:MD_AttributeGroup>
-               <mrc:contentType>
-                  <mrc:MD_CoverageContentTypeCode codeList="" 
-                     codeListValue=""/>
-               </mrc:contentType>
-               
-               
-               <!-- Invalid for rule.mrc.sampledimension -->
-               <mrc:attribute>
-                  <mrc:MD_SampleDimension>
-                     <mrc:maxValue>
-                        <gco:Real></gco:Real>
-                     </mrc:maxValue>
-                  </mrc:MD_SampleDimension>
-               </mrc:attribute>
-               <mrc:attribute>
-                  <mrc:MD_SampleDimension>
-                     
-                  </mrc:MD_SampleDimension>
-               </mrc:attribute>
-               
-               
-               <!-- Invalid for rule.mrc.bandunit -->
-               <mrc:attribute>
-                  <mrc:MD_Band>
-                     <mrc:boundMin>
-                        <gco:Real>0</gco:Real>
-                     </mrc:boundMin>
-                     <mrc:boundMax>
-                        <gco:Real>1.0</gco:Real>
-                     </mrc:boundMax>
-                  </mrc:MD_Band>
-               </mrc:attribute>
-            </mrc:MD_AttributeGroup>
-         </mrc:attributeGroup>
-      </mrc:MD_CoverageDescription>
-   </mdb:contentInfo>
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/mrc_valid.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/mrc_valid.xml
deleted file mode 100644
index 3a8b45267..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrc/1.0/mrc_valid.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-   xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mds/1.0 ../../mds/1.0/mds.xsd  
-   http://standards.iso.org/iso/19110/gfc/1.1 ../../../../19110/gfc/1.1/gfc.xsd" 
-   xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0" 
-   xmlns:gfc="http://standards.iso.org/iso/19110/gfc/1.1" 
-   xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" 
-   xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0" 
-   xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0" 
-   xmlns:mrc="http://standards.iso.org/iso/19115/-3/mrc/1.0" 
-   xmlns:gml="http://www.opengis.net/gml/3.2">
-  <!-- have to provide schema location for gfc to get concrete implementation of FeatureCatalog to include inline -->
-   <mdb:metadataIdentifier/>
-   <mdb:contact/>
-   <mdb:dateInfo/>
-   <mdb:spatialRepresentationInfo/>
-   <mdb:identificationInfo/>
-   <mdb:contentInfo>
-      <mrc:MD_FeatureCatalogueDescription>
-         <mrc:featureCatalogueCitation/>
-      </mrc:MD_FeatureCatalogueDescription>
-   </mdb:contentInfo>
-   <mdb:contentInfo>
-      <mrc:MD_FeatureCatalogue>
-         <mrc:featureCatalogue>
-            <gfc:FC_FeatureCatalogue>
-               <cat:name></cat:name>
-               <cat:scope></cat:scope>
-               <cat:versionNumber></cat:versionNumber>
-               <cat:versionDate></cat:versionDate>
-               <gfc:producer></gfc:producer>
-            </gfc:FC_FeatureCatalogue>
-         </mrc:featureCatalogue>
-      </mrc:MD_FeatureCatalogue>
-   </mdb:contentInfo>
-   <mdb:contentInfo>
-      <mrc:MD_CoverageDescription>
-         <mrc:attributeDescription/>
-         <mrc:attributeGroup>
-            <mrc:MD_AttributeGroup>
-               <mrc:contentType>
-                  <mrc:MD_CoverageContentTypeCode codeList="" codeListValue=""/>
-               </mrc:contentType>
-               
-               <!-- Valid for rule.mrc.sampledimension -->
-               <mrc:attribute>
-                  <mrc:MD_SampleDimension>
-                     <mrc:maxValue>
-                        <gco:Real>1.0</gco:Real>
-                     </mrc:maxValue>
-                     <mrc:minValue>
-                        <gco:Real>0.0</gco:Real>
-                     </mrc:minValue>
-                     <mrc:meanValue>
-                        <gco:Real>.9</gco:Real>
-                     </mrc:meanValue>
-                  </mrc:MD_SampleDimension>
-               </mrc:attribute>
-               
-               <!-- Valid for rule.mrc.bandunit -->
-               <mrc:attribute>
-                  <mrc:MD_Band>
-                     <mrc:boundMax>
-                        <gco:Real>1.0</gco:Real>
-                     </mrc:boundMax>
-                     <mrc:boundMin>
-                        <gco:Real>0</gco:Real>
-                     </mrc:boundMin>
-                     <mrc:boundUnits>
-                        <gml:ConventionalUnit gml:id="x3264">
-                           <gml:identifier codeSpace="unknown">furlongs</gml:identifier>
-                           <gml:conversionToPreferredUnit uom="cm">
-                              <gml:factor>33</gml:factor>
-                           </gml:conversionToPreferredUnit>
-                        </gml:ConventionalUnit>
-                     </mrc:boundUnits>
-                  </mrc:MD_Band>
-               </mrc:attribute>
-            </mrc:MD_AttributeGroup>
-         </mrc:attributeGroup>
-      </mrc:MD_CoverageDescription>
-   </mdb:contentInfo>
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/codelists.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/codelists.html
deleted file mode 100644
index 6d4e6ec95..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/codelists.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0" xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>
-         Codelists from the Metadata for Resource Distribution (mrd) Namespace
-         
-      </title>
-   </head>
-   <body><a name="top"></a><h1>ISO 19115-3 Codelist Report</h1>
-      <h2>
-         Codelists from the Metadata for Resource Distribution (mrd) Namespace
-         
-      </h2>
-      <table>
-         <tr><b>
-               <td>Scope</td></b><td>
-               Codelists from the Metadata for Resource Distribution (mrd) Namespace
-               
-            </td>
-         </tr>
-         <tr><b>
-               <td>Field of Application</td></b><td>
-               ISO TC211 Metadata Standards
-               
-            </td>
-         </tr>
-         <tr><b>
-               <td>Version (Date)</td></b><td>
-               0.1
-                ()
-            </td>
-         </tr>
-      </table>
-      <h2>
-         MD_MediumFormatCode
-          (
-         MD_MediumFormatCode
-         ):
-      </h2><b>Description: </b>
-      method used to write to the medium
-      
-      <table width="95%" border="1" cellpadding="2" cellspacing="2">
-         <tr>
-            <th valign="top">Entry</th>
-            <th valign="top">Definition</th>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_MediumFormatCode_cpio
-               
-            </td>
-            <td valign="top">
-               Copy In / Out (UNIX file format and
-               command)
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_MediumFormatCode_tar
-               
-            </td>
-            <td valign="top">
-               Tape Archive
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_MediumFormatCode_highSierra
-               
-            </td>
-            <td valign="top">
-               high sierra file system
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_MediumFormatCode_iso9660
-               
-            </td>
-            <td valign="top">
-               information processing volume and file structure of
-               CD-ROM
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_MediumFormatCode_iso9660RockRidge
-               
-            </td>
-            <td valign="top">
-               rock ridge interchange protocol (UNIX)
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_MediumFormatCode_iso9660AppleHFS
-               
-            </td>
-            <td valign="top">
-               hierarchical file system (Macintosh)
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_MediumFormatCode_udf
-               
-            </td>
-            <td valign="top">
-               universal disk format
-               
-            </td>
-         </tr>
-      </table><a href="#top">top</a><hr/><i>Stylesheet: CT_CodelistHTML.xsl Version: 2015-04-17</i></body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/codelists.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/codelists.xml
deleted file mode 100644
index f63cf8b9b..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/codelists.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cat:CT_CodelistCatalogue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0"
-   xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0"
-   xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:gml="http://www.opengis.net/gml/3.2"
-   xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/cat/1.0 ../../../-3/cat/1.0/cat.xsd">
-   <!--=====Catalogue description=====-->
-   <cat:name>
-      <gco:CharacterString>Codelists from the Metadata for Resource Distribution (mrd) Namespace</gco:CharacterString>
-   </cat:name>
-   <cat:scope>
-      <gco:CharacterString>Codelists from the Metadata for Resource Distribution (mrd) Namespace</gco:CharacterString>
-   </cat:scope>
-   <cat:fieldOfApplication>
-      <gco:CharacterString>ISO TC211 Metadata Standards</gco:CharacterString>
-   </cat:fieldOfApplication>
-   <cat:versionNumber>
-      <gco:CharacterString>0.1</gco:CharacterString>
-   </cat:versionNumber>
-   <cat:versionDate>
-      <gco:Date>2015-04-18</gco:Date>
-   </cat:versionDate>
-   <cat:locale>
-      <lan:PT_Locale>
-         <lan:language>
-            <lan:LanguageCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codelists.xml#LanguageCode" codeListValue="eng">eng</lan:LanguageCode>
-         </lan:language>
-         <lan:characterEncoding>
-            <lan:MD_CharacterSetCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codelists.xml#MD_CharacterSetCode"
-               codeListValue="UTF-8">UTF-8</lan:MD_CharacterSetCode>
-         </lan:characterEncoding>
-      </lan:PT_Locale>
-   </cat:locale>
-   <!--============================= Codelists =======================================-->
-   <!-- MD_MediumFormatCode  -->
-   <cat:codelistItem>
-      <cat:CT_Codelist id="MD_MediumFormatCode">
-         <cat:identifier>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >MD_MediumFormatCode</gco:ScopedName>
-         </cat:identifier>
-         <cat:name>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >MD_MediumFormatCode</gco:ScopedName>
-         </cat:name>
-         <cat:definition>
-            <gco:CharacterString>method used to write to the medium</gco:CharacterString>
-         </cat:definition>
-         <cat:description>
-            <gco:CharacterString>method used to write to the medium</gco:CharacterString>
-         </cat:description>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_MediumFormatCode_cpio">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_MediumFormatCode_cpio</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>Copy In / Out (UNIX file format and
-                     command)</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_MediumFormatCode_tar">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_MediumFormatCode_tar</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>Tape Archive</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_MediumFormatCode_highSierra">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_MediumFormatCode_highSierra</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>high sierra file system</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_MediumFormatCode_iso9660">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_MediumFormatCode_iso9660</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>information processing volume and file structure of
-                     CD-ROM</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_MediumFormatCode_iso9660RockRidge">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_MediumFormatCode_iso9660RockRidge</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>rock ridge interchange protocol (UNIX)</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_MediumFormatCode_iso9660AppleHFS">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_MediumFormatCode_iso9660AppleHFS</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>hierarchical file system (Macintosh)</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_MediumFormatCode_udf">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_MediumFormatCode_udf</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>universal disk format</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-      </cat:CT_Codelist>
-   </cat:codelistItem>
-   <!--=== EOF ===-->
-</cat:CT_CodelistCatalogue>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/distribution.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/distribution.xsd
deleted file mode 100644
index b33f8ae71..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/distribution.xsd
+++ /dev/null
@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-  xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" 
-  xmlns:gmw="http://standards.iso.org/iso/19115/-3/gmw/1.0" 
-  xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" 
-  xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mrd/1.0" version="1.0">
-<!--  <include schemaLocation="mrd.xsd"/>-->
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
- <!-- <import namespace="http://standards.iso.org/iso/19115/-3/gmw/1.0" schemaLocation="../../../../19115/-3/gmw/1.0/gmw.xsd"/>-->
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="MD_DigitalTransferOptions" substitutionGroup="gco:AbstractObject" type="mrd:MD_DigitalTransferOptions_Type">
-    <annotation>
-      <documentation>technical means and media by which a resource is obtained from the distributor</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_DigitalTransferOptions_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element minOccurs="0" name="unitsOfDistribution" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>tiles, layers, geographic areas, etc., in which data is available NOTE: unitsOfDistribution applies to both onLine and offLine distributions</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="transferSize" type="gco:Real_PropertyType">
-            <annotation>
-              <documentation>estimated size of a unit in the specified transfer format, expressed in megabytes. The transfer size is &gt; 0.0</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="onLine" type="mcc:Abstract_OnlineResource_PropertyType">
-            <annotation>
-              <documentation>information about online sources from which the resource can be obtained</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="offLine" type="mrd:MD_Medium_PropertyType">
-            <annotation>
-              <documentation>information about offline media on which the resource can be obtained</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="transferFrequency" type="gco:TM_PeriodDuration_PropertyType">
-            <annotation>
-              <documentation>rate of occurrence of distribution</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="distributionFormat" type="mrd:MD_Format_PropertyType">
-            <annotation>
-              <documentation>format of distribution</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_DigitalTransferOptions_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrd:MD_DigitalTransferOptions"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_Distribution" substitutionGroup="mcc:Abstract_Distribution" type="mrd:MD_Distribution_Type">
-    <annotation>
-      <documentation>information about the distributor of and options for obtaining the resource</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_Distribution_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_Distribution_Type">
-        <sequence>
-          <element minOccurs="0" name="description" type="gco:CharacterString_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="distributionFormat" type="mcc:Abstract_Format_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="distributor" type="mrd:MD_Distributor_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="transferOptions" type="mrd:MD_DigitalTransferOptions_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_Distribution_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrd:MD_Distribution"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_Distributor" substitutionGroup="gco:AbstractObject" type="mrd:MD_Distributor_Type">
-    <annotation>
-      <documentation>information about the distributor</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_Distributor_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="distributorContact" type="mcc:Abstract_Responsibility_PropertyType">
-            <annotation>
-              <documentation>party from whom the resource may be obtained. This list need not be exhaustive</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="distributionOrderProcess" type="mcc:Abstract_StandardOrderProcess_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="distributorFormat" type="mcc:Abstract_Format_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="distributorTransferOptions" type="mrd:MD_DigitalTransferOptions_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_Distributor_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrd:MD_Distributor"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_Format" substitutionGroup="mcc:Abstract_Format" type="mrd:MD_Format_Type">
-    <annotation>
-      <documentation>description of the computer language construct that specifies the representation of data objects in a record, file, message, storage device or transmission channel</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_Format_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_Format_Type">
-        <sequence>
-          <element name="formatSpecificationCitation" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>citation/URL of the specification for the format</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="amendmentNumber" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>amendment number of the format version</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="fileDecompressionTechnique" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>recommendations of algorithms or processes that can be applied to read or expand resources to which compression techniques have been applied</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="medium" type="mrd:MD_Medium_PropertyType">
-            <annotation>
-              <documentation>medium used by the format</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="formatDistributor" type="mrd:MD_Distributor_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_Format_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrd:MD_Format"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_Medium" substitutionGroup="gco:AbstractObject" type="mrd:MD_Medium_Type">
-    <annotation>
-      <documentation>information about the media on which the resource can be distributed</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_Medium_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element minOccurs="0" name="name" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>name of the medium on which the resource can be received</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="density" type="gco:Real_PropertyType">
-            <annotation>
-              <documentation>density at which the data is recorded</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="densityUnits" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>units of measure for the recording density</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="volumes" type="gco:Integer_PropertyType">
-            <annotation>
-              <documentation>number of items in the media identified</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="mediumFormat" type="mrd:MD_MediumFormatCode_PropertyType">
-            <annotation>
-              <documentation>method used to write to the medium</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="mediumNote" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>description of other limitations or requirements for using the medium</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="identifier" type="mcc:MD_Identifier_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_Medium_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrd:MD_Medium"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_MediumFormatCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>method used to write to the medium</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_MediumFormatCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrd:MD_MediumFormatCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_StandardOrderProcess" substitutionGroup="mcc:Abstract_StandardOrderProcess" type="mrd:MD_StandardOrderProcess_Type">
-    <annotation>
-      <documentation>common ways in which the resource may be obtained or received, and related instructions and fee information</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_StandardOrderProcess_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_StandardOrderProcess_Type">
-        <sequence>
-          <element minOccurs="0" name="fees" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>fees and terms for retrieving the resource. Include monetary units (as specified in ISO 4217)</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="plannedAvailableDateTime" type="gco:DateTime_PropertyType">
-            <annotation>
-              <documentation>date and time when the resource will be available</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="orderingInstructions" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>general instructions, terms and services provided by the distributor</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="turnaround" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>typical turnaround time for the filling of an order</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="orderOptionsType" type="gco:RecordType_PropertyType">
-            <annotation>
-              <documentation>description of the order options record</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="orderOptions" type="gco:Record_PropertyType">
-            <annotation>
-              <documentation>request/purchase choices</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_StandardOrderProcess_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrd:MD_StandardOrderProcess"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/index.html
deleted file mode 100644
index 5d57fb479..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/index.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Metadata for Resource Distribution (MRD) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Metadata for Resource Distribution (MRD) Version: 1.0</h1><img src="mrd.png"><h2>Description</h2>
-      <p>MRD 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.11.  It includes elements specifying how a resource is accessed. The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>Sample XML files for mrd 1.0</h2><a href="mrd_invalid.xml">mrd_invalid.xml</a> <a href="mrd_valid.xml">mrd_valid.xml</a> 
-      <h2>CodeLists for mrd 1.0</h2><a href="codelists.html">codelists.html</a> <a href="codelists.xml">codelists.xml</a> 
-      <h2>XML Namespace for mrd 1.0</h2>
-      <p>The namespace URI for mrd 1.0 is <b>http://standards.iso.org/iso/19115/-3/mrd/1.0</b>.
-      </p>
-      <h2>XML Schema for mrd 1.0</h2>
-      <p><b><a href="mrd.xsd">mrd.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the mrd 1.0 namespace or by XML Schema documents importing the mrd 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the mrd namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for mrd 1.0 are available <a href="mrd.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for mrd 1.0</h2>
-      <p><b><a href="distribution.xsd">distribution.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.11. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): MD_DigitalTransferOptions, MD_Distribution, MD_Distributor, MD_Format, MD_Medium, <b>MD_MediumFormatCode</b>, and MD_StandardOrderProcess
-      </p>
-      <h2>Related XML Namespaces for mrd 1.0</h2> The mrd 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Geographic COmmon</td>
-            <td>gco</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gco/1.0">http://standards.iso.org/iso/19115/-3/gco/1.0</a></td>
-            <td>../../../../19115/-3/gco/1.0/gco.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata Common Classes</td>
-            <td>mcc</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mcc/1.0">http://standards.iso.org/iso/19115/-3/mcc/1.0</a></td>
-            <td>../../../../19115/-3/mcc/1.0/mcc.xsd</td>
-         </tr>
-      </table>
-      <h2>Schematron Validation Rules for mrd 1.0</h2> Schematron rules for validating instance documents of the mrd 1.0 namespace are in <a href="mrd.sch">mrd.sch</a>. Other schematron rule sets that are
-      required for a complete validation are: gco.sch, mcc.sch, and mcc.sch
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/mrd.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/mrd.png
deleted file mode 100644
index cfe14b941..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/mrd.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/mrd.sch b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/mrd.sch
deleted file mode 100644
index af6af8e67..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/mrd.sch
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron">
-  <sch:ns prefix="mrd" uri="http://standards.iso.org/iso/19115/-3/mrd/1.0"/>
-  <!--
-    ISO 19115-3 base requirements for metadata instance documents
-    
-    See ISO19115-1:2014(E) page 20, Figure 15 Distribution information classes
-  -->
-  
-  <!-- 
-    Rule: MD_Medium
-    Ref: {if density used then count (densityUnits) > 0}
-    -->
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.mrd.mediumunit-failure-en"
-      xml:lang="en">The medium define a density without unit.</sch:diagnostic>
-    <sch:diagnostic id="rule.mrd.mediumunit-failure-fr"
-      xml:lang="fr">La densité du média est définie sans unité.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.mrd.mediumunit-success-en"
-      xml:lang="en">
-      Medium density is "<sch:value-of select="$density"/>" (unit:  
-      "<sch:value-of select="$units"/>").
-    </sch:diagnostic>
-    <sch:diagnostic id="rule.mrd.mediumunit-success-fr"
-      xml:lang="fr">
-      La densité du média est "<sch:value-of select="$density"/>" (unité :  
-      "<sch:value-of select="$units"/>").
-    </sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.mrd.mediumunit">
-    <sch:title xml:lang="en">Medium having density MUST specified density units</sch:title>
-    <sch:title xml:lang="fr">Un média précisant une densité DOIT préciser l'unité</sch:title>
-    
-    <sch:rule context="//mrd:MD_Medium[mrd:density]">
-      
-      <sch:let name="density" 
-        value="normalize-space(mrd:density/*)"/>
-      <sch:let name="units" 
-        value="normalize-space(mrd:densityUnits[normalize-space(*) != ''])"/>
-      
-      <sch:let name="hasUnits" 
-        value="$units != ''"/>
-      
-      <sch:assert test="$hasUnits"
-        diagnostics="rule.mrd.mediumunit-failure-en 
-                     rule.mrd.mediumunit-failure-fr"/>
-      
-      <sch:report test="$hasUnits"
-        diagnostics="rule.mrd.mediumunit-success-en 
-                     rule.mrd.mediumunit-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
-</sch:schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/mrd.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/mrd.xsd
deleted file mode 100644
index 2dc001ca9..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/mrd.xsd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mrd/1.0" version="1.0">
-  <annotation>
-    <documentation>Namespace for XML elements &lt;font color="#1f497d"&gt;used to specify how various representations(distributions) of a resource can be obtained&lt;/font&gt;.</documentation>
-  </annotation>
-  <include schemaLocation="distribution.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/mrd.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/mrd.zip
deleted file mode 100644
index 9f90f4f71..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/mrd.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/mrd_invalid.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/mrd_invalid.xml
deleted file mode 100644
index 486486da1..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/mrd_invalid.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mds/1.0 ../../mds/1.0/mds.xsd" 
- xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0" 
- xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
- xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0">
-   <mdb:metadataIdentifier></mdb:metadataIdentifier>
-   <mdb:contact></mdb:contact>
-   <mdb:dateInfo></mdb:dateInfo>
-   <mdb:identificationInfo></mdb:identificationInfo>
-   <mdb:distributionInfo>
-      <mrd:MD_Distribution>
-         <mrd:transferOptions>
-            <mrd:MD_DigitalTransferOptions>
-               <mrd:offLine>
-                  
-                  <!-- rule.mrd.mediumunit -->
-                  <mrd:MD_Medium>
-                     <mrd:density>
-                        <gco:Real>75</gco:Real>
-                     </mrd:density>
-                  </mrd:MD_Medium>
-               </mrd:offLine>
-            </mrd:MD_DigitalTransferOptions>
-         </mrd:transferOptions>
-      </mrd:MD_Distribution>
-   </mdb:distributionInfo>
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/mrd_valid.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/mrd_valid.xml
deleted file mode 100644
index 9403d5976..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrd/1.0/mrd_valid.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mds/1.0 http://standards.iso.org/iso/19115/-3/mds/1.0/mds.xsd" 
- xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0" 
- xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
- xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0"
- xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0">
-   <mdb:metadataIdentifier></mdb:metadataIdentifier>
-   <mdb:contact></mdb:contact>
-   <mdb:dateInfo></mdb:dateInfo>
-   <mdb:identificationInfo></mdb:identificationInfo>
-   <mdb:distributionInfo>
-      <mrd:MD_Distribution>
-         <mrd:distributor>
-            <mrd:MD_Distributor>
-               <mrd:distributorContact>
-                  <cit:CI_Responsibility>
-                     <cit:role>
-                        <cit:CI_RoleCode codeList="http://w3.energistics.org/energyml/profiles/EIP/ISO/catCodelists19115-3.xml#CI_RoleCode" codeListValue="pointOfContact">contact for resource dis-tribution
-                        </cit:CI_RoleCode>
-                     </cit:role>
-                     <cit:party>
-                        <cit:CI_Individual>
-                           <cit:name>
-                              <gco:CharacterString>Arizona Geological Survey WebMaster
-                              </gco:CharacterString>
-                           </cit:name>
-                           <cit:contactInfo>
-                              <cit:CI_Contact>
-                                 <cit:phone>
-                                    <cit:CI_Telephone>
-                                       <cit:number>
-                                          <gco:CharacterString>520-770-3500
-                                          </gco:CharacterString>
-                                       </cit:number>
-                                    </cit:CI_Telephone>
-                                 </cit:phone>
-                                 <cit:address>
-                                    <cit:CI_Address>
-                                       <cit:electronicMailAddress>
-                                          <gco:CharacterString>
-                                             webServices@azgs.az.gov</gco:CharacterString>
-                                       </cit:electronicMailAddress>
-                                    </cit:CI_Address>
-                                 </cit:address>
-                              </cit:CI_Contact>
-                           </cit:contactInfo>
-                           <cit:positionName>
-                              <gco:CharacterString>webmaster</gco:CharacterString>
-                           </cit:positionName>
-                        </cit:CI_Individual>
-                     </cit:party>
-                  </cit:CI_Responsibility>
-               </mrd:distributorContact>
-            </mrd:MD_Distributor>
-            
-         </mrd:distributor>
-         <mrd:transferOptions>
-            <mrd:MD_DigitalTransferOptions>
-               <mrd:offLine>
-                  
-                  <!-- Invalid for rule.mrd.mediumunit -->
-                  <mrd:MD_Medium>
-                     <mrd:density>
-                        <gco:Real>75</gco:Real>
-                     </mrd:density>
-                     <mrd:densityUnits>
-                        <gco:CharacterString>cm</gco:CharacterString>
-                     </mrd:densityUnits>
-                  </mrd:MD_Medium>
-               </mrd:offLine>
-            </mrd:MD_DigitalTransferOptions>
-         </mrd:transferOptions>
-      </mrd:MD_Distribution>
-   </mdb:distributionInfo>
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/codelists.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/codelists.html
deleted file mode 100644
index e7baf30fa..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/codelists.html
+++ /dev/null
@@ -1,772 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0" xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>
-         Codelists from the Metadata for Resource Identification (mri) Namespace
-         
-      </title>
-   </head>
-   <body><a name="top"></a><h1>ISO 19115-3 Codelist Report</h1>
-      <h2>
-         Codelists from the Metadata for Resource Identification (mri) Namespace
-         
-      </h2>
-      <table>
-         <tr><b>
-               <td>Scope</td></b><td>
-               Codelists from the Metadata for Resource Identification (mri) Namespace
-               
-            </td>
-         </tr>
-         <tr><b>
-               <td>Field of Application</td></b><td>
-               ISO TC211 Metadata Standards
-               
-            </td>
-         </tr>
-         <tr><b>
-               <td>Version (Date)</td></b><td>
-               0.1
-                ()
-            </td>
-         </tr>
-      </table>
-      <h2>
-         DS_AssociationTypeCode
-          (
-         DS_AssociationTypeCode
-         ):
-      </h2><b>Description: </b>
-      justification for the correlation of two
-      resources
-      
-      <table width="95%" border="1" cellpadding="2" cellspacing="2">
-         <tr>
-            <th valign="top">Entry</th>
-            <th valign="top">Definition</th>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_AssociationTypeCode_crossReference
-               
-            </td>
-            <td valign="top">
-               reference from one resource to another
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_AssociationTypeCode_largerWorkCitation
-               
-            </td>
-            <td valign="top">
-               reference to a master resource of which this one is a
-               part
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_AssociationTypeCode_partOfSeamlessDatabase
-               
-            </td>
-            <td valign="top">
-               part of same structured set of data held in a
-               computer
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_AssociationTypeCode_stereoMate
-               
-            </td>
-            <td valign="top">
-               part of a set of imagery that when used together, provides
-               three-dimensional images
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_AssociationTypeCode_isComposedOf
-               
-            </td>
-            <td valign="top">
-               reference to resources that are parts of this
-               resource
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_AssociationTypeCode_collectiveTitle
-               
-            </td>
-            <td valign="top">
-               common title for a collection of resources. NOTE: title
-               identifies elements of a series collectively, combined with information about
-               what volumes are available at the source cite
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_AssociationTypeCode_series
-               
-            </td>
-            <td valign="top">
-               associated through a common heritage such as produced to a
-               common product specification
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_AssociationTypeCode_dependency
-               
-            </td>
-            <td valign="top">
-               associated through a dependency
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_AssociationTypeCode_revisionOf
-               
-            </td>
-            <td valign="top">
-               resource is a revision of associated
-               resource
-               
-            </td>
-         </tr>
-      </table><a href="#top">top</a><h2>
-         DS_InitiativeTypeCode
-          (
-         DS_InitiativeTypeCode
-         ):
-      </h2><b>Description: </b>
-      type of aggregation activity in which resources are
-      related
-      
-      <table width="95%" border="1" cellpadding="2" cellspacing="2">
-         <tr>
-            <th valign="top">Entry</th>
-            <th valign="top">Definition</th>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_InitiativeTypeCode_campaign
-               
-            </td>
-            <td valign="top">
-               series of organized planned actions 
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_InitiativeTypeCode_collection
-               
-            </td>
-            <td valign="top">
-               accumulation of resources assembled for a specific
-               purpose
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_InitiativeTypeCode_exercise
-               
-            </td>
-            <td valign="top">
-               specific performance of a function or group of
-               functions
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_InitiativeTypeCode_experiment
-               
-            </td>
-            <td valign="top">
-               process designed to find if something is effective or
-               valid
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_InitiativeTypeCode_investigation
-               
-            </td>
-            <td valign="top">
-               search or systematic inquiry
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_InitiativeTypeCode_mission
-               
-            </td>
-            <td valign="top">
-               specific operation of a data collection
-               system
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_InitiativeTypeCode_sensor
-               
-            </td>
-            <td valign="top">
-               device or piece of equipment which detects or
-               records
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_InitiativeTypeCode_operation
-               
-            </td>
-            <td valign="top">
-               action that is part of a series of
-               actions
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_InitiativeTypeCode_platform
-               
-            </td>
-            <td valign="top">
-               vehicle or other support base that holds a
-               sensor
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_InitiativeTypeCode_process
-               
-            </td>
-            <td valign="top">
-               method of doing something involving a number of
-               steps
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_InitiativeTypeCode_program
-               
-            </td>
-            <td valign="top">
-               specific planned activity
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_InitiativeTypeCode_project
-               
-            </td>
-            <td valign="top">
-               organized undertaking, research, or
-               development
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_InitiativeTypeCode_study
-               
-            </td>
-            <td valign="top">
-               examination or investigation 
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_InitiativeTypeCode_task
-               
-            </td>
-            <td valign="top">
-               piece of work
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               DS_InitiativeTypeCode_trial
-               
-            </td>
-            <td valign="top">
-               process of testing to discover or demonstrate
-               something
-               
-            </td>
-         </tr>
-      </table><a href="#top">top</a><h2>
-         MD_KeywordTypeCode
-          (
-         MD_KeywordTypeCode
-         ):
-      </h2><b>Description: </b>
-      methods used to group similar keywords
-      
-      <table width="95%" border="1" cellpadding="2" cellspacing="2">
-         <tr>
-            <th valign="top">Entry</th>
-            <th valign="top">Definition</th>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_KeywordTypeCode_discipline
-               
-            </td>
-            <td valign="top">
-               keyword identifies a branch of instruction or specialized
-               learning
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_KeywordTypeCode_place
-               
-            </td>
-            <td valign="top">
-               keyword identifies a location
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_KeywordTypeCode_stratum
-               
-            </td>
-            <td valign="top">
-               keyword identifies the layer(s) of any deposited substance or
-               levels within an ordered system
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_KeywordTypeCode_temporal
-               
-            </td>
-            <td valign="top">
-               keyword identifies a time period related to the
-               resource
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_KeywordTypeCode_theme
-               
-            </td>
-            <td valign="top">
-               keyword identifies a particular subject or
-               topic
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_KeywordTypeCode_dataCentre
-               
-            </td>
-            <td valign="top">
-               keyword identifies a repository or archive that manages and
-               distributes data
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_KeywordTypeCode_featureType
-               
-            </td>
-            <td valign="top">
-               keyword identifies a resource containing or about a
-               collection of feature instances with common
-               characteristics
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_KeywordTypeCode_instrument
-               
-            </td>
-            <td valign="top">
-               keyword identifies a device used to measure or compare
-               physical properties
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_KeywordTypeCode_platform
-               
-            </td>
-            <td valign="top">
-               keyword identifies a structure upon which an instrument is
-               mounted
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_KeywordTypeCode_process
-               
-            </td>
-            <td valign="top">
-               keyword identifies a series of actions or natural occurrences
-               
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_KeywordTypeCode_project
-               
-            </td>
-            <td valign="top">
-               keyword identifies an endeavour undertaken to create or
-               modify a product or service
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_KeywordTypeCode_service
-               
-            </td>
-            <td valign="top">
-               keyword identifies an activity carried out by one party for
-               the benefit of another
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_KeywordTypeCode_product
-               
-            </td>
-            <td valign="top">
-               keyword identifies a type of product
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_KeywordTypeCode_subTopicCategory
-               
-            </td>
-            <td valign="top">
-               refinement of a topic category for the purpose of geographic
-               data classification
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_KeywordTypeCode_taxon
-               
-            </td>
-            <td valign="top">
-               keyword identifies a taxonomy of the
-               resource
-               
-            </td>
-         </tr>
-      </table><a href="#top">top</a><h2>
-         MD_TopicCategoryCode
-          (
-         MD_TopicCategoryCode
-         ):
-      </h2><b>Description: </b>
-      high-level geographic data thematic classification to assist in the
-      grouping and search of available geographic data sets. Can be used to group keywords
-      as well. Listed examples are not exhaustive. NOTE: It is understood there are
-      overlaps between general categories and the user is encouraged to select the one most
-      appropriate.
-      
-      <table width="95%" border="1" cellpadding="2" cellspacing="2">
-         <tr>
-            <th valign="top">Entry</th>
-            <th valign="top">Definition</th>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_TopicCategoryCode_farming
-               
-            </td>
-            <td valign="top">
-               rearing of animals and/or cultivation of plants. Examples:
-               agriculture, irrigation, aquaculture, plantations, herding, pests and diseases
-               affecting crops and livestock
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_TopicCategoryCode_biota
-               
-            </td>
-            <td valign="top">
-               flora and/or fauna in natural environment. Examples:
-               wildlife, vegetation, biological sciences, ecology, wilderness, sealife,
-               wetlands, habitat
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_TopicCategoryCode_boundaries 
-               
-            </td>
-            <td valign="top">
-               legal land descriptions, maritime boundaries. Examples:
-               political and administrative boundaries, territorial seas, EEZ, port security
-               zones
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_TopicCategoryCode_climatologyMeteorologyAtmosphere
-               
-            </td>
-            <td valign="top">
-               processes and phenomena of the atmosphere. Examples: cloud
-               cover, weather, climate, atmospheric conditions, climate change,
-               precipitation
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_TopicCategoryCode_economy
-               
-            </td>
-            <td valign="top">
-               economic activities, conditions and employment. Examples:
-               production, labour, revenue, commerce, industry, tourism and ecotourism,
-               forestry, fisheries, commercial or subsistence hunting, exploration and
-               exploitation of resources such as minerals, oil and gas 
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_TopicCategoryCode_elevation
-               
-            </td>
-            <td valign="top">
-               height above or below a vertical datum. Examples: altitude,
-               bathymetry, digital elevation models, slope, derived
-               products
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_TopicCategoryCode_environment
-               
-            </td>
-            <td valign="top">
-               environmental resources, protection and conservation.
-               Examples: environmental pollution, waste storage and treatment, environmental
-               impact assessment, monitoring environmental risk, nature reserves,
-               landscape
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_TopicCategoryCode_geoscientificInformation
-               
-            </td>
-            <td valign="top">
-               information pertaining to earth sciences. Examples:
-               geophysical features and processes, geology, minerals, sciences dealing with
-               the composition, structure and origin of the earth's rocks, risks of
-               earthquakes, volcanic activity, landslides, gravity information, soils,
-               permafrost, hydrogeology, erosion
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_TopicCategoryCode_health
-               
-            </td>
-            <td valign="top">
-               health, health services, human ecology, and safety. Examples:
-               disease and illness, factors affecting health, hygiene, substance abuse, mental
-               and physical health, health services
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_TopicCategoryCode_imageryBaseMapsEarthCover
-               
-            </td>
-            <td valign="top">
-               base maps. Examples: land cover, topographic maps, imagery,
-               unclassified images, annotations
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_TopicCategoryCode_intelligenceMilitary 
-               
-            </td>
-            <td valign="top">
-               military bases, structures, activities. Examples: barracks,
-               training grounds, military transportation, information
-               collection
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_TopicCategoryCode_inlandWaters
-               
-            </td>
-            <td valign="top">
-               inland water features, drainage systems and their
-               characteristics. Examples: rivers and glaciers, salt lakes, water utilization
-               plans, dams, currents, floods, water quality, hydrologic
-               information
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_TopicCategoryCode_location
-               
-            </td>
-            <td valign="top">
-               positional information and services. Examples: addresses,
-               geodetic networks, control points, postal zones and services, place
-               names
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_TopicCategoryCode_oceans
-               
-            </td>
-            <td valign="top">
-               features and characteristics of salt water bodies (excluding
-               inland waters) Examples: tides, tsunamis, coastal information,
-               reefs
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_TopicCategoryCode_planningCadastre
-               
-            </td>
-            <td valign="top">
-               information used for appropriate actions for future use of
-               the land. Examples: land use maps, zoning maps, cadastral surveys, land
-               ownership
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_TopicCategoryCode_society
-               
-            </td>
-            <td valign="top">
-               characteristics of society and cultures. Examples:
-               settlements, anthropology, archaeology, education, traditional beliefs, manners
-               and customs, demographic data, recreational areas and activities, social impact
-               assessments, crime and justice, census information
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_TopicCategoryCode_structure
-               
-            </td>
-            <td valign="top">
-               man-made construction. Examples: buildings, museums,
-               churches, factories, housing, monuments, shops, towers
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_TopicCategoryCode_transportation
-               
-            </td>
-            <td valign="top">
-               means and aids for conveying persons and/or goods. Examples:
-               roads, airports/airstrips, shipping routes, tunnels, nautical charts, vehicle
-               or vessel location, aeronautical charts, railways
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_TopicCategoryCode_utilitiesCommunication
-               
-            </td>
-            <td valign="top">
-               energy, water and waste systems and communications
-               infrastructure and services. Examples: hydroelectricity, geothermal, solar and
-               nuclear sources of energy, water purification and distribution, sewage
-               collection and disposal, electricity and gas distribution, data communication,
-               telecommunication, radio, communication networks
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_TopicCategoryCode_extraTerrestrial
-               
-            </td>
-            <td valign="top">
-               region more than 100 km above the surface of the
-               Earth
-               
-            </td>
-         </tr>
-         <tr>
-            <td valign="top">
-               MD_TopicCategoryCode_disaster
-               
-            </td>
-            <td valign="top">
-               Information related to disasters. Examples: site of the
-               disaster, evacuation zone, disaster-prevention facility, disaster relief
-               activities
-               
-            </td>
-         </tr>
-      </table><a href="#top">top</a><hr/><i>Stylesheet: CT_CodelistHTML.xsl Version: 2015-04-17</i></body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/codelists.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/codelists.xml
deleted file mode 100644
index d764ffcc1..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/codelists.xml
+++ /dev/null
@@ -1,864 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cat:CT_CodelistCatalogue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0"
-   xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0"
-   xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:gml="http://www.opengis.net/gml/3.2"
-   xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/cat/1.0 ../../../-3/cat/1.0/cat.xsd">
-   <!--=====Catalogue description=====-->
-   <cat:name>
-      <gco:CharacterString>Codelists from the Metadata for Resource Identification (mri) Namespace</gco:CharacterString>
-   </cat:name>
-   <cat:scope>
-      <gco:CharacterString>Codelists from the Metadata for Resource Identification (mri) Namespace</gco:CharacterString>
-   </cat:scope>
-   <cat:fieldOfApplication>
-      <gco:CharacterString>ISO TC211 Metadata Standards</gco:CharacterString>
-   </cat:fieldOfApplication>
-   <cat:versionNumber>
-      <gco:CharacterString>0.1</gco:CharacterString>
-   </cat:versionNumber>
-   <cat:versionDate>
-      <gco:Date>2015-04-18</gco:Date>
-   </cat:versionDate>
-   <cat:locale>
-      <lan:PT_Locale>
-         <lan:language>
-            <lan:LanguageCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codelists.xml#LanguageCode" codeListValue="eng">eng</lan:LanguageCode>
-         </lan:language>
-         <lan:characterEncoding>
-            <lan:MD_CharacterSetCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codelists.xml#MD_CharacterSetCode"
-               codeListValue="UTF-8">UTF-8</lan:MD_CharacterSetCode>
-         </lan:characterEncoding>
-      </lan:PT_Locale>
-   </cat:locale>
-   <!--============================= Codelists =======================================-->
-   <!-- DS_AssociationTypeCode  -->
-   <cat:codelistItem>
-      <cat:CT_Codelist id="DS_AssociationTypeCode">
-         <cat:identifier>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >DS_AssociationTypeCode</gco:ScopedName>
-         </cat:identifier>
-         <cat:name>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >DS_AssociationTypeCode</gco:ScopedName>
-         </cat:name>
-         <cat:definition>
-            <gco:CharacterString>justification for the correlation of two
-               resources</gco:CharacterString>
-         </cat:definition>
-         <cat:description>
-            <gco:CharacterString>justification for the correlation of two
-               resources</gco:CharacterString>
-         </cat:description>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_AssociationTypeCode_crossReference">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_AssociationTypeCode_crossReference</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>reference from one resource to another</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_AssociationTypeCode_largerWorkCitation">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_AssociationTypeCode_largerWorkCitation</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>reference to a master resource of which this one is a
-                     part</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_AssociationTypeCode_partOfSeamlessDatabase">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_AssociationTypeCode_partOfSeamlessDatabase</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>part of same structured set of data held in a
-                     computer</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_AssociationTypeCode_stereoMate">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_AssociationTypeCode_stereoMate</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>part of a set of imagery that when used together, provides
-                     three-dimensional images</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_AssociationTypeCode_isComposedOf">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_AssociationTypeCode_isComposedOf</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>reference to resources that are parts of this
-                     resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_AssociationTypeCode_collectiveTitle">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_AssociationTypeCode_collectiveTitle</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>common title for a collection of resources. NOTE: title
-                     identifies elements of a series collectively, combined with information about
-                     what volumes are available at the source cite</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_AssociationTypeCode_series">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_AssociationTypeCode_series</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>associated through a common heritage such as produced to a
-                     common product specification</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_AssociationTypeCode_dependency">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_AssociationTypeCode_dependency</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>associated through a dependency</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_AssociationTypeCode_revisionOf">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_AssociationTypeCode_revisionOf</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>resource is a revision of associated
-                     resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-      </cat:CT_Codelist>
-   </cat:codelistItem>
-   <!-- DS_InitiativeTypeCode  -->
-   <cat:codelistItem>
-      <cat:CT_Codelist id="DS_InitiativeTypeCode">
-         <cat:identifier>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >DS_InitiativeTypeCode</gco:ScopedName>
-         </cat:identifier>
-         <cat:name>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >DS_InitiativeTypeCode</gco:ScopedName>
-         </cat:name>
-         <cat:definition>
-            <gco:CharacterString>type of aggregation activity in which resources are
-               related</gco:CharacterString>
-         </cat:definition>
-         <cat:description>
-            <gco:CharacterString>type of aggregation activity in which resources are
-               related</gco:CharacterString>
-         </cat:description>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_InitiativeTypeCode_campaign">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_InitiativeTypeCode_campaign</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>series of organized planned actions </gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_InitiativeTypeCode_collection">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_InitiativeTypeCode_collection</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>accumulation of resources assembled for a specific
-                     purpose</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_InitiativeTypeCode_exercise">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_InitiativeTypeCode_exercise</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>specific performance of a function or group of
-                     functions</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_InitiativeTypeCode_experiment">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_InitiativeTypeCode_experiment</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>process designed to find if something is effective or
-                     valid</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_InitiativeTypeCode_investigation">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_InitiativeTypeCode_investigation</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>search or systematic inquiry</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_InitiativeTypeCode_mission">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_InitiativeTypeCode_mission</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>specific operation of a data collection
-                     system</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_InitiativeTypeCode_sensor">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_InitiativeTypeCode_sensor</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>device or piece of equipment which detects or
-                     records</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_InitiativeTypeCode_operation">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_InitiativeTypeCode_operation</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>action that is part of a series of
-                     actions</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_InitiativeTypeCode_platform">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_InitiativeTypeCode_platform</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>vehicle or other support base that holds a
-                     sensor</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_InitiativeTypeCode_process">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_InitiativeTypeCode_process</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>method of doing something involving a number of
-                     steps</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_InitiativeTypeCode_program">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_InitiativeTypeCode_program</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>specific planned activity</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_InitiativeTypeCode_project">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_InitiativeTypeCode_project</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>organized undertaking, research, or
-                     development</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_InitiativeTypeCode_study">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_InitiativeTypeCode_study</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>examination or investigation </gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_InitiativeTypeCode_task">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_InitiativeTypeCode_task</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>piece of work</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="DS_InitiativeTypeCode_trial">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >DS_InitiativeTypeCode_trial</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>process of testing to discover or demonstrate
-                     something</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-      </cat:CT_Codelist>
-   </cat:codelistItem>
-   <!-- MD_KeywordTypeCode  -->
-   <cat:codelistItem>
-      <cat:CT_Codelist id="MD_KeywordTypeCode">
-         <cat:identifier>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >MD_KeywordTypeCode</gco:ScopedName>
-         </cat:identifier>
-         <cat:name>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >MD_KeywordTypeCode</gco:ScopedName>
-         </cat:name>
-         <cat:definition>
-            <gco:CharacterString>methods used to group similar keywords</gco:CharacterString>
-         </cat:definition>
-         <cat:description>
-            <gco:CharacterString>methods used to group similar keywords</gco:CharacterString>
-         </cat:description>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_KeywordTypeCode_discipline">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_KeywordTypeCode_discipline</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>keyword identifies a branch of instruction or specialized
-                     learning</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_KeywordTypeCode_place">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_KeywordTypeCode_place</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>keyword identifies a location</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_KeywordTypeCode_stratum">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_KeywordTypeCode_stratum</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>keyword identifies the layer(s) of any deposited substance or
-                     levels within an ordered system</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_KeywordTypeCode_temporal">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_KeywordTypeCode_temporal</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>keyword identifies a time period related to the
-                     resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_KeywordTypeCode_theme">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_KeywordTypeCode_theme</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>keyword identifies a particular subject or
-                     topic</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_KeywordTypeCode_dataCentre">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_KeywordTypeCode_dataCentre</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>keyword identifies a repository or archive that manages and
-                     distributes data</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_KeywordTypeCode_featureType">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_KeywordTypeCode_featureType</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>keyword identifies a resource containing or about a
-                     collection of feature instances with common
-                     characteristics</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_KeywordTypeCode_instrument">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_KeywordTypeCode_instrument</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>keyword identifies a device used to measure or compare
-                     physical properties</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_KeywordTypeCode_platform">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_KeywordTypeCode_platform</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>keyword identifies a structure upon which an instrument is
-                     mounted</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_KeywordTypeCode_process">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_KeywordTypeCode_process</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>keyword identifies a series of actions or natural occurrences
-                  </gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_KeywordTypeCode_project">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_KeywordTypeCode_project</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>keyword identifies an endeavour undertaken to create or
-                     modify a product or service</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_KeywordTypeCode_service">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_KeywordTypeCode_service</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>keyword identifies an activity carried out by one party for
-                     the benefit of another</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_KeywordTypeCode_product">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_KeywordTypeCode_product</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>keyword identifies a type of product</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_KeywordTypeCode_subTopicCategory">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_KeywordTypeCode_subTopicCategory</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>refinement of a topic category for the purpose of geographic
-                     data classification</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_KeywordTypeCode_taxon">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_KeywordTypeCode_taxon</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>keyword identifies a taxonomy of the
-                     resource</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-      </cat:CT_Codelist>
-   </cat:codelistItem>
-   <!-- MD_TopicCategoryCode  -->
-   <cat:codelistItem>
-      <cat:CT_Codelist id="MD_TopicCategoryCode">
-         <cat:identifier>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >MD_TopicCategoryCode</gco:ScopedName>
-         </cat:identifier>
-         <cat:name>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >MD_TopicCategoryCode</gco:ScopedName>
-         </cat:name>
-         <cat:definition>
-            <gco:CharacterString>high-level geographic data thematic classification to assist in the
-               grouping and search of available geographic data sets. Can be used to group keywords
-               as well. Listed examples are not exhaustive. NOTE: It is understood there are
-               overlaps between general categories and the user is encouraged to select the one most
-               appropriate.</gco:CharacterString>
-         </cat:definition>
-         <cat:description>
-            <gco:CharacterString>high-level geographic data thematic classification to assist in the
-               grouping and search of available geographic data sets. Can be used to group keywords
-               as well. Listed examples are not exhaustive. NOTE: It is understood there are
-               overlaps between general categories and the user is encouraged to select the one most
-               appropriate.</gco:CharacterString>
-         </cat:description>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_TopicCategoryCode_farming">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_TopicCategoryCode_farming</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>rearing of animals and/or cultivation of plants. Examples:
-                     agriculture, irrigation, aquaculture, plantations, herding, pests and diseases
-                     affecting crops and livestock</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_TopicCategoryCode_biota">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_TopicCategoryCode_biota</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>flora and/or fauna in natural environment. Examples:
-                     wildlife, vegetation, biological sciences, ecology, wilderness, sealife,
-                     wetlands, habitat</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_TopicCategoryCode_boundaries ">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_TopicCategoryCode_boundaries </gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>legal land descriptions, maritime boundaries. Examples:
-                     political and administrative boundaries, territorial seas, EEZ, port security
-                     zones</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_TopicCategoryCode_climatologyMeteorologyAtmosphere">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_TopicCategoryCode_climatologyMeteorologyAtmosphere</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>processes and phenomena of the atmosphere. Examples: cloud
-                     cover, weather, climate, atmospheric conditions, climate change,
-                     precipitation</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_TopicCategoryCode_economy">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_TopicCategoryCode_economy</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>economic activities, conditions and employment. Examples:
-                     production, labour, revenue, commerce, industry, tourism and ecotourism,
-                     forestry, fisheries, commercial or subsistence hunting, exploration and
-                     exploitation of resources such as minerals, oil and gas </gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_TopicCategoryCode_elevation">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_TopicCategoryCode_elevation</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>height above or below a vertical datum. Examples: altitude,
-                     bathymetry, digital elevation models, slope, derived
-                     products</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_TopicCategoryCode_environment">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_TopicCategoryCode_environment</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>environmental resources, protection and conservation.
-                     Examples: environmental pollution, waste storage and treatment, environmental
-                     impact assessment, monitoring environmental risk, nature reserves,
-                     landscape</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_TopicCategoryCode_geoscientificInformation">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_TopicCategoryCode_geoscientificInformation</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>information pertaining to earth sciences. Examples:
-                     geophysical features and processes, geology, minerals, sciences dealing with
-                     the composition, structure and origin of the earth's rocks, risks of
-                     earthquakes, volcanic activity, landslides, gravity information, soils,
-                     permafrost, hydrogeology, erosion</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_TopicCategoryCode_health">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_TopicCategoryCode_health</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>health, health services, human ecology, and safety. Examples:
-                     disease and illness, factors affecting health, hygiene, substance abuse, mental
-                     and physical health, health services</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_TopicCategoryCode_imageryBaseMapsEarthCover">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_TopicCategoryCode_imageryBaseMapsEarthCover</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>base maps. Examples: land cover, topographic maps, imagery,
-                     unclassified images, annotations</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_TopicCategoryCode_intelligenceMilitary ">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_TopicCategoryCode_intelligenceMilitary </gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>military bases, structures, activities. Examples: barracks,
-                     training grounds, military transportation, information
-                     collection</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_TopicCategoryCode_inlandWaters">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_TopicCategoryCode_inlandWaters</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>inland water features, drainage systems and their
-                     characteristics. Examples: rivers and glaciers, salt lakes, water utilization
-                     plans, dams, currents, floods, water quality, hydrologic
-                     information</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_TopicCategoryCode_location">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_TopicCategoryCode_location</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>positional information and services. Examples: addresses,
-                     geodetic networks, control points, postal zones and services, place
-                     names</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_TopicCategoryCode_oceans">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_TopicCategoryCode_oceans</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>features and characteristics of salt water bodies (excluding
-                     inland waters) Examples: tides, tsunamis, coastal information,
-                     reefs</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_TopicCategoryCode_planningCadastre">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_TopicCategoryCode_planningCadastre</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>information used for appropriate actions for future use of
-                     the land. Examples: land use maps, zoning maps, cadastral surveys, land
-                     ownership</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_TopicCategoryCode_society">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_TopicCategoryCode_society</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>characteristics of society and cultures. Examples:
-                     settlements, anthropology, archaeology, education, traditional beliefs, manners
-                     and customs, demographic data, recreational areas and activities, social impact
-                     assessments, crime and justice, census information</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_TopicCategoryCode_structure">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_TopicCategoryCode_structure</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>man-made construction. Examples: buildings, museums,
-                     churches, factories, housing, monuments, shops, towers</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_TopicCategoryCode_transportation">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_TopicCategoryCode_transportation</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>means and aids for conveying persons and/or goods. Examples:
-                     roads, airports/airstrips, shipping routes, tunnels, nautical charts, vehicle
-                     or vessel location, aeronautical charts, railways</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_TopicCategoryCode_utilitiesCommunication">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_TopicCategoryCode_utilitiesCommunication</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>energy, water and waste systems and communications
-                     infrastructure and services. Examples: hydroelectricity, geothermal, solar and
-                     nuclear sources of energy, water purification and distribution, sewage
-                     collection and disposal, electricity and gas distribution, data communication,
-                     telecommunication, radio, communication networks</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_TopicCategoryCode_extraTerrestrial">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_TopicCategoryCode_extraTerrestrial</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>region more than 100 km above the surface of the
-                     Earth</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_TopicCategoryCode_disaster">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_TopicCategoryCode_disaster</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>Information related to disasters. Examples: site of the
-                     disaster, evacuation zone, disaster-prevention facility, disaster relief
-                     activities</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-      </cat:CT_Codelist>
-   </cat:codelistItem>
-   <!--=== EOF ===-->
-</cat:CT_CodelistCatalogue>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/identification.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/identification.xsd
deleted file mode 100644
index 489257bad..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/identification.xsd
+++ /dev/null
@@ -1,517 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" 
-  xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" 
-  xmlns:gmw="http://standards.iso.org/iso/19115/-3/gmw/1.0"
-  xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" 
-  xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" 
-  xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mri/1.0" version="1.0">
-<!--  <include schemaLocation="mri.xsd"/>-->
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gmw/1.0" schemaLocation="../../../../19115/-3/gmw/1.0/gmw.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/lan/1.0" schemaLocation="../../../../19115/-3/lan/1.0/lan.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="DS_AssociationTypeCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>justification for the correlation of two resources</documentation>
-    </annotation>
-  </element>
-  <complexType name="DS_AssociationTypeCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mri:DS_AssociationTypeCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="DS_InitiativeTypeCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>type of aggregation activity in which resources are related</documentation>
-    </annotation>
-  </element>
-  <complexType name="DS_InitiativeTypeCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mri:DS_InitiativeTypeCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_AssociatedResource" substitutionGroup="gco:AbstractObject" type="mri:MD_AssociatedResource_Type">
-    <annotation>
-      <documentation>associated resource information NOTE: An associated resource is a dataset composed of a collection of datasets</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_AssociatedResource_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element minOccurs="0" name="name" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>citation information about the associated resource</documentation>
-            </annotation>
-          </element>
-          <element name="associationType" type="mri:DS_AssociationTypeCode_PropertyType">
-            <annotation>
-              <documentation>type of relation between the resources</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="initiativeType" type="mri:DS_InitiativeTypeCode_PropertyType">
-            <annotation>
-              <documentation>type of initiative under which the associated resource was produced NOTE: the activity that resulted in the associated resource</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="metadataReference" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>reference to the metadata of the associated resource</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_AssociatedResource_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mri:MD_AssociatedResource"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_DataIdentification" substitutionGroup="mri:AbstractMD_Identification" type="mri:MD_DataIdentification_Type">
-    <annotation>
-      <documentation>information required to identify a resource</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_DataIdentification_Type">
-    <complexContent>
-      <extension base="mri:AbstractMD_Identification_Type">
-        <sequence>
-          <element minOccurs="0" name="defaultLocale" type="lan:PT_Locale_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="otherLocale" type="lan:PT_Locale_PropertyType"/>
-          <element minOccurs="0" name="environmentDescription" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>description of the resource in the producer's processing environment, including items such as the software, the computer operating system, file name, and the dataset size</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="supplementalInformation" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>any other descriptive information about the resource</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_DataIdentification_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mri:MD_DataIdentification"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="AbstractMD_Identification" substitutionGroup="mcc:Abstract_ResourceDescription" type="mri:AbstractMD_Identification_Type">
-    <annotation>
-      <documentation>basic information required to uniquely identify a resource or resources</documentation>
-    </annotation>
-  </element>
-  <complexType abstract="true" name="AbstractMD_Identification_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_ResourceDescription_Type">
-        <sequence>
-          <element name="citation" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>citation for the resource(s)</documentation>
-            </annotation>
-          </element>
-          <element name="abstract" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>brief narrative summary of the content of the resource(s)</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="purpose" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>summary of the intentions with which the resource(s) was developed</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="credit" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>recognition of those who contributed to the resource(s)</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="status" type="mcc:MD_ProgressCode_PropertyType">
-            <annotation>
-              <documentation>status of the resource(s)</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="pointOfContact" type="mcc:Abstract_Responsibility_PropertyType">
-            <annotation>
-              <documentation>identification of, and means of communication with, person(s) and organisation(s) associated with the resource(s)</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="spatialRepresentationType" type="mcc:MD_SpatialRepresentationTypeCode_PropertyType">
-            <annotation>
-              <documentation>method used to spatially represent geographic information</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="spatialResolution" type="mri:MD_Resolution_PropertyType">
-            <annotation>
-              <documentation>factor which provides a general understanding of the density of spatial data in the resource</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="temporalResolution" type="gco:TM_PeriodDuration_PropertyType">
-            <annotation>
-              <documentation>resolution of the resource with respect to time</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="topicCategory" type="mri:MD_TopicCategoryCode_PropertyType">
-            <annotation>
-              <documentation>main theme(s) of the resource</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="extent" type="mcc:Abstract_Extent_PropertyType">
-            <annotation>
-              <documentation>spatial and temporal extent of the resource</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="additionalDocumentation" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>other documentation associated with the resource</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="processingLevel" type="mcc:MD_Identifier_PropertyType">
-            <annotation>
-              <documentation>code that identifies the level of processing in the producers coding system of a resource eg. NOAA level 1B</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="resourceMaintenance" type="mcc:Abstract_MaintenanceInformation_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="graphicOverview" type="mcc:MD_BrowseGraphic_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="resourceFormat" type="mcc:Abstract_Format_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="descriptiveKeywords" type="mri:MD_Keywords_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="resourceSpecificUsage" type="mri:MD_Usage_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="resourceConstraints" type="mcc:Abstract_Constraints_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="associatedResource" type="mri:MD_AssociatedResource_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="AbstractMD_Identification_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mri:AbstractMD_Identification"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_KeywordClass" substitutionGroup="gco:AbstractObject" type="mri:MD_KeywordClass_Type">
-    <annotation>
-      <documentation>specification of a class to categorize keywords in a domain-specific vocabulary that has a binding to a formal ontology</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_KeywordClass_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="className" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>character string to label the keyword category in natural language</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="conceptIdentifier" type="mcc:URI_PropertyType">
-            <annotation>
-              <documentation>URI of concept in ontology specified by the ontology attribute; this concept is labeled by the className: CharacterString.</documentation>
-            </annotation>
-          </element>
-          <element name="ontology" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>a reference that binds the keyword class to a formal conceptualization of a knowledge domain for use in semantic processingNOTE: Keywords in the associated MD_Keywords keyword list must be within the scope of this ontology</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_KeywordClass_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mri:MD_KeywordClass"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_KeywordTypeCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>methods used to group similar keywords</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_KeywordTypeCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mri:MD_KeywordTypeCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_Keywords" substitutionGroup="gco:AbstractObject" type="mri:MD_Keywords_Type">
-    <annotation>
-      <documentation>keywords, their type and reference source NOTE: When the resource described is a service, one instance of MD_Keyword shall refer to the service taxonomy defined in ISO 19119, 8.3)</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_Keywords_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element maxOccurs="unbounded" name="keyword" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>commonly used word(s) or formalised word(s) or phrase(s) used to describe the subject</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="type" type="mri:MD_KeywordTypeCode_PropertyType">
-            <annotation>
-              <documentation>subject matter used to group similar keywords</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="thesaurusName" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>name of the formally registered thesaurus or a similar authoritative source of keywords</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="keywordClass" type="mri:MD_KeywordClass_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_Keywords_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mri:MD_Keywords"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_RepresentativeFraction" substitutionGroup="gco:AbstractObject" type="mri:MD_RepresentativeFraction_Type">
-    <annotation>
-      <documentation>derived from ISO 19103 Scale where MD_RepresentativeFraction.denominator = 1 / Scale.measure And Scale.targetUnits = Scale.sourceUnits</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_RepresentativeFraction_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="denominator" type="gco:Integer_PropertyType">
-            <annotation>
-              <documentation>the number below the line in a vulgar fraction</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_RepresentativeFraction_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mri:MD_RepresentativeFraction"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_Resolution" substitutionGroup="mcc:Abstract_SpatialResolution" type="mri:MD_Resolution_Type">
-    <annotation>
-      <documentation>level of detail expressed as a scale factor, a distance or an angle</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_Resolution_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_SpatialResolution_Type">
-        <choice>
-          <element name="equivalentScale" type="mri:MD_RepresentativeFraction_PropertyType">
-            <annotation>
-              <documentation>level of detail expressed as the scale of a comparable hardcopy map or chart</documentation>
-            </annotation>
-          </element>
-          <element name="distance" type="gco:Distance_PropertyType">
-            <annotation>
-              <documentation>horizontal ground sample distance</documentation>
-            </annotation>
-          </element>
-          <element name="vertical" type="gco:Distance_PropertyType">
-            <annotation>
-              <documentation>Vertical sampling distance</documentation>
-            </annotation>
-          </element>
-          <element name="angularDistance" type="gco:Angle_PropertyType">
-            <annotation>
-              <documentation>Angular sampling measure</documentation>
-            </annotation>
-          </element>
-          <element name="levelOfDetail" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>brief textual description of the spatial resolution of the resource</documentation>
-            </annotation>
-          </element>
-        </choice>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_Resolution_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mri:MD_Resolution"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_TopicCategoryCode" substitutionGroup="gco:CharacterString" type="mri:MD_TopicCategoryCode_Type">
-    <annotation>
-      <documentation>high-level geographic data thematic classification to assist in the grouping and search of available geographic data sets. Can be used to group keywords as well. Listed examples are not exhaustive. NOTE: It is understood there are overlaps between general categories and the user is encouraged to select the one most appropriate.</documentation>
-    </annotation>
-  </element>
-  <simpleType name="MD_TopicCategoryCode_Type">
-    <annotation>
-      <documentation>high-level geographic data thematic classification to assist in the grouping and search of available geographic data sets. Can be used to group keywords as well. Listed examples are not exhaustive. NOTE: It is understood there are overlaps between general categories and the user is encouraged to select the one most appropriate.</documentation>
-    </annotation>
-    <restriction base="string">
-      <enumeration value="farming">
-        <annotation>
-          <documentation>rearing of animals and/or cultivation of plantsExamples: agriculture, irrigation, aquaculture, plantations, herding, pests and diseases affecting crops and livestock</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="biota">
-        <annotation>
-          <documentation>flora and/or fauna in natural environment Examples: wildlife, vegetation, biological sciences, ecology, wilderness, sealife, wetlands, habitat</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="boundaries">
-        <annotation>
-          <documentation>legal land descriptions Examples: political and administrative boundaries</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="climatologyMeteorologyAtmosphere">
-        <annotation>
-          <documentation>processes and phenomena of the atmosphere Examples: cloud cover, weather, climate, atmospheric conditions, climate change, precipitation</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="economy">
-        <annotation>
-          <documentation>economic activities, conditions and employment Examples: production, labour, revenue, commerce, industry, tourism and ecotourism, forestry, fisheries, commercial or subsistence hunting, exploration and exploitation of resources such as minerals, oil and gas</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="elevation">
-        <annotation>
-          <documentation>height above or below a vertical datumExamples: altitude, bathymetry, digital elevation models, slope, derived products</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="environment">
-        <annotation>
-          <documentation>environmental resources, protection and conservation Examples: environmental pollution, waste storage and treatment, environmental impact assessment, monitoring environmental risk, nature reserves, landscape</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="geoscientificInformation">
-        <annotation>
-          <documentation>information pertaining to earth sciences Examples: geophysical features and processes, geology, minerals, sciences dealing with the composition, structure and origin of the earth's rocks, risks of earthquakes, volcanic activity, landslides, gravity information, soils, permafrost, hydrogeology, erosion</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="health">
-        <annotation>
-          <documentation>health, health services, human ecology, and safety Examples: disease and illness, factors affecting health, hygiene, substance abuse, mental and physical health, health services</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="imageryBaseMapsEarthCover">
-        <annotation>
-          <documentation>base maps Examples: land cover, topographic maps, imagery, unclassified images, annotations</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="intelligenceMilitary">
-        <annotation>
-          <documentation>military bases, structures, activities Examples: barracks, training grounds, military transportation, information collection</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="inlandWaters">
-        <annotation>
-          <documentation>inland water features, drainage systems and their characteristics Examples: rivers and glaciers, salt lakes, water utilization plans, dams, currents, floods, water quality, hydrographic charts</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="location">
-        <annotation>
-          <documentation>positional information and services Examples: addresses, geodetic networks, control points, postal zones and services, place names</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="oceans">
-        <annotation>
-          <documentation>features and characteristics of salt water bodies (excluding inland waters) Examples: tides, tidal waves, coastal information, reefs</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="planningCadastre">
-        <annotation>
-          <documentation>information used for appropriate actions for future use of the land Examples: land use maps, zoning maps, cadastral surveys, land ownership</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="society">
-        <annotation>
-          <documentation>characteristics of society and cultures Examples: settlements, anthropology, archaeology, education, traditional beliefs, manners and customs, demographic data, recreational areas and activities, social impact assessments, crime and justice, census information</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="structure">
-        <annotation>
-          <documentation>man-made construction Examples: buildings, museums, churches, factories, housing, monuments, shops, towers</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="transportation">
-        <annotation>
-          <documentation>means and aids for conveying persons and/or goods Examples: roads, airports/airstrips, shipping routes, tunnels, nautical charts, vehicle or vessel location, aeronautical charts, railways</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="utilitiesCommunication">
-        <annotation>
-          <documentation>energy, water and waste systems and communications infrastructure and servicesExamples: hydroelectricity, geothermal, solar and nuclear sources of energy, water purification and distribution, sewage collection and disposal, electricity and gas distribution, data communication, telecommunication, radio, communication networks</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="extraTerrestrial">
-        <annotation>
-          <documentation>region more than 100 km above the surface of the Earth</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="disaster"/>
-    </restriction>
-  </simpleType>
-  <complexType name="MD_TopicCategoryCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mri:MD_TopicCategoryCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_Usage" substitutionGroup="gco:AbstractObject" type="mri:MD_Usage_Type">
-    <annotation>
-      <documentation>brief description of ways in which the resource(s) is/are currently or has been used</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_Usage_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="specificUsage" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>brief description of the resource and/or resource series usage</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="usageDateTime" type="gmw:TM_Primitive_PropertyType">
-            <annotation>
-              <documentation>date and time of the first use or range of uses of the resource and/or resource series</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="userDeterminedLimitations" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>applications, determined by the user for which the resource and/or resource series is not suitable</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="userContactInfo" type="mcc:Abstract_Responsibility_PropertyType">
-            <annotation>
-              <documentation>identification of and means of communicating with person(s) and organisation(s) using the resource(s)</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="response" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>response to the user-determined limitationsE.G.. 'this has been fixed in version x'</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="additionalDocumentation" type="mcc:Abstract_Citation_PropertyType"/>
-          <element minOccurs="0" name="identifiedIssues" type="mcc:Abstract_Citation_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_Usage_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mri:MD_Usage"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/index.html
deleted file mode 100644
index 2ffa730e8..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/index.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Metadata for Resource Identification (MRI) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Metadata for Resource Identification (MRI) Version: 1.0</h1><img src="mri.png"><h2>Description</h2>
-      <p>MRI 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.3.  It includes elements for identifying resources. The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>Sample XML files for mri 1.0</h2><a href="mri_invalid.xml">mri_invalid.xml</a> <a href="mri_valid.xml">mri_valid.xml</a> 
-      <h2>CodeLists for mri 1.0</h2><a href="codelists.html">codelists.html</a> <a href="codelists.xml">codelists.xml</a> 
-      <h2>XML Namespace for mri 1.0</h2>
-      <p>The namespace URI for mri 1.0 is <b>http://standards.iso.org/iso/19115/-3/mri/1.0</b>.
-      </p>
-      <h2>XML Schema for mri 1.0</h2>
-      <p><b><a href="mri.xsd">mri.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the mri 1.0 namespace or by XML Schema documents importing the mri 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the mri namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for mri 1.0 are available <a href="mri.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for mri 1.0</h2>
-      <p><b><a href="identification.xsd">identification.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.3. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): <b>DS_AssociationTypeCode</b>, <b>DS_InitiativeTypeCode</b>, MD_AssociatedResource, MD_DataIdentification, AbstractMD_Identification, MD_KeywordClass, <b>MD_KeywordTypeCode</b>, MD_Keywords, MD_RepresentativeFraction, MD_Resolution, <b>MD_TopicCategoryCode</b>, and MD_Usage
-      </p>
-      <h2>Related XML Namespaces for mri 1.0</h2> The mri 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Geographic COmmon</td>
-            <td>gco</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gco/1.0">http://standards.iso.org/iso/19115/-3/gco/1.0</a></td>
-            <td>../../../../19115/-3/gco/1.0/gco.xsd</td>
-         </tr>
-         <tr>
-            <td>Geographic Markup Wrappers</td>
-            <td>gmw</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gmw/1.0">http://standards.iso.org/iso/19115/-3/gmw/1.0</a></td>
-            <td>../../../../19115/-3/gmw/1.0/gmw.xsd</td>
-         </tr>
-         <tr>
-            <td>Language localization</td>
-            <td>lan</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/lan/1.0">http://standards.iso.org/iso/19115/-3/lan/1.0</a></td>
-            <td>../../../../19115/-3/lan/1.0/lan.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata Common Classes</td>
-            <td>mcc</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mcc/1.0">http://standards.iso.org/iso/19115/-3/mcc/1.0</a></td>
-            <td>../../../../19115/-3/mcc/1.0/mcc.xsd</td>
-         </tr>
-      </table>
-      <h2>Schematron Validation Rules for mri 1.0</h2> Schematron rules for validating instance documents of the mri 1.0 namespace are in <a href="mri.sch">mri.sch</a>. Other schematron rule sets that are
-      required for a complete validation are: gco.sch, gmw.sch, lan.sch, mcc.sch, lan.sch, and mcc.sch
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/mri.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/mri.png
deleted file mode 100644
index 41797ba48..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/mri.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/mri.sch b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/mri.sch
deleted file mode 100644
index 2b0f0d908..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/mri.sch
+++ /dev/null
@@ -1,337 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron">
-  <sch:ns prefix="cit" uri="http://standards.iso.org/iso/19115/-3/cit/1.0"/>
-  <sch:ns prefix="mri" uri="http://standards.iso.org/iso/19115/-3/mri/1.0"/>
-  <sch:ns prefix="srv" uri="http://standards.iso.org/iso/19115/-3/srv/2.0"/>
-  <sch:ns prefix="mdb" uri="http://standards.iso.org/iso/19115/-3/mdb/1.0"/>
-  <sch:ns prefix="gex" uri="http://standards.iso.org/iso/19115/-3/gex/1.0"/>
-  <sch:ns prefix="mcc" uri="http://standards.iso.org/iso/19115/-3/mcc/1.0"/>
-  <sch:ns prefix="mrc" uri="http://standards.iso.org/iso/19115/-3/mrc/1.0"/>
-  <sch:ns prefix="lan" uri="http://standards.iso.org/iso/19115/-3/lan/1.0"/>
-  <sch:ns prefix="gco" uri="http://standards.iso.org/iso/19115/-3/gco/1.0"/>
-  <!--
-    ISO 19115-3 base requirements for metadata instance documents
-    
-    See ISO19115-1:2014(E) page 11, Figure 6
-  -->
-  
-  <!-- 
-    Rule: MD_Identification
-    Ref: {(MD_Metadata.metadataScope.MD_MetadataScope.resourceScope)=’dataset’
-    implies count(
-    extent.geographicElement.EX_GeographicBoundingBox +
-    extent.geographicElement.EX_GeographicDescription) >= 1}
-    -->
-  
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.mri.datasetextent-failure-en"
-      xml:lang="en">The dataset MUST provide a 
-      geographic description or a bounding box.</sch:diagnostic>
-    <sch:diagnostic id="rule.mri.datasetextent-failure-fr"
-      xml:lang="fr">Le jeu de données DOIT être décrit par
-      une description géographique ou une emprise.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.mri.datasetextentdesc-success-en"
-      xml:lang="en">The dataset geographic description is:
-      "<sch:value-of select="normalize-space($geodescription)"/>".</sch:diagnostic>
-    <sch:diagnostic id="rule.mri.datasetextentdesc-success-fr"
-      xml:lang="fr">La description géographique du jeu de données est
-      "<sch:value-of select="normalize-space($geodescription)"/>".</sch:diagnostic>
-    
-    
-    <sch:diagnostic id="rule.mri.datasetextentbox-success-en"
-      xml:lang="en">The dataset geographic bounding box is:
-      [W:<sch:value-of select="$geobox/gex:westBoundLongitude/*/text()"/>,
-      S:<sch:value-of select="$geobox/gex:southBoundLatitude/*/text()"/>],
-      [E:<sch:value-of select="$geobox/gex:eastBoundLongitude/*/text()"/>,
-      N:<sch:value-of select="$geobox/gex:northBoundLatitude/*/text()"/>],
-      .</sch:diagnostic>
-    <sch:diagnostic id="rule.mri.datasetextentbox-success-fr"
-      xml:lang="fr">L'emprise géographique du jeu de données est
-      [W:<sch:value-of select="$geobox/gex:westBoundLongitude/*/text()"/>,
-      S:<sch:value-of select="$geobox/gex:southBoundLatitude/*/text()"/>],
-      [E:<sch:value-of select="$geobox/gex:eastBoundLongitude/*/text()"/>,
-      N:<sch:value-of select="$geobox/gex:northBoundLatitude/*/text()"/>]
-      .</sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.mri.datasetextent">
-    <sch:title xml:lang="en">Dataset extent</sch:title>
-    <sch:title xml:lang="fr">Emprise du jeu de données</sch:title>
-    
-    <sch:rule context="/mdb:MD_Metadata[mdb:metadataScope/
-                          mdb:MD_MetadataScope/mdb:resourceScope/
-                          mcc:MD_ScopeCode/@codeListValue = 'dataset']/
-                          mdb:identificationInfo/mri:MD_DataIdentification">
-      
-      
-      <sch:let name="geodescription" 
-        value="mri:extent/gex:EX_Extent/gex:geographicElement/
-                  gex:EX_GeographicDescription/gex:geographicIdentifier[
-                  normalize-space(mcc:MD_Identifier/mcc:code/*/text()) != ''
-                  ]"/>
-      <sch:let name="geobox" 
-        value="mri:extent/gex:EX_Extent/gex:geographicElement/
-                  gex:EX_GeographicBoundingBox[
-                  normalize-space(gex:westBoundLongitude/gco:Decimal) != '' and
-                  normalize-space(gex:eastBoundLongitude/gco:Decimal) != '' and
-                  normalize-space(gex:southBoundLatitude/gco:Decimal) != '' and
-                  normalize-space(gex:northBoundLatitude/gco:Decimal) != ''
-                  ]"/>
-
-      <sch:let name="hasGeoextent" 
-               value="count($geodescription) + count($geobox) > 0"/>
-      
-      
-      <sch:assert test="$hasGeoextent"
-        diagnostics="rule.mri.datasetextent-failure-en 
-                     rule.mri.datasetextent-failure-fr"/>
-      
-      <!-- TODO: Improve reporting when having multiple elements -->
-      <sch:report test="count($geodescription) > 0"
-        diagnostics="rule.mri.datasetextentdesc-success-en 
-                     rule.mri.datasetextentdesc-success-fr"/>
-      <sch:report test="count($geobox) > 0"
-        diagnostics="rule.mri.datasetextentbox-success-en 
-                     rule.mri.datasetextentbox-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
-  
-  
-  <!--
-    Ref: {(MD_Metadata.metadataScope.MD_Scope.resourceScope) = 
-            (’dataset’ or ‘series’)
-          implies topicCategory is mandatory}
-    -->
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.mri.topicategoryfordsandseries-failure-en"
-      xml:lang="en">A topic category MUST be specified for 
-      dataset or series.</sch:diagnostic>
-    <sch:diagnostic id="rule.mri.topicategoryfordsandseries-failure-fr"
-      xml:lang="fr">Un thème principal (ISO) DOIT être défini quand
-      la ressource est un jeu de donnée ou une série.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.mri.topicategoryfordsandseries-success-en"
-      xml:lang="en">Number of topic category identified: 
-      <sch:value-of select="count($topics)"/>.</sch:diagnostic>
-    <sch:diagnostic id="rule.mri.topicategoryfordsandseries-success-fr"
-      xml:lang="fr">Nombre de thèmes : 
-      <sch:value-of select="count($topics)"/>.</sch:diagnostic>
-  </sch:diagnostics>
-  
-  
-  <sch:pattern id="rule.mri.topicategoryfordsandseries">
-    <sch:title xml:lang="en">Topic category for dataset and series</sch:title>
-    <sch:title xml:lang="fr">Thème principal d'un jeu de données ou d'une série</sch:title>
-    
-    <sch:rule context="/mdb:MD_Metadata[mdb:metadataScope/
-                         mdb:MD_MetadataScope/mdb:resourceScope/
-                         mcc:MD_ScopeCode/@codeListValue = 'dataset' or 
-                         mdb:metadataScope/
-                         mdb:MD_MetadataScope/mdb:resourceScope/
-                         mcc:MD_ScopeCode/@codeListValue = 'series']/
-                         mdb:identificationInfo/mri:MD_DataIdentification">
-      
-      <!-- The topic category is the enumeration value and
-      not the human readable one. -->
-      <sch:let name="topics" 
-               value="mri:topicCategory/mri:MD_TopicCategoryCode"/>
-      <sch:let name="hasTopics"
-               value="count($topics) > 0"/>
-      
-      <sch:assert test="$hasTopics"
-        diagnostics="rule.mri.topicategoryfordsandseries-failure-en 
-                     rule.mri.topicategoryfordsandseries-failure-fr"/>
-      
-      <sch:report test="$hasTopics"
-        diagnostics="rule.mri.topicategoryfordsandseries-success-en 
-                     rule.mri.topicategoryfordsandseries-success-fr"/>
-      
-    </sch:rule>
-  </sch:pattern>
-
-
-  <!--
-    Rule: MD_AssociatedResource
-    Ref: {count(name + metadataReference) > 0}
-    -->
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.mri.associatedresource-failure-en"
-      xml:lang="en">When a resource is associated, a name or a metadata
-      reference MUST be specified.</sch:diagnostic>
-    <sch:diagnostic id="rule.mri.associatedresource-failure-fr"
-      xml:lang="fr">Lorsqu'une resource est associée, un nom ou une 
-      référence à une fiche DOIT être défini.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.mri.associatedresource-success-en"
-      xml:lang="en">The resource "<sch:value-of select="$resourceRef"/>"
-      is associated.</sch:diagnostic>
-    <sch:diagnostic id="rule.mri.associatedresource-success-fr"
-      xml:lang="fr">La ressource "<sch:value-of select="$resourceRef"/>" 
-      est associée.</sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.mri.associatedresource">
-    <sch:title xml:lang="en">Associated resource name</sch:title>
-    <sch:title xml:lang="fr">Nom ou référence à une ressource associée</sch:title>
-    
-    <sch:rule context="//mri:MD_DataIdentification/mri:associatedResource/*|
-                       //srv:SV_ServiceIdentification/mri:associatedResource/*">
-      
-      <!-- May be a CharacterString or LocalisedCharacterString -->
-      <sch:let name="nameTitle" 
-               value="normalize-space(mri:name/*/cit:title)"/>
-      <sch:let name="nameRef" 
-               value="mri:name/@uuidref"/>
-      <sch:let name="mdRefTitle" 
-               value="normalize-space(mri:metadataReference/*/cit:title)"/>
-      <sch:let name="mdRefRef" 
-               value="mri:metadataReference/@uuidref"/>
-      
-      <sch:let name="hasName" value="$nameTitle != '' or $nameRef != ''"/>
-      <sch:let name="hasMdRef" value="$mdRefTitle != '' or $mdRefRef != ''"/>
-      
-      <!-- Concat ref assuming there is not both name and metadataReference -->
-      <sch:let name="resourceRef" 
-               value="concat($nameTitle, $nameRef, 
-                             $mdRefRef, $mdRefTitle)"/>
-    
-      <sch:assert test="$hasName or $hasMdRef"
-         diagnostics="rule.mri.associatedresource-failure-en 
-                      rule.mri.associatedresource-failure-fr"/>
-      
-      <sch:report test="$hasName or $hasMdRef"
-        diagnostics="rule.mri.associatedresource-success-en 
-                     rule.mri.associatedresource-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
-  
-  
-  
-  <!--    
-    Rule: MD_DataIdentification
-    Ref: {defaultLocale documented if resource includes textual information}
-    -->
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.mri.defaultlocalewhenhastext-failure-en"
-      xml:lang="en">Resource language MUST be defined when the resource
-      includes textual information.</sch:diagnostic>
-    <sch:diagnostic id="rule.mri.defaultlocalewhenhastext-failure-fr"
-      xml:lang="fr">La langue de la resource DOIT être renseignée
-      lorsque la ressource contient des informations textuelles.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.mri.defaultlocalewhenhastext-success-en"
-      xml:lang="en">Number of resource language: 
-      <sch:value-of select="count($resourceLanguages)"/>.</sch:diagnostic>
-    <sch:diagnostic id="rule.mri.defaultlocalewhenhastext-success-fr"
-      xml:lang="fr">Nombre de langues de la ressource :
-      <sch:value-of select="count($resourceLanguages)"/>.</sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.mri.defaultlocalewhenhastext">
-    <sch:title xml:lang="en">Resource language</sch:title>
-    <sch:title xml:lang="fr">Langue de la ressource</sch:title>
-    
-    <!-- 
-    QUESTION-TODO: "includes textual information" may not be easy to define.
-    Imagery will not. Could we consider that this rule applies to 
-    a resource having a feature catalog ? For services ?
-    
-    Here the context define that the rule applies to DataIdentification
-    having FeatureCatalog siblings.
-    -->
-    <sch:rule context="//mri:MD_DataIdentification[
-      ../../mdb:contentInfo/mrc:MD_FeatureCatalogue or
-      ../../mdb:contentInfo/mrc:MD_FeatureCatalogueDescription]">
-      
-      <sch:let name="resourceLanguages" 
-        value="mri:defaultLocale/lan:PT_Locale/
-                lan:language/lan:LanguageCode/@codeListValue[. != '']"/>
-      <sch:let name="hasAtLeastOneLanguage" 
-        value="count($resourceLanguages) > 0"/>
-      
-      <sch:assert test="$hasAtLeastOneLanguage"
-        diagnostics="rule.mri.defaultlocalewhenhastext-failure-en 
-        rule.mri.defaultlocalewhenhastext-failure-fr"/>
-      
-      <sch:report test="$hasAtLeastOneLanguage"
-        diagnostics="rule.mri.defaultlocalewhenhastext-success-en 
-        rule.mri.defaultlocalewhenhastext-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
-  
-  
-  
-  <!--
-    Ref: {defaultLocale.PT_Locale.characterEncoding default value is UTF-8}
-    
-    See Implemented in rule.mdb.defaultlocale.
-    
-    TODO: A better implementation would have been to make an Abstract
-    test and use it in both places to not mix mdb and mri testsuites.
-    -->
-  
-  
-  
-  <!--
-    Rule: MD_Keywords
-    Ref: {When the resource described is a service, 
-    one instance of MD_Keyword shall refer to the service taxonomy 
-    defined in ISO19119}
-    
-    QUESTION-TODO: This rules defined should move to srv.sch ?
-  -->
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.mri.servicetaxonomy-failure-en"
-      xml:lang="en">A service metadata SHALL refer to the service
-      taxonomy defined in ISO19119 defining one or more value in the
-      keyword section.</sch:diagnostic>
-    <sch:diagnostic id="rule.mri.servicetaxonomy-failure-fr"
-      xml:lang="fr">Une métadonnée de service DEVRAIT référencer
-      un type de service tel que défini dans l'ISO19119 dans la
-      section mot clé.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.mri.servicetaxonomy-success-en"
-      xml:lang="en">Number of service taxonomy specified: 
-      <sch:value-of select="count($serviceTaxonomies)"/>.</sch:diagnostic>
-    <sch:diagnostic id="rule.mri.servicetaxonomy-success-fr"
-      xml:lang="fr">Nombre de types de service :
-      <sch:value-of select="count($serviceTaxonomies)"/>.</sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.srv.servicetaxonomy">
-    <sch:title xml:lang="en">Service taxonomy</sch:title>
-    <sch:title xml:lang="fr">Taxonomie des services</sch:title>
-    
-    <!-- 
-    QUESTION-TODO: Is this the list to check against ?
-      The list is not multilingual ?
-    -->
-    <sch:rule context="//srv:SV_ServiceIdentification">
-      <sch:let name="listOfTaxonomy" 
-               value="'Geographic human interaction services, 
-                       Geographic model/information management services, 
-                       Geographic workflow/task management services, 
-                       Geographic processing services, 
-                       Geographic processing services — spatial,
-                       Geographic processing services — thematic,
-                       Geographic processing services — temporal, 
-                       Geographic processing services — metadata, 
-                       Geographic communication services'"/>
-      <sch:let name="serviceTaxonomies" 
-        value="mri:descriptiveKeywords/mri:MD_Keywords/mri:keyword[
-        contains($listOfTaxonomy, */text())]"/>
-      <sch:let name="hasAtLeastOneTaxonomy" 
-        value="count($serviceTaxonomies) > 0"/>
-      
-      <!-- SHALL <sch:assert test="$hasAtLeastOneTaxonomy"
-        diagnostics="rule.mri.servicetaxonomy-failure-en 
-                     rule.mri.servicetaxonomy-failure-fr"/> -->
-      
-      <sch:report test="$hasAtLeastOneTaxonomy"
-        diagnostics="rule.mri.servicetaxonomy-success-en 
-                     rule.mri.servicetaxonomy-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
-  
-</sch:schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/mri.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/mri.xsd
deleted file mode 100644
index 22c389308..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/mri.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mri/1.0" version="1.0">
-  <annotation>
-    <documentation>Namespace for XML elements &lt;font color="#1f497d"&gt;used to document basic metadata properties of a described resource&lt;/font&gt;</documentation>
-  </annotation>
-  <include schemaLocation="identification.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/lan/1.0" schemaLocation="../../../../19115/-3/lan/1.0/lan.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/mri.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/mri.zip
deleted file mode 100644
index 2c183f700..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/mri.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/mri_invalid.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/mri_invalid.xml
deleted file mode 100644
index f6f8c4764..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/mri_invalid.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mdt/1.0 ../../mdt/1.0/mdt.xsd" xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
- xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0" xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0"
- xmlns:srv="http://standards.iso.org/iso/19115/-3/srv/2.0" xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0">
-   <mdb:metadataIdentifier></mdb:metadataIdentifier>
-   
-   <!-- Some rules applies to dataset only -->
-   <mdb:metadataScope>
-      <mdb:MD_MetadataScope>
-         <mdb:resourceScope>
-            <mcc:MD_ScopeCode codeList="codeListLocation#MD_ScopeCode" 
-               codeListValue="dataset">dataset</mcc:MD_ScopeCode>
-         </mdb:resourceScope>
-      </mdb:MD_MetadataScope>
-   </mdb:metadataScope>
-   
-   
-   <mdb:contact></mdb:contact>
-   <mdb:dateInfo></mdb:dateInfo>
-   <mdb:identificationInfo>
-      <mri:MD_DataIdentification>
-         <mri:citation></mri:citation>
-         <mri:abstract></mri:abstract>         
-         
-         <!-- Invalid for rule rule.mri.topicategoryfordsandseries
-         <mri:topicCategory>
-            <mri:MD_TopicCategoryCode>boundaries</mri:MD_TopicCategoryCode>
-         </mri:topicCategory>
-          -->
-         
-         <!-- Invalid for rule rule.mri.associatedresource -->
-         <mri:associatedResource>
-            <mri:MD_AssociatedResource>
-               <mri:associationType></mri:associationType>
-               <mri:metadataReference uuidref=""/>
-            </mri:MD_AssociatedResource>
-         </mri:associatedResource>
-         <mri:associatedResource>
-            <mri:MD_AssociatedResource>
-               <mri:associationType></mri:associationType>
-            </mri:MD_AssociatedResource>
-         </mri:associatedResource>
-         <mri:associatedResource>
-            <mri:MD_AssociatedResource>
-               <mri:name>
-                  <cit:CI_Citation>
-                     <cit:title gco:nilReason="missing">
-                        <gco:CharacterString></gco:CharacterString>
-                     </cit:title>
-                  </cit:CI_Citation>
-               </mri:name>
-               <mri:associationType></mri:associationType>
-            </mri:MD_AssociatedResource>
-         </mri:associatedResource>
-
-         <mri:defaultLocale>
-            <lan:PT_Locale>
-               <lan:language></lan:language>
-               <lan:characterEncoding>
-                  <lan:MD_CharacterSetCode codeList="" codeListValue=""/>
-               </lan:characterEncoding>
-            </lan:PT_Locale>
-         </mri:defaultLocale>
-         
-      </mri:MD_DataIdentification>
-   </mdb:identificationInfo>
-   <mdb:identificationInfo>
-      <srv:SV_ServiceIdentification>
-         <mri:citation></mri:citation>
-         <mri:abstract></mri:abstract>
-         <mri:associatedResource>
-            <mri:MD_AssociatedResource>
-               <mri:name>
-                  <cit:CI_Citation>
-                     <cit:title></cit:title>
-                  </cit:CI_Citation>
-               </mri:name>
-               <mri:associationType></mri:associationType>
-            </mri:MD_AssociatedResource>
-         </mri:associatedResource>
-         <srv:serviceType></srv:serviceType>
-      </srv:SV_ServiceIdentification>
-   </mdb:identificationInfo>
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/mri_valid.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/mri_valid.xml
deleted file mode 100644
index 432cb9416..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mri/1.0/mri_valid.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mdt/1.0 ../../mdt/1.0/mdt.xsd" xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0"
- xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0" xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:gex="http://standards.iso.org/iso/19115/-3/gex/1.0" xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:srv="http://standards.iso.org/iso/19115/-3/srv/2.0"
- xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0" xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0" xmlns:mrc="http://standards.iso.org/iso/19115/-3/mrc/1.0">
-   
-   <mdb:metadataIdentifier></mdb:metadataIdentifier>
-   
-   <!-- Some rules applies to dataset only -->
-   <mdb:metadataScope>
-      <mdb:MD_MetadataScope>
-         <mdb:resourceScope>
-            <mcc:MD_ScopeCode codeList="codeListLocation#MD_ScopeCode" 
-               codeListValue="dataset">dataset</mcc:MD_ScopeCode>
-         </mdb:resourceScope>
-      </mdb:MD_MetadataScope>
-   </mdb:metadataScope>
-   
-   <mdb:contact></mdb:contact>
-   <mdb:dateInfo></mdb:dateInfo>
-   <mdb:identificationInfo>
-      <mri:MD_DataIdentification>
-         <mri:citation></mri:citation>
-         <mri:abstract></mri:abstract>
-         
-         <!-- Valid for rule rule.mri.topicategoryfordsandseries -->
-         <mri:topicCategory>
-            <mri:MD_TopicCategoryCode>boundaries</mri:MD_TopicCategoryCode>
-         </mri:topicCategory>
-         <mri:topicCategory>
-            <mri:MD_TopicCategoryCode>disaster</mri:MD_TopicCategoryCode>
-         </mri:topicCategory>
-         
-         <!-- Valid for rule rule.mri.datasetextent -->
-         <mri:extent>
-            <gex:EX_Extent>
-               <gex:geographicElement>
-                  <gex:EX_GeographicDescription>
-                     <gex:geographicIdentifier>
-                        <mcc:MD_Identifier>
-                           <mcc:code>
-                              <gcx:Anchor xlink:href="http://fr.wikipedia.org/wiki/Saint-Jeoire-Prieur%C3%A9">
-                              Saint-Jeoire-Prieuré
-                              </gcx:Anchor>
-                           </mcc:code>
-                        </mcc:MD_Identifier>
-                     </gex:geographicIdentifier>
-                  </gex:EX_GeographicDescription>
-               </gex:geographicElement>
-               <gex:geographicElement>
-                  <gex:EX_GeographicBoundingBox>
-                     <gex:westBoundLongitude>
-                        <gco:Decimal>9</gco:Decimal>
-                     </gex:westBoundLongitude>
-                     <gex:eastBoundLongitude>
-                        <gco:Decimal>10</gco:Decimal>
-                     </gex:eastBoundLongitude>
-                     <gex:southBoundLatitude>
-                        <gco:Decimal>-14</gco:Decimal>
-                     </gex:southBoundLatitude>
-                     <gex:northBoundLatitude>
-                        <gco:Decimal>-13</gco:Decimal>
-                     </gex:northBoundLatitude>
-                  </gex:EX_GeographicBoundingBox>
-               </gex:geographicElement>
-               <gex:geographicElement>
-                  <gex:EX_GeographicBoundingBox>
-                     <gex:westBoundLongitude>
-                        <gco:Decimal>9</gco:Decimal>
-                     </gex:westBoundLongitude>
-                     <gex:eastBoundLongitude>
-                        <gco:Decimal>10</gco:Decimal>
-                     </gex:eastBoundLongitude>
-                     <gex:southBoundLatitude>
-                        <gco:Decimal>13</gco:Decimal>
-                     </gex:southBoundLatitude>
-                     <gex:northBoundLatitude>
-                        <gco:Decimal>14</gco:Decimal>
-                     </gex:northBoundLatitude>
-                  </gex:EX_GeographicBoundingBox>
-               </gex:geographicElement>
-            </gex:EX_Extent>
-         </mri:extent>
-                                    
-         <!-- Valid for rule rule.mri.associatedresource -->
-         <mri:associatedResource>
-            <mri:MD_AssociatedResource>
-               <mri:associationType></mri:associationType>
-               <mri:metadataReference uuidref="MD01"/>
-            </mri:MD_AssociatedResource>
-         </mri:associatedResource>
-         <mri:associatedResource>
-            <mri:MD_AssociatedResource>
-               <mri:name uuidref="MD02"/>
-               <mri:associationType></mri:associationType>
-            </mri:MD_AssociatedResource>
-         </mri:associatedResource>
-         <mri:associatedResource>
-            <mri:MD_AssociatedResource>
-               <mri:name>
-                  <cit:CI_Citation>
-                     <cit:title>
-                        <gco:CharacterString>MD03</gco:CharacterString>
-                     </cit:title>
-                  </cit:CI_Citation>
-               </mri:name>
-               <mri:associationType></mri:associationType>
-            </mri:MD_AssociatedResource>
-         </mri:associatedResource>
-         <mri:associatedResource>
-            <mri:MD_AssociatedResource>
-               <mri:name>
-                  <cit:CI_Citation>
-                     <cit:title xsi:type="lan:PT_FreeText_PropertyType">
-                        <lan:PT_FreeText>
-                           <lan:textGroup>
-                              <lan:LocalisedCharacterString>MD04</lan:LocalisedCharacterString>
-                           </lan:textGroup>
-                        </lan:PT_FreeText>
-                     </cit:title>
-                  </cit:CI_Citation>
-               </mri:name>
-               <mri:associationType></mri:associationType>
-            </mri:MD_AssociatedResource>
-         </mri:associatedResource>
-
-         <mri:defaultLocale>
-            <lan:PT_Locale>
-               <lan:language>
-                  <lan:LanguageCode codeList="" codeListValue="eng"/>
-               </lan:language>
-               <lan:characterEncoding>
-                  <lan:MD_CharacterSetCode codeList="" codeListValue=""/>
-               </lan:characterEncoding>
-            </lan:PT_Locale>
-         </mri:defaultLocale>
-         
-         <mri:otherLocale>
-            <lan:PT_Locale>
-               <lan:language>
-                  <lan:LanguageCode codeList="" codeListValue="fre"/>
-               </lan:language>
-               <lan:characterEncoding>
-                  <lan:MD_CharacterSetCode codeList="" codeListValue="UTF-16"/>
-               </lan:characterEncoding>
-            </lan:PT_Locale>
-         </mri:otherLocale>
-         
-      </mri:MD_DataIdentification>
-   </mdb:identificationInfo>
-   <mdb:identificationInfo>
-      <srv:SV_ServiceIdentification>
-         <mri:citation></mri:citation>
-         <mri:abstract></mri:abstract>
-         
-         <mri:descriptiveKeywords>
-            <mri:MD_Keywords>
-               <mri:keyword>
-                  <gco:CharacterString>Geographic processing services</gco:CharacterString>
-               </mri:keyword>
-            </mri:MD_Keywords>
-         </mri:descriptiveKeywords>
-         <mri:associatedResource>
-            <mri:MD_AssociatedResource>
-               <mri:name>
-                  <cit:CI_Citation>
-                     <cit:title><gco:CharacterString>MD01SRV</gco:CharacterString></cit:title>
-                  </cit:CI_Citation>
-               </mri:name>
-               <mri:associationType></mri:associationType>
-            </mri:MD_AssociatedResource>
-         </mri:associatedResource>
-         <srv:serviceType></srv:serviceType>
-      </srv:SV_ServiceIdentification>
-   </mdb:identificationInfo>
-   <mdb:contentInfo>
-      <!-- rule.mri.defaultlocalewhenhastext 
-      This may be a way to check if resource contains textual information
-      -->
-      <mrc:MD_FeatureCatalogue>
-         <mrc:featureCatalogue></mrc:featureCatalogue>
-      </mrc:MD_FeatureCatalogue>
-   </mdb:contentInfo>
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrl/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrl/1.0/index.html
deleted file mode 100644
index b04d8d56a..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrl/1.0/index.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Metadata for Resource Lineage (MRL) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Metadata for Resource Lineage (MRL) Version: 1.0</h1><img src="mrl.png"><h2>Description</h2>
-      <p>MRL 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.5.  It includes elements for describing resource lineage. The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>XML Namespace for mrl 1.0</h2>
-      <p>The namespace URI for mrl 1.0 is <b>http://standards.iso.org/iso/19115/-3/mrl/1.0</b>.
-      </p>
-      <h2>XML Schema for mrl 1.0</h2>
-      <p><b><a href="mrl.xsd">mrl.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the mrl 1.0 namespace or by XML Schema documents importing the mrl 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the mrl namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for mrl 1.0 are available <a href="mrl.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for mrl 1.0</h2>
-      <p><b><a href="lineage.xsd">lineage.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.5. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): LI_Lineage, LI_ProcessStep, and LI_Source
-      </p>
-      <p><b><a href="lineageImagery.xsd">lineageImagery.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.5. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): LE_Algorithm, LE_NominalResolution, LE_ProcessStep, LE_ProcessStepReport, LE_Processing, and LE_Source
-      </p>
-      <h2>Related XML Namespaces for mrl 1.0</h2> The mrl 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Geographic COmmon</td>
-            <td>gco</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gco/1.0">http://standards.iso.org/iso/19115/-3/gco/1.0</a></td>
-            <td>../../../../19115/-3/gco/1.0/gco.xsd</td>
-         </tr>
-         <tr>
-            <td>Geographic Markup Wrappers</td>
-            <td>gmw</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gmw/1.0">http://standards.iso.org/iso/19115/-3/gmw/1.0</a></td>
-            <td>../../../../19115/-3/gmw/1.0/gmw.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata Common Classes</td>
-            <td>mcc</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mcc/1.0">http://standards.iso.org/iso/19115/-3/mcc/1.0</a></td>
-            <td>../../../../19115/-3/mcc/1.0/mcc.xsd</td>
-         </tr>
-      </table>
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrl/1.0/lineage.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrl/1.0/lineage.xsd
deleted file mode 100644
index e17ce03d7..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrl/1.0/lineage.xsd
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" 
-  xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" 
-  xmlns:gmw="http://standards.iso.org/iso/19115/-3/gmw/1.0"  
-  xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" 
-  xmlns:mrl="http://standards.iso.org/iso/19115/-3/mrl/1.0" 
-  elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mrl/1.0" version="1.0">
-<!--  <include schemaLocation="mrl.xsd"/>-->
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gmw/1.0" schemaLocation="../../../../19115/-3/gmw/1.0/gmw.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="LI_Lineage" substitutionGroup="mcc:Abstract_LineageInformation" type="mrl:LI_Lineage_Type">
-    <annotation>
-      <documentation>information about the events or source data used in constructing the data specified by the scope or lack of knowledge about lineage</documentation>
-    </annotation>
-  </element>
-  <complexType name="LI_Lineage_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_LineageInformation_Type">
-        <sequence>
-          <element minOccurs="0" name="statement" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>general explanation of the data producer's knowledge about the lineage of a resource</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="scope" type="mcc:MD_Scope_PropertyType">
-            <annotation>
-              <documentation>type of resource and/or extent to which the lineage information applies</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="additionalDocumentation" type="mcc:Abstract_Citation_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="source" type="mrl:LI_Source_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="processStep" type="mrl:LI_ProcessStep_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="LI_Lineage_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrl:LI_Lineage"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="LI_ProcessStep" substitutionGroup="gco:AbstractObject" type="mrl:LI_ProcessStep_Type">
-    <annotation>
-      <documentation>information about an event or transformation in the life of a resource including the process used to maintain the resource</documentation>
-    </annotation>
-  </element>
-  <complexType name="LI_ProcessStep_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="description" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>description of the event, including related parameters or tolerances</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="rationale" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>requirement or purpose for the process step</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="stepDateTime" type="gmw:TM_Primitive_PropertyType">
-            <annotation>
-              <documentation>date, time, range or period of process step</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="processor" type="mcc:Abstract_Responsibility_PropertyType">
-            <annotation>
-              <documentation>identification of, and means of communication with, person(s) and organisation(s) associated with the process step</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="reference" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>process step documentation</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="scope" type="mcc:MD_Scope_PropertyType">
-            <annotation>
-              <documentation>type of resource and/or extent to which the process step applies</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="source" type="mrl:LI_Source_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="LI_ProcessStep_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrl:LI_ProcessStep"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="LI_Source" substitutionGroup="gco:AbstractObject" type="mrl:LI_Source_Type">
-    <annotation>
-      <documentation>information about the source resource used in creating the data specified by the scope</documentation>
-    </annotation>
-  </element>
-  <complexType name="LI_Source_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element minOccurs="0" name="description" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>detailed description of the level of the source resource</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="sourceSpatialResolution" type="mcc:Abstract_SpatialResolution_PropertyType">
-            <annotation>
-              <documentation>level of detail expressed as a scale factor, a distance or an angle</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="sourceReferenceSystem" type="mcc:Abstract_ReferenceSystem_PropertyType">
-            <annotation>
-              <documentation>spatial reference system used by the source resource</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="sourceCitation" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>recommended reference to be used for the source resource</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="sourceMetadata" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>identifier and link to source metadata</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="scope" type="mcc:MD_Scope_PropertyType">
-            <annotation>
-              <documentation>type of resource and/or extent of the source</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="sourceStep" type="mrl:LI_ProcessStep_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="LI_Source_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrl:LI_Source"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrl/1.0/lineageImagery.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrl/1.0/lineageImagery.xsd
deleted file mode 100644
index 2a90f7613..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrl/1.0/lineageImagery.xsd
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:mrl="http://standards.iso.org/iso/19115/-3/mrl/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mrl/1.0" version="1.0">
-  <include schemaLocation="mrl.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="LE_Algorithm" substitutionGroup="gco:AbstractObject" type="mrl:LE_Algorithm_Type">
-    <annotation>
-      <documentation>Description: Details of the methodology by which geographic information was derived from the instrument readings
-FGDC: Algorithm_Information
-shortName: Algorithm</documentation>
-    </annotation>
-  </element>
-  <complexType name="LE_Algorithm_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="citation" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>Description: information identifying the algorithm and version or date
-FGDC: Algorithm_Identifiers
-Position: 1
-shortName: algId</documentation>
-            </annotation>
-          </element>
-          <element name="description" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>Description: information describing the algorithm used to generate the data
-FGDC: Algorithm_Description
-Position: 2
-shortName: algDesc</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="LE_Algorithm_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrl:LE_Algorithm"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="LE_NominalResolution" substitutionGroup="gco:AbstractObject" type="mrl:LE_NominalResolution_Type">
-    <annotation>
-      <documentation>Description: Distance between adjacent pixels
-shortName: nomRes</documentation>
-    </annotation>
-  </element>
-  <complexType name="LE_NominalResolution_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <choice>
-          <element name="scanningResolution" type="gco:Distance_PropertyType">
-            <annotation>
-              <documentation>Description: Distance between adjacent pixels in the scan plane
-shortName: scanRes</documentation>
-            </annotation>
-          </element>
-          <element name="groundResolution" type="gco:Distance_PropertyType">
-            <annotation>
-              <documentation>Description: Distance between adjacent pixels in the object space
-shortName: groundRes</documentation>
-            </annotation>
-          </element>
-        </choice>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="LE_NominalResolution_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrl:LE_NominalResolution"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="LE_ProcessStep" substitutionGroup="mrl:LI_ProcessStep" type="mrl:LE_ProcessStep_Type">
-    <annotation>
-      <documentation>Description: Information about an event or transformation in the life of the dataset including details of the algorithm and software used for processing
-FGDC: 
-shortName: DetailProcStep</documentation>
-    </annotation>
-  </element>
-  <complexType name="LE_ProcessStep_Type">
-    <complexContent>
-      <extension base="mrl:LI_ProcessStep_Type">
-        <sequence>
-          <element minOccurs="0" name="processingInformation" type="mrl:LE_Processing_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="report" type="mrl:LE_ProcessStepReport_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="output" type="mrl:LE_Source_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="LE_ProcessStep_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrl:LE_ProcessStep"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="LE_ProcessStepReport" substitutionGroup="gco:AbstractObject" type="mrl:LE_ProcessStepReport_Type">
-    <annotation>
-      <documentation>Description: Report of what occured during the process step
-shortName: ProcStepRep</documentation>
-    </annotation>
-  </element>
-  <complexType name="LE_ProcessStepReport_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="name" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>Description: Name of the processing report
-shortName: procRepName</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="description" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>Description: Textual description of what occurred during the process step
-shortName: procRepDesc</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="fileType" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>Description: Type of file that contains that processing report
-shortName: procRepFilTyp</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="LE_ProcessStepReport_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrl:LE_ProcessStepReport"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="LE_Processing" substitutionGroup="gco:AbstractObject" type="mrl:LE_Processing_Type">
-    <annotation>
-      <documentation>Description: Comprehensive information about the procedure(s), process(es) and algorithm(s) applied in the process step
-shortName: Procsg</documentation>
-    </annotation>
-  </element>
-  <complexType name="LE_Processing_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="algorithm" type="mrl:LE_Algorithm_PropertyType"/>
-          <element name="identifier" type="mcc:MD_Identifier_PropertyType">
-            <annotation>
-              <documentation>Description: Information to identify the processing package that produced the data
-FGDC: Processing_Identifiers
-Position: 1
-shortName: procInfoId</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="softwareReference" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>Description: Reference to document describing processing software
-FGDC: Processing_Software_Reference
-Position: 2
-shortName: procInfoSwRef</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="procedureDescription" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>Description: Additional details about the processing procedures
-FGDC: Processing_Procedure_Description
-Position: 3
-shortName: procInfoDesc</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="documentation" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>Description: Reference to documentation describing the processing
-FGDC: Processing_Documentation
-Position: 4
-shortName: procInfoDoc</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="runTimeParameters" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>Description: Parameters to control the processing operations, entered at run time
-FGDC: Command_Line_Processing_Parameter
-Position: 5
-shortName: procInfoParam</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="LE_Processing_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrl:LE_Processing"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="LE_Source" substitutionGroup="mrl:LI_Source" type="mrl:LE_Source_Type">
-    <annotation>
-      <documentation>Description: information on source of data sets for processing step
-shortName: SrcDataset</documentation>
-    </annotation>
-  </element>
-  <complexType name="LE_Source_Type">
-    <complexContent>
-      <extension base="mrl:LI_Source_Type">
-        <sequence>
-          <element minOccurs="0" name="processedLevel" type="mcc:MD_Identifier_PropertyType">
-            <annotation>
-              <documentation>Description: Processing level of the source data
-shortName: procLevel</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="resolution" type="mrl:LE_NominalResolution_PropertyType">
-            <annotation>
-              <documentation>Description: Distance between two adjacent pixels
-shortName: procResol</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="LE_Source_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrl:LE_Source"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrl/1.0/mrl.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrl/1.0/mrl.png
deleted file mode 100644
index 6a9ae6303..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrl/1.0/mrl.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrl/1.0/mrl.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrl/1.0/mrl.xsd
deleted file mode 100644
index c10cadd18..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrl/1.0/mrl.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:mrl="http://standards.iso.org/iso/19115/-3/mrl/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mrl/1.0" version="1.0">
-  <annotation>
-    <documentation>Namespace for XML elements &lt;font color="#1f497d"&gt;used to document the lineage (provenance) of a resource&lt;/font&gt;.</documentation>
-  </annotation>
-  <include schemaLocation="lineage.xsd"/>
-  <include schemaLocation="lineageImagery.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrl/1.0/mrl.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrl/1.0/mrl.zip
deleted file mode 100644
index b2f61dcc6..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrl/1.0/mrl.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/codelists.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/codelists.html
deleted file mode 100644
index 09dd325be..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/codelists.html
+++ /dev/null
@@ -1,389 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0" xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>
-         Codelists from the Metadata for Reference System (mrs) Namespace
-         
-      </title>
-   </head>
-   <h1>ISO 19115-3 Codelist Report</h1>
-   <h2>
-      Codelists from the Metadata for Reference System (mrs) Namespace
-      
-   </h2>
-   <table>
-      <tr><b>
-            <td>Scope</td></b><td>
-            Codelists from the Metadata for Reference System (mrs) Namespace
-            
-         </td>
-      </tr>
-      <tr><b>
-            <td>Field of Application</td></b><td>
-            ISO TC211 Metadata Standards
-            
-         </td>
-      </tr>
-      <tr><b>
-            <td>Version (Date)</td></b><td>
-            0.1
-             ()
-         </td>
-      </tr>
-   </table>
-   <h2>
-      MD_ReferenceSystemTypeCode
-       (
-      MD_ReferenceSystemTypeCode
-      ):
-   </h2><b>Description: </b>
-   defines type of reference system used
-   
-   <table width="95%" border="1" cellpadding="2" cellspacing="2">
-      <tr>
-         <th valign="top">Entry</th>
-         <th valign="top">Definition</th>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_compoundEngineeringParametric
-            
-         </td>
-         <td valign="top">
-            compound statio-parametric coordinate reference system
-            containing an engineering coordinate reference system and a parametric
-            reference system. e.g. [local] x, y, pressure
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_compoundEngineeringParametricTemporal
-            
-         </td>
-         <td valign="top">
-            compound statio-parametric-temporal coordinate reference
-            system containing an engineering, a parametric, and a temporal coordinate
-            reference system. e.g. [local] x, y, pressure, time
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_compoundEngineeringTemporal
-            
-         </td>
-         <td valign="top">
-            compound spatio-temporal coordinate reference system
-            containing an engineering and a temporal coordinate reference system. e.g.
-            [local] x, y, time
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_compoundEngineeringVertical
-            
-         </td>
-         <td valign="top">
-            compound spatial reference system containing a horizontal
-            engineering coordinate reference system and a vertical coordinate reference
-            system. e.g. [local] x, y, height
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_compoundEngineeringVerticalTemporal
-            
-         </td>
-         <td valign="top">
-            compound spatio-temporal coordinate reference system
-            containing an engineering, a vertical, and a temporal coordinate reference
-            system. e.g. [local] x, y, height, time
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_compoundGeodeticParametric
-            
-         </td>
-         <td valign="top">
-            compound statio-parametric coordinate reference system
-            containing a 2 dimensional geographic horizontal coordinate reference system
-            and a parametric reference system. e.g. latitude, longitude,
-            pressure
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_compoundGeodeticParametricTemporal
-            
-         </td>
-         <td valign="top">
-            compound statio-parametric-temporal coordinate reference
-            system containing a 2 dimensional geographic horizontal, a parametric and a
-            temporal coordinate reference system. e.g. latitude, longitude, pressure,
-            time
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_compoundGeographic2DTemporal
-            
-         </td>
-         <td valign="top">
-            compound spatio-temporal coordinate reference system
-            containing a 2 dimensional geographic horizontal coordinate reference system
-            and a temporal reference system. e.g. latitude, longitude,
-            time
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_compoundGeographic2DVertical
-            
-         </td>
-         <td valign="top">
-            compound coordinate reference system in which one constituent
-            coordinate reference system is a horizontal geodetic coordinate reference
-            system and one is a vertical coordinate reference system. e.g. latitude,
-            longitude, [gravity-related] height or depth
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_compoundGeographicVerticalTemporal
-            
-         </td>
-         <td valign="top">
-            compound spatio-temporal coordinate reference system
-            containing a 2 dimensional geographic horizontal, a vertical, and a temporal
-            coordinate reference system. e.g. latitude, longitude, height,
-            time
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_compoundGeographic3DTemporal
-            
-         </td>
-         <td valign="top">
-            compound spatio-temporal coordinate reference system
-            containing a 3 dimensional geographic and a temporal coordinate reference
-            system. e.g. latitude, longitude, ellipsoidal height,
-            time
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_compoundProjected2DParametric
-            
-         </td>
-         <td valign="top">
-            compound statio-parametric coordinate reference system
-            containing a projected horizontal coordinate reference system and a parametric
-            reference system. e.g. easting, northing, density
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_compoundProjected2DParametricTemporal
-            
-         </td>
-         <td valign="top">
-            compound statio-parametric-temporal coordinate reference
-            system containing a projected horizontal, a parametric, and a temporal
-            coordinate reference system. e.g. easting, northing, density,
-            time
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_compoundProjectedTemporal
-            
-         </td>
-         <td valign="top">
-            compound spatio-temporal coordinate reference system
-            containing a projected horizontal and a temporal coordinate reference system.
-            e.g. easting, northing, time
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_compoundProjectedVertical
-            
-         </td>
-         <td valign="top">
-            compound spatial reference system containing a horizontal
-            projected coordinate reference system and a vertical coordinate reference
-            system. e.g. easting, northing, [gravity-related] height or
-            depth
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_compoundProjectedVerticalTemporal
-            
-         </td>
-         <td valign="top">
-            compound spatio-temporal coordinate reference system
-            containing a projected horizontal, a vertical, and a temporal coordinate
-            reference system. e.g. easting, northing, height, time
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_engineering
-            
-         </td>
-         <td valign="top">
-            coordinate reference system based on an engineering datum
-            (datum describing the relationship of a coordinate system to a local
-            reference). e.g. [local] x,y
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_engineeringDesign
-            
-         </td>
-         <td valign="top">
-            engineering coordinate reference system in which the base
-            representation of a moving object is specified. e.g. [local]
-            x,y
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_engineeringImage
-            
-         </td>
-         <td valign="top">
-            coordinate reference system based on an image datum
-            (engineering datum which defines the relationship of a coordinate system to an
-            image). e.g. row, column
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_geodeticGeocentric
-            
-         </td>
-         <td valign="top">
-            geodetic CRS having a Cartesian 3D coordinate system. e.g.
-            [geocentric] X,Y,Z
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_geodeticGeographic2D
-            
-         </td>
-         <td valign="top">
-            geodetic CRS having an ellipsoidal 2D coordinate system. e.g.
-            latitude, longitude
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_geodeticGeographic3D
-            
-         </td>
-         <td valign="top">
-            geodetic CRS having an ellipsoidal 3D coordinate system. e.g.
-            latitude, longitude, ellipsoidal height
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_geographicIdentifier
-            
-         </td>
-         <td valign="top">
-            spatial reference in the form of a label or code that
-            identifies a location. e.g. post code
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_linear
-            
-         </td>
-         <td valign="top">
-            set of Linear Referencing Methods and the policies, records
-            and procedures for implementing them. reference system that identifies a
-            location by reference to a segment of a linear geographic feature and distance
-            along that segment from a given point. e.g. x km along
-            road
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_parametric
-            
-         </td>
-         <td valign="top">
-            coordinate reference system based on a parametric datum
-            (datum describing the relationship of a parametric coordinate system to an
-            object). e.g. pressure
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_projected
-            
-         </td>
-         <td valign="top">
-            coordinate reference system derived from a two-dimensional
-            geodetic coordinate reference system by applying a map projection. e.g.
-            easting, northing
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_temporal
-            
-         </td>
-         <td valign="top">
-            reference system against which time is measured. e.g.
-            time
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            MD_ReferenceSystemTypeCode_vertical
-            
-         </td>
-         <td valign="top">
-            one-dimensional coordinate reference system based on a
-            vertical datum (datum describing the relation of gravity-related heights or
-            depths to the Earth). e.g. [gravity-related] height or
-            depth
-            
-         </td>
-      </tr>
-   </table><a href="#top">top</a><hr/><i>Stylesheet: CT_CodelistHTML.xsl Version: 2015-04-17</i></html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/codelists.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/codelists.xml
deleted file mode 100644
index 6d7c4f440..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/codelists.xml
+++ /dev/null
@@ -1,429 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cat:CT_CodelistCatalogue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0"
-   xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0"
-   xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:gml="http://www.opengis.net/gml/3.2"
-   xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/cat/1.0 ../../../-3/cat/1.0/cat.xsd">
-   <!--=====Catalogue description=====-->
-   <cat:name>
-      <gco:CharacterString>Codelists from the Metadata for Reference System (mrs) Namespace</gco:CharacterString>
-   </cat:name>
-   <cat:scope>
-      <gco:CharacterString>Codelists from the Metadata for Reference System (mrs) Namespace</gco:CharacterString>
-   </cat:scope>
-   <cat:fieldOfApplication>
-      <gco:CharacterString>ISO TC211 Metadata Standards</gco:CharacterString>
-   </cat:fieldOfApplication>
-   <cat:versionNumber>
-      <gco:CharacterString>0.1</gco:CharacterString>
-   </cat:versionNumber>
-   <cat:versionDate>
-      <gco:Date>2015-04-18</gco:Date>
-   </cat:versionDate>
-   <cat:locale>
-      <lan:PT_Locale>
-         <lan:language>
-            <lan:LanguageCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codelists.xml#LanguageCode" codeListValue="eng">eng</lan:LanguageCode>
-         </lan:language>
-         <lan:characterEncoding>
-            <lan:MD_CharacterSetCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codelists.xml#MD_CharacterSetCode"
-               codeListValue="UTF-8">UTF-8</lan:MD_CharacterSetCode>
-         </lan:characterEncoding>
-      </lan:PT_Locale>
-   </cat:locale>
-   <!--============================= Codelists =======================================-->
-   <!-- MD_ReferenceSystemTypeCode  -->
-   <cat:codelistItem>
-      <cat:CT_Codelist id="MD_ReferenceSystemTypeCode">
-         <cat:identifier>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >MD_ReferenceSystemTypeCode</gco:ScopedName>
-         </cat:identifier>
-         <cat:name>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >MD_ReferenceSystemTypeCode</gco:ScopedName>
-         </cat:name>
-         <cat:definition>
-            <gco:CharacterString>defines type of reference system used</gco:CharacterString>
-         </cat:definition>
-         <cat:description>
-            <gco:CharacterString>defines type of reference system used</gco:CharacterString>
-         </cat:description>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_compoundEngineeringParametric">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_compoundEngineeringParametric</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>compound statio-parametric coordinate reference system
-                     containing an engineering coordinate reference system and a parametric
-                     reference system. e.g. [local] x, y, pressure</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue
-               id="MD_ReferenceSystemTypeCode_compoundEngineeringParametricTemporal">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_compoundEngineeringParametricTemporal</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>compound statio-parametric-temporal coordinate reference
-                     system containing an engineering, a parametric, and a temporal coordinate
-                     reference system. e.g. [local] x, y, pressure, time</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_compoundEngineeringTemporal">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_compoundEngineeringTemporal</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>compound spatio-temporal coordinate reference system
-                     containing an engineering and a temporal coordinate reference system. e.g.
-                     [local] x, y, time</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_compoundEngineeringVertical">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_compoundEngineeringVertical</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>compound spatial reference system containing a horizontal
-                     engineering coordinate reference system and a vertical coordinate reference
-                     system. e.g. [local] x, y, height</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue
-               id="MD_ReferenceSystemTypeCode_compoundEngineeringVerticalTemporal">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_compoundEngineeringVerticalTemporal</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>compound spatio-temporal coordinate reference system
-                     containing an engineering, a vertical, and a temporal coordinate reference
-                     system. e.g. [local] x, y, height, time</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_compoundGeodeticParametric">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_compoundGeodeticParametric</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>compound statio-parametric coordinate reference system
-                     containing a 2 dimensional geographic horizontal coordinate reference system
-                     and a parametric reference system. e.g. latitude, longitude,
-                     pressure</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_compoundGeodeticParametricTemporal">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_compoundGeodeticParametricTemporal</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>compound statio-parametric-temporal coordinate reference
-                     system containing a 2 dimensional geographic horizontal, a parametric and a
-                     temporal coordinate reference system. e.g. latitude, longitude, pressure,
-                     time</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_compoundGeographic2DTemporal">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_compoundGeographic2DTemporal</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>compound spatio-temporal coordinate reference system
-                     containing a 2 dimensional geographic horizontal coordinate reference system
-                     and a temporal reference system. e.g. latitude, longitude,
-                     time</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_compoundGeographic2DVertical">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_compoundGeographic2DVertical</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>compound coordinate reference system in which one constituent
-                     coordinate reference system is a horizontal geodetic coordinate reference
-                     system and one is a vertical coordinate reference system. e.g. latitude,
-                     longitude, [gravity-related] height or depth</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_compoundGeographicVerticalTemporal">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_compoundGeographicVerticalTemporal</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>compound spatio-temporal coordinate reference system
-                     containing a 2 dimensional geographic horizontal, a vertical, and a temporal
-                     coordinate reference system. e.g. latitude, longitude, height,
-                     time</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_compoundGeographic3DTemporal">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_compoundGeographic3DTemporal</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>compound spatio-temporal coordinate reference system
-                     containing a 3 dimensional geographic and a temporal coordinate reference
-                     system. e.g. latitude, longitude, ellipsoidal height,
-                     time</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_compoundProjected2DParametric">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_compoundProjected2DParametric</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>compound statio-parametric coordinate reference system
-                     containing a projected horizontal coordinate reference system and a parametric
-                     reference system. e.g. easting, northing, density</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue
-               id="MD_ReferenceSystemTypeCode_compoundProjected2DParametricTemporal">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_compoundProjected2DParametricTemporal</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>compound statio-parametric-temporal coordinate reference
-                     system containing a projected horizontal, a parametric, and a temporal
-                     coordinate reference system. e.g. easting, northing, density,
-                     time</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_compoundProjectedTemporal">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_compoundProjectedTemporal</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>compound spatio-temporal coordinate reference system
-                     containing a projected horizontal and a temporal coordinate reference system.
-                     e.g. easting, northing, time</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_compoundProjectedVertical">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_compoundProjectedVertical</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>compound spatial reference system containing a horizontal
-                     projected coordinate reference system and a vertical coordinate reference
-                     system. e.g. easting, northing, [gravity-related] height or
-                     depth</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_compoundProjectedVerticalTemporal">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_compoundProjectedVerticalTemporal</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>compound spatio-temporal coordinate reference system
-                     containing a projected horizontal, a vertical, and a temporal coordinate
-                     reference system. e.g. easting, northing, height, time</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_engineering">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_engineering</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>coordinate reference system based on an engineering datum
-                     (datum describing the relationship of a coordinate system to a local
-                     reference). e.g. [local] x,y</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_engineeringDesign">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_engineeringDesign</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>engineering coordinate reference system in which the base
-                     representation of a moving object is specified. e.g. [local]
-                     x,y</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_engineeringImage">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_engineeringImage</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>coordinate reference system based on an image datum
-                     (engineering datum which defines the relationship of a coordinate system to an
-                     image). e.g. row, column</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_geodeticGeocentric">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_geodeticGeocentric</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>geodetic CRS having a Cartesian 3D coordinate system. e.g.
-                     [geocentric] X,Y,Z</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_geodeticGeographic2D">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_geodeticGeographic2D</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>geodetic CRS having an ellipsoidal 2D coordinate system. e.g.
-                     latitude, longitude</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_geodeticGeographic3D">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_geodeticGeographic3D</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>geodetic CRS having an ellipsoidal 3D coordinate system. e.g.
-                     latitude, longitude, ellipsoidal height</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_geographicIdentifier">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_geographicIdentifier</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>spatial reference in the form of a label or code that
-                     identifies a location. e.g. post code</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_linear">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_linear</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>set of Linear Referencing Methods and the policies, records
-                     and procedures for implementing them. reference system that identifies a
-                     location by reference to a segment of a linear geographic feature and distance
-                     along that segment from a given point. e.g. x km along
-                     road</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_parametric">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_parametric</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>coordinate reference system based on a parametric datum
-                     (datum describing the relationship of a parametric coordinate system to an
-                     object). e.g. pressure</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_projected">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_projected</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>coordinate reference system derived from a two-dimensional
-                     geodetic coordinate reference system by applying a map projection. e.g.
-                     easting, northing</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_temporal">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_temporal</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>reference system against which time is measured. e.g.
-                     time</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="MD_ReferenceSystemTypeCode_vertical">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >MD_ReferenceSystemTypeCode_vertical</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>one-dimensional coordinate reference system based on a
-                     vertical datum (datum describing the relation of gravity-related heights or
-                     depths to the Earth). e.g. [gravity-related] height or
-                     depth</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-      </cat:CT_Codelist>
-   </cat:codelistItem>
-   <!--=== EOF ===-->
-</cat:CT_CodelistCatalogue>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/index.html
deleted file mode 100644
index 46a533cbd..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/index.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Metadata for Reference System (MRS) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Metadata for Reference System (MRS) Version: 1.0</h1><img src="mrs.png"><h2>Description</h2>
-      <p>MRS 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.8.  It includes elements for describing Reference Systems. The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>Sample XML files for mrs 1.0</h2>
-      <h2>CodeLists for mrs 1.0</h2><a href="codelists.html">codelists.html</a> <a href="codelists.xml">codelists.xml</a> 
-      <h2>XML Namespace for mrs 1.0</h2>
-      <p>The namespace URI for mrs 1.0 is <b>http://standards.iso.org/iso/19115/-3/mrs/1.0</b>.
-      </p>
-      <h2>XML Schema for mrs 1.0</h2>
-      <p><b><a href="mrs.xsd">mrs.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the mrs 1.0 namespace or by XML Schema documents importing the mrs 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the mrs namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for mrs 1.0 are available <a href="mrs.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for mrs 1.0</h2>
-      <p><b><a href="referenceSystem.xsd">referenceSystem.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.8. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): MD_ReferenceSystem, and <b>MD_ReferenceSystemTypeCode</b></p>
-      <h2>Related XML Namespaces for mrs 1.0</h2> The mrs 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Geographic COmmon</td>
-            <td>gco</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gco/1.0">http://standards.iso.org/iso/19115/-3/gco/1.0</a></td>
-            <td>../../../../19115/-3/gco/1.0/gco.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata Common Classes</td>
-            <td>mcc</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mcc/1.0">http://standards.iso.org/iso/19115/-3/mcc/1.0</a></td>
-            <td>../../../../19115/-3/mcc/1.0/mcc.xsd</td>
-         </tr>
-      </table>
-      <h2>Schematron Validation Rules for mrs 1.0</h2> Schematron rules for validating instance documents of the mrs 1.0 namespace are in <a href="mrs.sch">mrs.sch</a>. Other schematron rule sets that are
-      required for a complete validation are: mcc.sch, gco.sch, and mcc.sch
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/mrs.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/mrs.png
deleted file mode 100644
index 8ad103028..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/mrs.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/mrs.sch b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/mrs.sch
deleted file mode 100644
index ec49bdaa5..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/mrs.sch
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron">
-  <sch:ns prefix="mrs" uri="http://standards.iso.org/iso/19115/-3/mrs/1.0"/>
-  <!--
-    ISO 19115-3 base requirements for metadata instance documents
-    
-    See ISO19115-1:2014(E) page 17, Figure 12 Reference system information classes
-  -->
-
-  <!-- 
-    Rule: MD_ReferenceSystem
-    Ref: responsibilities
-          Refer to ISO 19111 and ISO19111-2 when coordinate reference
-          systeminformation is not given through referenceSystem Identifier
-    -->
-</sch:schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/mrs.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/mrs.xsd
deleted file mode 100644
index 9824c1083..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/mrs.xsd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:mrs="http://standards.iso.org/iso/19115/-3/mrs/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mrs/1.0" version="1.0">
-  <annotation>
-    <documentation>Namespace for XML elements &lt;font color="#1f497d"&gt;used to document the spatial reference system used to geolocate information content of a resource&lt;/font&gt;</documentation>
-  </annotation>
-  <include schemaLocation="referenceSystem.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/mrs.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/mrs.zip
deleted file mode 100644
index e8ef9ddf3..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/mrs.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/referenceSystem.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/referenceSystem.xsd
deleted file mode 100644
index ac35b50dd..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/mrs/1.0/referenceSystem.xsd
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:mrs="http://standards.iso.org/iso/19115/-3/mrs/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mrs/1.0" version="1.0">
-  <include schemaLocation="mrs.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="MD_ReferenceSystem" substitutionGroup="mcc:Abstract_ReferenceSystem" type="mrs:MD_ReferenceSystem_Type">
-    <annotation>
-      <documentation>information about the reference system</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_ReferenceSystem_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_ReferenceSystem_Type">
-        <sequence>
-          <element minOccurs="0" name="referenceSystemIdentifier" type="mcc:MD_Identifier_PropertyType">
-            <annotation>
-              <documentation>identifier and codespace for reference systeme.g. EPSG::4326</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="referenceSystemType" type="mrs:MD_ReferenceSystemTypeCode_PropertyType">
-            <annotation>
-              <documentation>type of reference system identifiede.g. geographic2D</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_ReferenceSystem_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrs:MD_ReferenceSystem"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_ReferenceSystemTypeCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>defines type of reference system used</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_ReferenceSystemTypeCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="mrs:MD_ReferenceSystemTypeCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/msr/1.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/msr/1.0/index.html
deleted file mode 100644
index d794631f1..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/msr/1.0/index.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Metadata for Spatial Representation (MSR) Version: 1.0</title>
-   </head>
-   <body>
-      <h1>Metadata for Spatial Representation (MSR) Version: 1.0</h1><img src="msr.png"><h2>Description</h2>
-      <p>MSR 1.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.7.  It includes elements for describing spatial representations of resources. The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>XML Namespace for msr 1.0</h2>
-      <p>The namespace URI for msr 1.0 is <b>http://standards.iso.org/iso/19115/-3/msr/1.0</b>.
-      </p>
-      <h2>XML Schema for msr 1.0</h2>
-      <p><b><a href="msr.xsd">msr.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the msr 1.0 namespace or by XML Schema documents importing the msr 1.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the msr namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for msr 1.0 are available <a href="msr.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for msr 1.0</h2>
-      <p><b><a href="spatialRepresentation.xsd">spatialRepresentation.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.7. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): AbstractMD_SpatialRepresentation, <b>MD_CellGeometryCode</b>, MD_Dimension, <b>MD_DimensionNameTypeCode</b>, <b>MD_GeometricObjectTypeCode</b>, MD_GeometricObjects, MD_Georectified, MD_Georeferenceable, MD_GridSpatialRepresentation, <b>MD_PixelOrientationCode</b>, <b>MD_TopologyLevelCode</b>, and MD_VectorSpatialRepresentation
-      </p>
-      <p><b><a href="spatialRepresentationImagery.xsd">spatialRepresentationImagery.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.7. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): MI_GCP, MI_GCPCollection, AbstractMI_GeolocationInformation, MI_Georectified, and MI_Georeferenceable
-      </p>
-      <h2>Related XML Namespaces for msr 1.0</h2> The msr 1.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Data Quality Common Classes</td>
-            <td>dqc</td>
-            <td><a href="http://standards.iso.org/iso/19157/-2/dqc/1.0">http://standards.iso.org/iso/19157/-2/dqc/1.0</a></td>
-            <td>../../../../19157/-2/dqc/1.0/dqc.xsd</td>
-         </tr>
-         <tr>
-            <td>Geographic COmmon</td>
-            <td>gco</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gco/1.0">http://standards.iso.org/iso/19115/-3/gco/1.0</a></td>
-            <td>../../../../19115/-3/gco/1.0/gco.xsd</td>
-         </tr>
-         <tr>
-            <td>Geographic Markup Wrappers</td>
-            <td>gmw</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gmw/1.0">http://standards.iso.org/iso/19115/-3/gmw/1.0</a></td>
-            <td>../../../../19115/-3/gmw/1.0/gmw.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata Common Classes</td>
-            <td>mcc</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mcc/1.0">http://standards.iso.org/iso/19115/-3/mcc/1.0</a></td>
-            <td>../../../../19115/-3/mcc/1.0/mcc.xsd</td>
-         </tr>
-      </table>
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/msr/1.0/msr.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/msr/1.0/msr.png
deleted file mode 100644
index 7e277992a..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/msr/1.0/msr.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/msr/1.0/msr.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/msr/1.0/msr.xsd
deleted file mode 100644
index de729cd2e..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/msr/1.0/msr.xsd
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:dqc="http://standards.iso.org/iso/19157/-2/dqc/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:msr="http://standards.iso.org/iso/19115/-3/msr/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/msr/1.0" version="1.0">
-  <annotation>
-    <documentation>Namespace for XML elements &lt;font color="#1f497d"&gt;used to document the encoding scheme used to represent geolocation in the content of a resource&lt;/font&gt;.</documentation>
-  </annotation>
-  <include schemaLocation="spatialRepresentation.xsd"/>
-  <include schemaLocation="spatialRepresentationImagery.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19157/-2/dqc/1.0" schemaLocation="../../../../19157/-2/dqc/1.0/dqc.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/msr/1.0/msr.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/msr/1.0/msr.zip
deleted file mode 100644
index 1f86054bb..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/msr/1.0/msr.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/msr/1.0/spatialRepresentation.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/msr/1.0/spatialRepresentation.xsd
deleted file mode 100644
index 81598304b..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/msr/1.0/spatialRepresentation.xsd
+++ /dev/null
@@ -1,375 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" 
-  xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" 
-  xmlns:gmw="http://standards.iso.org/iso/19115/-3/gmw/1.0" 
-  xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" 
-  xmlns:msr="http://standards.iso.org/iso/19115/-3/msr/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/msr/1.0" version="1.0">
-  <annotation>
-    <documentation>Frequency with which modifications and deletions are made to the data after it is first produced</documentation>
-  </annotation>
-<!--  <include schemaLocation="msr.xsd"/>-->
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gmw/1.0" schemaLocation="../../../../19115/-3/gmw/1.0/gmw.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <!-- SMR 2015-02-12 definition of AbstractMD_SpatialRepresentation element added by hand; shapeChange doesn't seem to 
-    handle abstract class in substitution for abstract class. GridSpatialRepresentation and VectorSpatialRepresentation in 
-    autogenerated schema were in substitution group for AbstractObject.  -->
-  <element abstract="true" name="AbstractMD_SpatialRepresentation" substitutionGroup="mcc:Abstract_SpatialRepresentation" type="msr:AbstractMD_SpatialRepresentation_Type">
-    <annotation>
-      <documentation>digital mechanism used to represent spatial information</documentation>
-    </annotation>
-  </element>
-  <complexType abstract="true" name="AbstractMD_SpatialRepresentation_Type">
-    <complexContent>
-      <extension base="mcc:Abstract_SpatialRepresentation_Type">
-        <sequence/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="AbstractMD_SpatialRepresentation_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="msr:AbstractMD_SpatialRepresentation"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
- <!-- end manually inserted part --> 
-  
-  
-  <element name="MD_CellGeometryCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>code indicating the geometry represented by the grid cell value</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_CellGeometryCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="msr:MD_CellGeometryCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_Dimension" substitutionGroup="gco:AbstractObject" type="msr:MD_Dimension_Type">
-    <annotation>
-      <documentation>axis properties</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_Dimension_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="dimensionName" type="msr:MD_DimensionNameTypeCode_PropertyType">
-            <annotation>
-              <documentation>name of the axis</documentation>
-            </annotation>
-          </element>
-          <element name="dimensionSize" type="gco:Integer_PropertyType">
-            <annotation>
-              <documentation>number of elements along the axis</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="resolution" type="gco:Measure_PropertyType">
-            
-            <annotation>
-              <documentation>degree of detail in the grid dataset</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="dimensionTitle" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>enhancement/modifier of the dimension name EX for other time dimension 'runtime' or dimensionName = 'column' dimensionTitle = 'Longitude'</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="dimensionDescription" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>Description of the axis</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_Dimension_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="msr:MD_Dimension"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_DimensionNameTypeCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>name of the dimension</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_DimensionNameTypeCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="msr:MD_DimensionNameTypeCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_GeometricObjectTypeCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>name of point or vector objects used to locate zero-, one-, two-, or three-dimensional spatial locations in the dataset</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_GeometricObjectTypeCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="msr:MD_GeometricObjectTypeCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_GeometricObjects" substitutionGroup="gco:AbstractObject" type="msr:MD_GeometricObjects_Type">
-    <annotation>
-      <documentation>number of objects, listed by geometric object type, used in the dataset</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_GeometricObjects_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="geometricObjectType" type="msr:MD_GeometricObjectTypeCode_PropertyType">
-            <annotation>
-              <documentation>name of point or vector objects used to locate zero-, one-, two-, or three-dimensional spatial locations in the dataset</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="geometricObjectCount" type="gco:Integer_PropertyType">
-            <annotation>
-              <documentation>total number of the point or vector object type occurring in the dataset</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_GeometricObjects_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="msr:MD_GeometricObjects"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_Georectified" substitutionGroup="msr:MD_GridSpatialRepresentation" type="msr:MD_Georectified_Type">
-    <annotation>
-      <documentation>grid whose cells are regularly spaced in a geographic (i.e., lat / long) or map coordinate system defined in the Spatial Referencing System (SRS) so that any cell in the grid can be geolocated given its grid coordinate and the grid origin, cell spacing, and orientation</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_Georectified_Type">
-    <complexContent>
-      <extension base="msr:MD_GridSpatialRepresentation_Type">
-        <sequence>
-          <element name="checkPointAvailability" type="gco:Boolean_PropertyType">
-            <annotation>
-              <documentation>indication of whether or not geographic position points are available to test the accuracy of the georeferenced grid data</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="checkPointDescription" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>description of geographic position points used to test the accuracy of the georeferenced grid data</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="4" minOccurs="2" name="cornerPoints" type="gmw:GM_Point_PropertyType">
-            <annotation>
-              <documentation>earth location in the coordinate system defined by the Spatial Reference System and the grid coordinate of the cells at opposite ends of grid coverage along two diagonals in the grid spatial dimensions. There are four corner points in a georectified grid; at least two corner points along one diagonal are required. The first corner point corresponds to the origin of the grid.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="centrePoint" type="gmw:GM_Point_PropertyType">
-            <annotation>
-              <documentation>earth location in the coordinate system defined by the Spatial Reference System and the grid coordinate of the cell halfway between opposite ends of the grid in the spatial dimensions</documentation>
-            </annotation>
-          </element>
-          <element name="pointInPixel" type="msr:MD_PixelOrientationCode_PropertyType">
-            <annotation>
-              <documentation>point in a pixel corresponding to the Earth location of the pixel</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="transformationDimensionDescription" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>general description of the transformation</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="2" minOccurs="0" name="transformationDimensionMapping" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>information about which grid axes are the spatial (map) axes</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_Georectified_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="msr:MD_Georectified"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_Georeferenceable" substitutionGroup="msr:MD_GridSpatialRepresentation" type="msr:MD_Georeferenceable_Type">
-    <annotation>
-      <documentation>grid with cells irregularly spaced in any given geographic/map projection coordinate system, whose individual cells can be geolocated using geolocation information supplied with the data but cannot be geolocated from the grid properties alone</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_Georeferenceable_Type">
-    <complexContent>
-      <extension base="msr:MD_GridSpatialRepresentation_Type">
-        <sequence>
-          <element name="controlPointAvailability" type="gco:Boolean_PropertyType">
-            <annotation>
-              <documentation>indication of whether or not control point(s) exists</documentation>
-            </annotation>
-          </element>
-          <element name="orientationParameterAvailability" type="gco:Boolean_PropertyType">
-            <annotation>
-              <documentation>indication of whether or not orientation parameters are available</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="orientationParameterDescription" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>description of parameters used to describe sensor orientation</documentation>
-            </annotation>
-          </element>
-          <element name="georeferencedParameters" type="gco:Record_PropertyType">
-            <annotation>
-              <documentation>terms which support grid data georeferencing</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="parameterCitation" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>reference providing description of the parameters</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_Georeferenceable_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="msr:MD_Georeferenceable"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <!-- SMR 2015-02-12 manually change substituion group from AbstractObject to AbstractMD_SpatialRepresentation -->
-  <element name="MD_GridSpatialRepresentation" substitutionGroup="msr:AbstractMD_SpatialRepresentation" type="msr:MD_GridSpatialRepresentation_Type">
-    <annotation>
-      <documentation>information about grid spatial objects in the resource</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_GridSpatialRepresentation_Type">
-    <complexContent>
-      <extension base="msr:AbstractMD_SpatialRepresentation_Type">
-        <sequence>
-          <element name="numberOfDimensions" type="gco:Integer_PropertyType">
-            <annotation>
-              <documentation>number of independent spatial-temporal axes</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="axisDimensionProperties" type="msr:MD_Dimension_PropertyType">
-            <annotation>
-              <documentation>information about spatial-temporal axis properties</documentation>
-            </annotation>
-          </element>
-          <element name="cellGeometry" type="msr:MD_CellGeometryCode_PropertyType">
-            <annotation>
-              <documentation>identification of grid data as point or cell</documentation>
-            </annotation>
-          </element>
-          <element name="transformationParameterAvailability" type="gco:Boolean_PropertyType">
-            <annotation>
-              <documentation>indication of whether or not parameters for transformation between image coordinates and geographic or map coordinates exist (are available)</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_GridSpatialRepresentation_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="msr:MD_GridSpatialRepresentation"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_PixelOrientationCode" substitutionGroup="gco:CharacterString" type="msr:MD_PixelOrientationCode_Type">
-    <annotation>
-      <documentation>point in a pixel corresponding to the Earth location of the pixel</documentation>
-    </annotation>
-  </element>
-  <simpleType name="MD_PixelOrientationCode_Type">
-    <annotation>
-      <documentation>point in a pixel corresponding to the Earth location of the pixel</documentation>
-    </annotation>
-    <restriction base="string">
-      <enumeration value="centre">
-        <annotation>
-          <documentation>point halfway between the lower left and the upper right of the pixel</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="lowerLeft">
-        <annotation>
-          <documentation>the corner in the pixel closest to the origin of the SRS; if two are at the same distance from the origin, the one with the smallest x-value</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="lowerRight">
-        <annotation>
-          <documentation>next corner counterclockwise from the lower left</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="upperRight">
-        <annotation>
-          <documentation>next corner counterclockwise from the lower right</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="upperLeft">
-        <annotation>
-          <documentation>next corner counterclockwise from the upper right</documentation>
-        </annotation>
-      </enumeration>
-    </restriction>
-  </simpleType>
-  <complexType name="MD_PixelOrientationCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="msr:MD_PixelOrientationCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MD_TopologyLevelCode" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>degree of complexity of the spatial relationships</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_TopologyLevelCode_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="msr:MD_TopologyLevelCode"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  
-  <!-- SMR 2015-02-12 manually change substituion group from AbstractObject to AbstractMD_SpatialRepresentation -->
-  <element name="MD_VectorSpatialRepresentation" substitutionGroup="msr:AbstractMD_SpatialRepresentation" type="msr:MD_VectorSpatialRepresentation_Type">
-    <annotation>
-      <documentation>information about the vector spatial objects in the resource</documentation>
-    </annotation>
-  </element>
-  <complexType name="MD_VectorSpatialRepresentation_Type">
-    <complexContent>
-      <extension base="msr:AbstractMD_SpatialRepresentation_Type">
-        <sequence>
-          <element minOccurs="0" name="topologyLevel" type="msr:MD_TopologyLevelCode_PropertyType">
-            <annotation>
-              <documentation>code which identifies the degree of complexity of the spatial relationships</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="geometricObjects" type="msr:MD_GeometricObjects_PropertyType">
-            <annotation>
-              <documentation>information about the geometric objects used in the resource</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MD_VectorSpatialRepresentation_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="msr:MD_VectorSpatialRepresentation"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/msr/1.0/spatialRepresentationImagery.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/msr/1.0/spatialRepresentationImagery.xsd
deleted file mode 100644
index 55136511f..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/msr/1.0/spatialRepresentationImagery.xsd
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-  xmlns:dqc="http://standards.iso.org/iso/19157/-2/dqc/1.0" 
-  xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" 
-  xmlns:gmw="http://standards.iso.org/iso/19115/-3/gmw/1.0" 
-  xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" 
-  xmlns:msr="http://standards.iso.org/iso/19115/-3/msr/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/msr/1.0" version="1.0">
-  <annotation>
-    <documentation>Name: SpatialRepresentation
-Position: 3</documentation>
-  </annotation>
-<!--  <include schemaLocation="msr.xsd"/>-->
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gmw/1.0" schemaLocation="../../../../19115/-3/gmw/1.0/gmw.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19157/-2/dqc/1.0" schemaLocation="../../../../19157/-2/dqc/1.0/dqc.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="MI_GCP" substitutionGroup="gco:AbstractObject" type="msr:MI_GCP_Type"/>
-  <complexType name="MI_GCP_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="geographicCoordinates" type="gmw:GM_Point_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="accuracyReport" type="dqc:Abstract_QualityElement_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MI_GCP_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="msr:MI_GCP"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_GCPCollection" substitutionGroup="msr:AbstractMI_GeolocationInformation" type="msr:MI_GCPCollection_Type"/>
-  <complexType name="MI_GCPCollection_Type">
-    <complexContent>
-      <extension base="msr:AbstractMI_GeolocationInformation_Type">
-        <sequence>
-          <element maxOccurs="unbounded" name="gcp" type="msr:MI_GCP_PropertyType"/>
-          <element name="collectionIdentification" type="gco:Integer_PropertyType"/>
-          <element name="collectionName" type="gco:CharacterString_PropertyType"/>
-          <element name="coordinateReferenceSystem" type="mcc:Abstract_ReferenceSystem_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MI_GCPCollection_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="msr:MI_GCPCollection"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element abstract="true" name="AbstractMI_GeolocationInformation" substitutionGroup="gco:AbstractObject" type="msr:AbstractMI_GeolocationInformation_Type"/>
-  <complexType abstract="true" name="AbstractMI_GeolocationInformation_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="qualityInfo" type="dqc:Abstract_DataQuality_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="AbstractMI_GeolocationInformation_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="msr:AbstractMI_GeolocationInformation"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_Georectified" substitutionGroup="msr:MD_Georectified" type="msr:MI_Georectified_Type">
-    <annotation>
-      <documentation>Description: extends georectified grid description to include associated checkpoints
-shortName: IGeorect</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_Georectified_Type">
-    <complexContent>
-      <extension base="msr:MD_Georectified_Type">
-        <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="checkPoint" type="msr:MI_GCP_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MI_Georectified_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="msr:MI_Georectified"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="MI_Georeferenceable" substitutionGroup="msr:MD_Georeferenceable" type="msr:MI_Georeferenceable_Type">
-    <annotation>
-      <documentation>Description: Description of information provided in metadata that allows the geographic or map location raster points to be located
-FGDC: Georeferencing_Description
-shortName: IGeoref</documentation>
-    </annotation>
-  </element>
-  <complexType name="MI_Georeferenceable_Type">
-    <complexContent>
-      <extension base="msr:MD_Georeferenceable_Type">
-        <sequence>
-          <element minOccurs="0" name="platformParameters" type="mcc:Abstract_Platform_PropertyType"/>
-          <element maxOccurs="unbounded" name="geolocationInformation" type="msr:AbstractMI_GeolocationInformation_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="MI_Georeferenceable_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="msr:MI_Georeferenceable"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/codelists.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/codelists.html
deleted file mode 100644
index cd7389abe..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/codelists.html
+++ /dev/null
@@ -1,130 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0" xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>
-         Codelists from the Metadata for Services (srv) Namespace
-         
-      </title>
-   </head>
-   <h1>ISO 19115-3 Codelist Report</h1>
-   <h2>
-      Codelists from the Metadata for Services (srv) Namespace
-      
-   </h2>
-   <table>
-      <tr><b>
-            <td>Scope</td></b><td>
-            Codelists from the Metadata for Services (srv) Namespace
-            
-         </td>
-      </tr>
-      <tr><b>
-            <td>Field of Application</td></b><td>
-            ISO TC211 Metadata Standards
-            
-         </td>
-      </tr>
-      <tr><b>
-            <td>Version (Date)</td></b><td>
-            0.1
-             ()
-         </td>
-      </tr>
-   </table>
-   <h2>
-      SV_CouplingType
-       (
-      SV_CouplingType
-      ):
-   </h2><b>Description: </b>
-   class of information to which the referencing entity
-   applies
-   
-   <table width="95%" border="1" cellpadding="2" cellspacing="2">
-      <tr>
-         <th valign="top">Entry</th>
-         <th valign="top">Definition</th>
-      </tr>
-      <tr>
-         <td valign="top">
-            SV_CouplingType_loose
-            
-         </td>
-         <td valign="top">
-            service instance is loosely coupled with a data instance,
-            i.e. no MD_DataIdentification class has to be described
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            SV_CouplingType_mixed
-            
-         </td>
-         <td valign="top">
-            service instance is mixed coupled with a data instance, i.e.
-            MD_DataIdentification describes the associated data instance and additionally
-            the service instance might work with other external data
-            instances
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            SV_CouplingType_tight
-            
-         </td>
-         <td valign="top">
-            service instance is tightly coupled with a data instance,
-            i.e. MD_DataIdentification class MUST be described
-            
-         </td>
-      </tr>
-   </table><a href="#top">top</a><h2>
-      SV_ParameterDirection
-       (
-      SV_ParameterDirection
-      ):
-   </h2><b>Description: </b>
-   class of information to which the referencing entity
-   applies
-   
-   <table width="95%" border="1" cellpadding="2" cellspacing="2">
-      <tr>
-         <th valign="top">Entry</th>
-         <th valign="top">Definition</th>
-      </tr>
-      <tr>
-         <td valign="top">
-            SV_ParameterDirection_in
-            
-         </td>
-         <td valign="top">
-            the parameter is an input parameter to the service
-            instance
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            SV_ParameterDirection_out
-            
-         </td>
-         <td valign="top">
-            the parameter is an output parameter to the service
-            instance
-            
-         </td>
-      </tr>
-      <tr>
-         <td valign="top">
-            SV_ParameterDirection_inout
-            
-         </td>
-         <td valign="top">
-            the parameter is both an input and output parameter to the
-            service instance
-            
-         </td>
-      </tr>
-   </table><a href="#top">top</a><hr/><i>Stylesheet: CT_CodelistHTML.xsl Version: 2015-04-17</i></html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/codelists.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/codelists.xml
deleted file mode 100644
index d16ccc69d..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/codelists.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cat:CT_CodelistCatalogue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xmlns:cat="http://standards.iso.org/iso/19115/-3/cat/1.0"
-   xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0"
-   xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:gml="http://www.opengis.net/gml/3.2"
-   xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/cat/1.0 ../../../-3/cat/1.0/cat.xsd">
-   <!--=====Catalogue description=====-->
-   <cat:name>
-      <gco:CharacterString>Codelists from the Metadata for Services (srv) Namespace</gco:CharacterString>
-   </cat:name>
-   <cat:scope>
-      <gco:CharacterString>Codelists from the Metadata for Services (srv) Namespace</gco:CharacterString>
-   </cat:scope>
-   <cat:fieldOfApplication>
-      <gco:CharacterString>ISO TC211 Metadata Standards</gco:CharacterString>
-   </cat:fieldOfApplication>
-   <cat:versionNumber>
-      <gco:CharacterString>0.1</gco:CharacterString>
-   </cat:versionNumber>
-   <cat:versionDate>
-      <gco:Date>2015-04-18</gco:Date>
-   </cat:versionDate>
-   <cat:locale>
-      <lan:PT_Locale>
-         <lan:language>
-            <lan:LanguageCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codelists.xml#LanguageCode" codeListValue="eng">eng</lan:LanguageCode>
-         </lan:language>
-         <lan:characterEncoding>
-            <lan:MD_CharacterSetCode codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codelists.xml#MD_CharacterSetCode"
-               codeListValue="UTF-8">UTF-8</lan:MD_CharacterSetCode>
-         </lan:characterEncoding>
-      </lan:PT_Locale>
-   </cat:locale>
-   <!--============================= Codelists =======================================-->
-   <!-- SV_CouplingType  -->
-   <cat:codelistItem>
-      <cat:CT_Codelist id="SV_CouplingType">
-         <cat:identifier>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >SV_CouplingType</gco:ScopedName>
-         </cat:identifier>
-         <cat:name>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >SV_CouplingType</gco:ScopedName>
-         </cat:name>
-         <cat:definition>
-            <gco:CharacterString>class of information to which the referencing entity
-               applies</gco:CharacterString>
-         </cat:definition>
-         <cat:description>
-            <gco:CharacterString>class of information to which the referencing entity
-               applies</gco:CharacterString>
-         </cat:description>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="SV_CouplingType_loose">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >SV_CouplingType_loose</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>service instance is loosely coupled with a data instance,
-                     i.e. no MD_DataIdentification class has to be described</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="SV_CouplingType_mixed">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >SV_CouplingType_mixed</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>service instance is mixed coupled with a data instance, i.e.
-                     MD_DataIdentification describes the associated data instance and additionally
-                     the service instance might work with other external data
-                     instances</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="SV_CouplingType_tight">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >SV_CouplingType_tight</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>service instance is tightly coupled with a data instance,
-                     i.e. MD_DataIdentification class MUST be described</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-      </cat:CT_Codelist>
-   </cat:codelistItem>
-   <!-- SV_ParameterDirection  -->
-   <cat:codelistItem>
-      <cat:CT_Codelist id="SV_ParameterDirection">
-         <cat:identifier>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >SV_ParameterDirection</gco:ScopedName>
-         </cat:identifier>
-         <cat:name>
-            <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-               >SV_ParameterDirection</gco:ScopedName>
-         </cat:name>
-         <cat:definition>
-            <gco:CharacterString>class of information to which the referencing entity
-               applies</gco:CharacterString>
-         </cat:definition>
-         <cat:description>
-            <gco:CharacterString>class of information to which the referencing entity
-               applies</gco:CharacterString>
-         </cat:description>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="SV_ParameterDirection_in">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >SV_ParameterDirection_in</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>the parameter is an input parameter to the service
-                     instance</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="SV_ParameterDirection_out">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >SV_ParameterDirection_out</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>the parameter is an output parameter to the service
-                     instance</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-         <cat:codeEntry>
-            <cat:CT_CodelistValue id="SV_ParameterDirection_inout">
-               <cat:identifier>
-                  <gco:ScopedName codeSpace="http://standards.iso.org/iso/19115"
-                     >SV_ParameterDirection_inout</gco:ScopedName>
-               </cat:identifier>
-               <cat:definition>
-                  <gco:CharacterString>the parameter is both an input and output parameter to the
-                     service instance</gco:CharacterString>
-               </cat:definition>
-            </cat:CT_CodelistValue>
-         </cat:codeEntry>
-      </cat:CT_Codelist>
-   </cat:codelistItem>
-   <!--=== EOF ===-->
-</cat:CT_CodelistCatalogue>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/index.html b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/index.html
deleted file mode 100644
index 028831e16..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/index.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<html xmlns:xs="http://www.w3.org/2001/XMLSchema">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <title>Metadata for Services (SRV) Version: 2.0</title>
-   </head>
-   <body>
-      <h1>Metadata for Services (SRV) Version: 2.0</h1><img src="srv.png"><h2>Description</h2>
-      <p>SRV 2.0 is an XML Schema implementation derived from ISO ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.14.  It includes elements for describing services. The XML schema was encoded using the rules described in ISO/TS 19139:2007, Clause 8 and implementation approach from ISO/TS19115-3, Clause
-         8.
-      </p>
-      <h2>Sample XML files for srv 2.0</h2><a href="srv_invalid.xml">srv_invalid.xml</a> <a href="srv_valid.xml">srv_valid.xml</a> 
-      <h2>CodeLists for srv 2.0</h2><a href="codelists.html">codelists.html</a> <a href="codelists.xml">codelists.xml</a> 
-      <h2>XML Namespace for srv 2.0</h2>
-      <p>The namespace URI for srv 2.0 is <b>http://standards.iso.org/iso/19115/-3/srv/2.0</b>.
-      </p>
-      <h2>XML Schema for srv 2.0</h2>
-      <p><b><a href="srv.xsd">srv.xsd</a></b> is the XML Schema document to be referenced by XML documents containing XML elements
-         in the srv 2.0 namespace or by XML Schema documents importing the srv 2.0 namespace. This XML schema includes (indirectly) all the implemented concepts of
-         the srv namespace, but it
-         does not contain the declaration of any types.
-      </p>
-      <p><i>NOTE: The XML Schema for srv 2.0 are available <a href="srv.zip">here</a>. A zip archive including all the XML Schema Implementations defined in ISO/TS 19115-3
-            and related standards is also <a href="http://standards.iso.org/iso/19115/19115.zip">available</a>.</i></p>
-      <h2>Related XML Schema for srv 2.0</h2>
-      <p><b><a href="serviceInformation.xsd">serviceInformation.xsd</a></b> implements the UML conceptual schema defined in ISO 19115-1, Geographic Information - Metadata - Part 1: Fundamentals, Clause 6.5.14. It was created using the encoding rules defined in ISO 19118, ISO
-         19139, and the implementation approach described in ISO 19115-3 and contains the following
-         classes (codeLists are bold): DCPList, SV_CoupledResource, SV_CouplingType, SV_OperationChainMetadata, SV_OperationMetadata, SV_Parameter, SV_ParameterDirection, and SV_ServiceIdentification
-      </p>
-      <h2>Related XML Namespaces for srv 2.0</h2> The srv 2.0 namespace imports these other namespaces: 
-      <table border="1" cellpadding="3" cellspacing="3">
-         <tr>
-            <th>Name</th>
-            <th>Standard Prefix</th>
-            <th>Namespace Location</th>
-            <th>Schema Location</th>
-         </tr>
-         <tr>
-            <td>Geographic COmmon</td>
-            <td>gco</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/gco/1.0">http://standards.iso.org/iso/19115/-3/gco/1.0</a></td>
-            <td>../../../../19115/-3/gco/1.0/gco.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata Common Classes</td>
-            <td>mcc</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mcc/1.0">http://standards.iso.org/iso/19115/-3/mcc/1.0</a></td>
-            <td>../../../../19115/-3/mcc/1.0/mcc.xsd</td>
-         </tr>
-         <tr>
-            <td>Metadata for Resource Identification</td>
-            <td>mri</td>
-            <td><a href="http://standards.iso.org/iso/19115/-3/mri/1.0">http://standards.iso.org/iso/19115/-3/mri/1.0</a></td>
-            <td>../../../../19115/-3/mri/1.0/mri.xsd</td>
-         </tr>
-      </table>
-      <h2>Schematron Validation Rules for srv 2.0</h2> Schematron rules for validating instance documents of the srv 2.0 namespace are in <a href="srv.sch">srv.sch</a>. Other schematron rule sets that are
-      required for a complete validation are: gco.sch, mcc.sch, mri.sch, mcc.sch, and mri.sch
-      <h2>Working Versions</h2> When revisions to these schema become necessary, they will be managed in the <a href="https://github.com/ISO-TC211/XML">ISO TC211 Git Repository</a>. 
-      <hr>
-      <p><font size="small" face="italic">Written by writeHTMLFiles Version: 2015-06-06 at 2015-06-07T12:11:49.406-05:00</font></p>
-   </body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/serviceInformation.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/serviceInformation.xsd
deleted file mode 100644
index e843b11bf..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/serviceInformation.xsd
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0" xmlns:srv="http://standards.iso.org/iso/19115/-3/srv/2.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/srv/2.0" version="2.0">
-  <include schemaLocation="srv.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/gco/1.0" schemaLocation="../../../../19115/-3/gco/1.0/gco.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mri/1.0" schemaLocation="../../../../19115/-3/mri/1.0/mri.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="DCPList" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>class of information to which the referencing entity applies</documentation>
-    </annotation>
-  </element>
-  <complexType name="DCPList_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="srv:DCPList"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="SV_CoupledResource" substitutionGroup="gco:AbstractObject" type="srv:SV_CoupledResource_Type">
-    <annotation>
-      <documentation>links a given operationName (mandatory attribute of SV_OperationMetadata) with a data set identified by an 'identifier'</documentation>
-    </annotation>
-  </element>
-  <complexType name="SV_CoupledResource_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element minOccurs="0" name="scopedName" type="gco:ScopedName_PropertyType">
-            <annotation>
-              <documentation>scoped identifier of the resource in the context of the given service instance NOTE: name of the resources (i.e. dataset) as it is used by a service instance (e.g. layer name or featureTypeName).</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="resourceReference" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>reference to the dataset on which the service operates</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="operation" type="srv:SV_OperationMetadata_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="resource" type="mri:MD_DataIdentification_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="SV_CoupledResource_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="srv:SV_CoupledResource"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="SV_CouplingType" substitutionGroup="gco:CharacterString" type="gco:CodeListValue_Type">
-    <annotation>
-      <documentation>class of information to which the referencing entity applies</documentation>
-    </annotation>
-  </element>
-  <complexType name="SV_CouplingType_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="srv:SV_CouplingType"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="SV_OperationChainMetadata" substitutionGroup="gco:AbstractObject" type="srv:SV_OperationChainMetadata_Type">
-    <annotation>
-      <documentation>Operation Chain Information</documentation>
-    </annotation>
-  </element>
-  <complexType name="SV_OperationChainMetadata_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="name" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>the name, as used by the service for this chain</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="description" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>a narrative explanation of the services in the chain and resulting output</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" name="operation" type="srv:SV_OperationMetadata_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="SV_OperationChainMetadata_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="srv:SV_OperationChainMetadata"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="SV_OperationMetadata" substitutionGroup="gco:AbstractObject" type="srv:SV_OperationMetadata_Type">
-    <annotation>
-      <documentation>describes the signature of one and only one method provided by the service</documentation>
-    </annotation>
-  </element>
-  <complexType name="SV_OperationMetadata_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="operationName" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>a unique identifier for this interface</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" name="distributedComputingPlatform" type="srv:DCPList_PropertyType">
-            <annotation>
-              <documentation>distributed computing platforms on which the operation has been implemented</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="operationDescription" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>free text description of the intent of the operation and the results of the operation</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="invocationName" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>the name used to invoke this interface within the context of the DCP. The name is identical for all DCPs.</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" name="connectPoint" type="mcc:Abstract_OnlineResource_PropertyType">
-            <annotation>
-              <documentation>handle for accessing the service interface</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="parameter" type="srv:SV_Parameter_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="dependsOn" type="srv:SV_OperationMetadata_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="SV_OperationMetadata_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="srv:SV_OperationMetadata"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="SV_Parameter" substitutionGroup="gco:AbstractObject" type="srv:SV_Parameter_Type">
-    <annotation>
-      <documentation>parameter information</documentation>
-    </annotation>
-  </element>
-  <complexType name="SV_Parameter_Type">
-    <complexContent>
-      <extension base="gco:AbstractObject_Type">
-        <sequence>
-          <element name="name" type="gco:MemberName_PropertyType">
-            <annotation>
-              <documentation>the name, as used by the service for this parameter</documentation>
-            </annotation>
-          </element>
-          <element name="direction" type="srv:SV_ParameterDirection_PropertyType">
-            <annotation>
-              <documentation>indication if the parameter is an input to the service, an output or both</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="description" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>a narrative explanation of the role of the parameter</documentation>
-            </annotation>
-          </element>
-          <element name="optionality" type="gco:Boolean_PropertyType">
-            <annotation>
-              <documentation>indication if the parameter is required</documentation>
-            </annotation>
-          </element>
-          <element name="repeatability" type="gco:Boolean_PropertyType">
-            <annotation>
-              <documentation>indication if more than one value of the parameter may be provided</documentation>
-            </annotation>
-          </element>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="SV_Parameter_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="srv:SV_Parameter"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="SV_ParameterDirection" substitutionGroup="gco:CharacterString" type="srv:SV_ParameterDirection_Type">
-    <annotation>
-      <documentation>class of information to which the referencing entity applies</documentation>
-    </annotation>
-  </element>
-  <simpleType name="SV_ParameterDirection_Type">
-    <annotation>
-      <documentation>class of information to which the referencing entity applies</documentation>
-    </annotation>
-    <restriction base="string">
-      <enumeration value="in">
-        <annotation>
-          <documentation>the parameter is an input parameter to the service instance</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="out">
-        <annotation>
-          <documentation>the parameter is an output parameter to the service instance</documentation>
-        </annotation>
-      </enumeration>
-      <enumeration value="in/out">
-        <annotation>
-          <documentation>the parameter is both an input and output parameter to the service instance</documentation>
-        </annotation>
-      </enumeration>
-    </restriction>
-  </simpleType>
-  <complexType name="SV_ParameterDirection_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="srv:SV_ParameterDirection"/>
-    </sequence>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-  <element name="SV_ServiceIdentification" substitutionGroup="mri:AbstractMD_Identification" type="srv:SV_ServiceIdentification_Type">
-    <annotation>
-      <documentation>identification of capabilities which a service provider makes available to a service user through a set of interfaces that define a behaviour - See ISO 19119 for further information</documentation>
-    </annotation>
-  </element>
-  <complexType name="SV_ServiceIdentification_Type">
-    <complexContent>
-      <extension base="mri:AbstractMD_Identification_Type">
-        <sequence>
-          <element name="serviceType" type="gco:GenericName_PropertyType">
-            <annotation>
-              <documentation>a service type name, E.G. 'discovery', 'view', 'download', 'transformation', or 'invoke'</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="serviceTypeVersion" type="gco:CharacterString_PropertyType">
-            <annotation>
-              <documentation>provide for searching based on the version of serviceType. For example, we may only be interested in OGC Catalogue V1.1 services. If version is maintained as a separate attribute, users can easily search for all services of a type regardless of the version</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="accessProperties" type="mcc:Abstract_StandardOrderProcess_PropertyType">
-            <annotation>
-              <documentation>information about the availability of the service, including, 'fees' 'planned' 'available date and time' 'ordering instructions' 'turnaround'</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="couplingType" type="srv:SV_CouplingType_PropertyType">
-            <annotation>
-              <documentation>type of coupling between service and associated data (if exists)</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="coupledResource" type="srv:SV_CoupledResource_PropertyType">
-            <annotation>
-              <documentation>further description of the data coupling in the case of tightly coupled services</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="operatedDataset" type="mcc:Abstract_Citation_PropertyType">
-            <annotation>
-              <documentation>provides a reference to the dataset on which the service operates</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="profile" type="mcc:Abstract_Citation_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="serviceStandard" type="mcc:Abstract_Citation_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="containsOperations" type="srv:SV_OperationMetadata_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="operatesOn" type="mri:MD_DataIdentification_PropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="containsChain" type="srv:SV_OperationChainMetadata_PropertyType"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="SV_ServiceIdentification_PropertyType">
-    <sequence minOccurs="0">
-      <element ref="srv:SV_ServiceIdentification"/>
-    </sequence>
-    <attributeGroup ref="gco:ObjectReference"/>
-    <attribute ref="gco:nilReason"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/srv.png b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/srv.png
deleted file mode 100644
index 63997e5de..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/srv.png and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/srv.sch b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/srv.sch
deleted file mode 100644
index 2245073fd..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/srv.sch
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron">
-  <sch:ns prefix="srv" uri="http://standards.iso.org/iso/19115/-3/srv/2.0"/>
-  <!--
-    ISO 19115-3 base requirements for metadata instance documents
-    
-    See ISO19115-1:2014(E) page 23, Figure 18 Service metadata information classes
-  -->
-  
-  <!-- 
-    Rule: SV_ServiceIdentification
-    Ref: {count(containsChain + containsOperations) > 0}
-    -->
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.srv.chainoroperations-failure-en"
-      xml:lang="en">The service identification does not contain chain or operation.</sch:diagnostic>
-    <sch:diagnostic id="rule.srv.chainoroperations-failure-fr"
-      xml:lang="fr">L'identification du service ne contient ni chaîne d'opérations, ni opération.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.srv.chainoroperations-success-en"
-      xml:lang="en">
-      The service identification contains the following 
-      number of chains: <sch:value-of select="count($chains)"/>.
-      and number of operations: <sch:value-of select="count($operations)"/>.</sch:diagnostic>
-    <sch:diagnostic id="rule.srv.chainoroperations-success-fr"
-      xml:lang="fr">
-      L'identification du service contient 
-      le nombre de chaînes d'opérations suivant : <sch:value-of select="count($chains)"/>.
-      le nombre d'opérations : <sch:value-of select="count($operations)"/>.</sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.srv.chainoroperations">
-    <sch:title xml:lang="en">Service identification MUST contains chain or operations</sch:title>
-    <sch:title xml:lang="fr">L'identification du service DOIT contenir des chaînes d'opérations
-      ou des opérations</sch:title>
-    
-    <sch:rule context="//srv:SV_ServiceIdentification">
-      
-      <!-- Consider only containsChain or operationsName
-      having a name. -->
-      <sch:let name="chains" value="srv:containsChain[
-        normalize-space(srv:SV_OperationChainMetadata/srv:name) != '']"/>
-      <sch:let name="operations" value="srv:containsOperations[
-        normalize-space(srv:SV_OperationMetadata/srv:operationName) != '']"/>
-      <sch:let name="hasChainOrOperation" 
-        value="count($operations) + count($chains) > 0"/>
-      
-      <sch:assert test="$hasChainOrOperation"
-        diagnostics="rule.srv.chainoroperations-failure-en 
-                     rule.srv.chainoroperations-failure-fr"/>
-      
-      <sch:report test="$hasChainOrOperation"
-        diagnostics="rule.srv.chainoroperations-success-en 
-                     rule.srv.chainoroperations-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
-  
-  
-  <!-- 
-    Rule: SV_ServiceIdentification
-    Ref:  {If coupledResource exists then count(coupledResource) > 0}
-    Comment: Can't be validated using schematron AFA the existence
-    of the related object can't be defined. TODO-QUESTION
-    -->
-  
-  
-  <!-- 
-    Rule: SV_ServiceIdentification
-    Ref: {If coupledResource exists then count(couplingType) > 0}
-    -->
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.srv.coupledresource-failure-en"
-      xml:lang="en">The service identification MUST specify coupling type 
-      when coupled resource exist</sch:diagnostic>
-    <sch:diagnostic id="rule.srv.coupledresource-failure-fr"
-      xml:lang="fr">L'identification du service DOIT 
-      définir un type de couplage lorsqu'une ressource est couplée.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.srv.coupledresource-success-en"
-      xml:lang="en">
-      Number of coupled resources: <sch:value-of select="count($coupledResource)"/>.
-      Coupling type: "<sch:value-of select="$couplingType"/>".</sch:diagnostic>
-    <sch:diagnostic id="rule.srv.coupledresource-success-fr"
-      xml:lang="fr">
-      Nombre de ressources couplées : <sch:value-of select="count($coupledResource)"/>.
-      Type de couplage : "<sch:value-of select="$couplingType"/>".</sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.srv.coupledresource">
-    <sch:title xml:lang="en">Service identification MUST specify coupling type 
-      when coupled resource exist</sch:title>
-    <sch:title xml:lang="fr">L'identification du service DOIT 
-      définir un type de couplage lorsqu'une ressource est couplée</sch:title>
-    
-    <sch:rule context="//srv:SV_ServiceIdentification[srv:coupledResource]">
-      
-      <sch:let name="couplingType" 
-               value="srv:couplingType/
-                        srv:SV_CouplingType/@codeListValue[. != '']"/>
-      <sch:let name="coupledResource" value="srv:coupledResource"/>
-      <sch:let name="hasCouplingType" 
-        value="count($couplingType) > 0"/>
-      
-      <sch:assert test="$hasCouplingType"
-        diagnostics="rule.srv.coupledresource-failure-en 
-                     rule.srv.coupledresource-failure-fr"/>
-      
-      <sch:report test="$hasCouplingType"
-        diagnostics="rule.srv.coupledresource-success-en 
-                     rule.srv.coupledresource-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
-  
-  
-  
-  <!-- 
-    Rule: SV_ServiceIdentification
-    Ref: {If operatedDataset used then count (operatesOn) = 0}
-    -->
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.srv.operateddataset-failure-en"
-      xml:lang="en">The service identification define operatedDataset.
-      No operatesOn can be specified.</sch:diagnostic>
-    <sch:diagnostic id="rule.srv.operateddataset-failure-fr"
-      xml:lang="fr">L'identification du service utilise operatedDataset.
-      OperatesOn ne peut être utilisé dans ce cas.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.srv.operateddataset-success-en"
-      xml:lang="en">Service identification only use operated dataset.</sch:diagnostic>
-    <sch:diagnostic id="rule.srv.operateddataset-success-fr"
-      xml:lang="fr">L'identification du service n'utilise que operatedDataset.</sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.srv.operateddataset">
-    <sch:title xml:lang="en">Service identification MUST not use 
-      both operatedDataset and operatesOn</sch:title>
-    <sch:title xml:lang="fr">L'identification du service NE DOIT PAS 
-      utiliser en même temps operatedDataset et operatesOn</sch:title>
-    
-    <sch:rule context="//srv:SV_ServiceIdentification[srv:operatedDataset]">
-      
-      <sch:let name="operatesOn" value="srv:operatesOn"/>
-      <sch:let name="hasOperatesOn" 
-        value="count($operatesOn) > 0"/>
-      
-      <sch:assert test="not($hasOperatesOn)"
-        diagnostics="rule.srv.operateddataset-failure-en 
-                     rule.srv.operateddataset-failure-fr"/>
-      
-      <sch:report test="not($hasOperatesOn)"
-        diagnostics="rule.srv.operateddataset-success-en 
-                     rule.srv.operateddataset-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
-  
-  
-  
-  <!-- 
-    Rule: SV_ServiceIdentification
-    Ref: {If operatesOn used count(operatedDataset) = 0}
-    -->
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.srv.operatesononly-failure-en"
-      xml:lang="en">The service identification define operatesOn.
-      No operatedDataset can be specified.</sch:diagnostic>
-    <sch:diagnostic id="rule.srv.operatesononly-failure-fr"
-      xml:lang="fr">L'identification du service utilise operatesOn.
-      OperatedDataset ne peut être utilisé dans ce cas.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.srv.operatesononly-success-en"
-      xml:lang="en">The service identification only use operates on.</sch:diagnostic>
-    <sch:diagnostic id="rule.srv.operatesononly-success-fr"
-      xml:lang="fr">L'identification du service n'utilise que 
-      des éléments de type operatesOn.</sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.srv.operatesononly">
-    <sch:title xml:lang="en">Service identification MUST not use 
-      both operatesOn and operatedDataset</sch:title>
-    <sch:title xml:lang="fr">L'identification du service NE DOIT PAS 
-      utiliser en même temps operatesOn et operatedDataset</sch:title>
-    
-    <sch:rule context="//srv:SV_ServiceIdentification[srv:operatesOn]">
-      
-      <sch:let name="operatedDataset" value="srv:operatedDataset"/>
-      
-      <sch:let name="hasOperatedDataset" 
-        value="count($operatedDataset) > 0"/>
-      
-      <sch:assert test="not($hasOperatedDataset)"
-        diagnostics="rule.srv.operatesononly-failure-en 
-                     rule.srv.operatesononly-failure-fr"/>
-      
-      <sch:report test="not($hasOperatedDataset)"
-        diagnostics="rule.srv.operatesononly-success-en 
-                     rule.srv.operatesononly-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
-  
-  
-  
-  <!-- 
-    Rule: SV_CoupledResource
-    Ref: {count(resourceReference + resource) > 0}
-  -->
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.srv.harresourcereforresource-failure-en"
-      xml:lang="en">The coupled resource does not contains a resource 
-    nor a resource reference.</sch:diagnostic>
-    <sch:diagnostic id="rule.srv.harresourcereforresource-failure-fr"
-      xml:lang="fr">La ressource couplée ne contient ni une ressource
-    ni une référence à une ressource.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.srv.harresourcereforresource-success-en"
-      xml:lang="en">The coupled resource contains a resource or a resource reference.</sch:diagnostic>
-    <sch:diagnostic id="rule.srv.harresourcereforresource-success-fr"
-      xml:lang="fr">La ressource couplée contient une ressource ou une référence 
-      à une ressource.</sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.srv.harresourcereforresource">
-    <sch:title xml:lang="en">Coupled resource MUST contains 
-      a resource or a resource reference</sch:title>
-    <sch:title xml:lang="fr">Une ressource couplée DOIT
-      définir une ressource ou une référence à une ressource</sch:title>
-    
-    <sch:rule context="//srv:SV_CoupledResource">
-      
-      <sch:let name="resourceReference" value="srv:resourceReference"/>
-      <sch:let name="resource" value="srv:resource"/>
-      
-      <sch:let name="hasResourceReferenceOrResource" 
-        value="count($resourceReference) + count($resource) > 0"/>
-      
-      <sch:assert test="$hasResourceReferenceOrResource"
-        diagnostics="rule.srv.harresourcereforresource-failure-en 
-                     rule.srv.harresourcereforresource-failure-fr"/>
-      
-      <sch:report test="$hasResourceReferenceOrResource"
-        diagnostics="rule.srv.harresourcereforresource-success-en 
-                     rule.srv.harresourcereforresource-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
-  
-  
-  
-  
-  
-  
-  <!-- 
-    Rule: SV_CoupledResource
-    Ref: {If resource used then count(resourceReference) = 0}
-  -->
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.srv.coupledresourceonlyresource-failure-en"
-      xml:lang="en">The coupled resource contains both a resource 
-      and a resource reference.</sch:diagnostic>
-    <sch:diagnostic id="rule.srv.coupledresourceonlyresource-failure-fr"
-      xml:lang="fr">La ressource couplée utilise à la fois une ressource
-      et une référence à une ressource.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.srv.coupledresourceonlyresource-success-en"
-      xml:lang="en">The coupled resource contains only resources.</sch:diagnostic>
-    <sch:diagnostic id="rule.srv.coupledresourceonlyresource-success-fr"
-      xml:lang="fr">La ressource couplée contient uniquement des ressources.</sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.srv.coupledresourceonlyresource">
-    <sch:title xml:lang="en">Coupled resource MUST not use
-      both resource and resource reference</sch:title>
-    <sch:title xml:lang="fr">Une ressource couplée NE DOIT PAS
-      utiliser en même temps une ressource et une référence
-      à une ressource</sch:title>
-    
-    <sch:rule context="//srv:SV_CoupledResource[srv:resource]">
-      
-      <sch:let name="resourceReference" value="srv:resourceReference"/>
-      <sch:let name="hasResourceReference" 
-        value="count($resourceReference) > 0"/>
-      
-      <sch:assert test="not($hasResourceReference)"
-        diagnostics="rule.srv.coupledresourceonlyresource-failure-en 
-                     rule.srv.coupledresourceonlyresource-failure-fr"/>
-      
-      <sch:report test="not($hasResourceReference)"
-        diagnostics="rule.srv.coupledresourceonlyresource-success-en 
-                     rule.srv.coupledresourceonlyresource-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
-  
-  
-  <!-- 
-    Rule: SV_CoupledResource
-    Ref: {If resourceReference used then count(resource) = 0}
-  -->
-  
-  <sch:diagnostics>
-    <sch:diagnostic id="rule.srv.coupledresourceonlyresourceref-failure-en"
-      xml:lang="en">The coupled resource contains both a resource 
-      and a resource reference.</sch:diagnostic>
-    <sch:diagnostic id="rule.srv.coupledresourceonlyresourceref-failure-fr"
-      xml:lang="fr">La ressource couplée utilise à la fois une ressource
-      et une référence à une ressource.</sch:diagnostic>
-    
-    <sch:diagnostic id="rule.srv.coupledresourceonlyresourceref-success-en"
-      xml:lang="en">The coupled resource contains only resource references.</sch:diagnostic>
-    <sch:diagnostic id="rule.srv.coupledresourceonlyresourceref-success-fr"
-      xml:lang="fr">La ressource couplée contient uniquement des références à des ressources.</sch:diagnostic>
-  </sch:diagnostics>
-  
-  <sch:pattern id="rule.srv.coupledresourceonlyresourceref">
-    <sch:title xml:lang="en">Coupled resource MUST not use
-      both resource and resource reference</sch:title>
-    <sch:title xml:lang="fr">Une ressource couplée NE DOIT PAS
-      utiliser en même temps une ressource et une référence
-      à une ressource</sch:title>
-    
-    <sch:rule context="//srv:SV_CoupledResource[srv:resourceReference]">
-      
-      <sch:let name="resource" value="srv:resource"/>
-      <sch:let name="hasResource" 
-        value="count($resource) > 0"/>
-      
-      <sch:assert test="not($hasResource)"
-        diagnostics="rule.srv.coupledresourceonlyresourceref-failure-en 
-                     rule.srv.coupledresourceonlyresourceref-failure-fr"/>
-      
-      <sch:report test="not($hasResource)"
-        diagnostics="rule.srv.coupledresourceonlyresourceref-success-en 
-                     rule.srv.coupledresourceonlyresourceref-success-fr"/>
-    </sch:rule>
-  </sch:pattern>
-</sch:schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/srv.xsd b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/srv.xsd
deleted file mode 100644
index 9a082b4b6..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/srv.xsd
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0" xmlns:srv="http://standards.iso.org/iso/19115/-3/srv/2.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/srv/2.0" version="2.0">
-  <include schemaLocation="serviceInformation.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mcc/1.0" schemaLocation="../../../../19115/-3/mcc/1.0/mcc.xsd"/>
-  <import namespace="http://standards.iso.org/iso/19115/-3/mri/1.0" schemaLocation="../../../../19115/-3/mri/1.0/mri.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/srv.zip b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/srv.zip
deleted file mode 100644
index 1a384c7ca..000000000
Binary files a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/srv.zip and /dev/null differ
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/srv_invalid.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/srv_invalid.xml
deleted file mode 100644
index 042b913c4..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/srv_invalid.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mds/1.0 ../../mds/1.0/mds.xsd"
-   xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0"
-   xmlns:srv="http://standards.iso.org/iso/19115/-3/srv/2.0" xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0">
-   <mdb:metadataIdentifier/>
-   <mdb:contact/>
-   <mdb:dateInfo/>
-   <mdb:identificationInfo>
-      <srv:SV_ServiceIdentification>
-         <mri:citation/>
-         <mri:abstract/>
-         <srv:serviceType/>
-         <!-- Invalid for rule.srv.coupledresource
-         <srv:couplingType>
-            <srv:SV_CouplingType codeList="" codeListValue="tight"/>
-         </srv:couplingType> -->
-         <srv:coupledResource>
-            <srv:SV_CoupledResource>
-               <srv:resourceReference>
-                  <cit:CI_Citation>
-                     <cit:title>
-                        <gco:CharacterString>Reference</gco:CharacterString>
-                     </cit:title>
-                  </cit:CI_Citation>
-               </srv:resourceReference>
-            </srv:SV_CoupledResource>
-         </srv:coupledResource>
-         <!-- Invalid for rule.srv.hasresourcereforresource -->
-         <srv:coupledResource>
-            <srv:SV_CoupledResource>
-               <srv:scopedName>
-                  <gco:ScopedName>unknown</gco:ScopedName>
-               </srv:scopedName>
-            </srv:SV_CoupledResource>
-         </srv:coupledResource>
-         <!-- Invalid for rule.srv.coupledresourceonlyresource -->
-         <srv:coupledResource>
-            <srv:SV_CoupledResource>
-               <srv:resourceReference>
-                  <cit:CI_Citation>
-                     <cit:title>
-                        <gco:CharacterString>Reference</gco:CharacterString>
-                     </cit:title>
-                  </cit:CI_Citation>
-               </srv:resourceReference>
-               <srv:resource uuidref="MD022"/>
-            </srv:SV_CoupledResource>
-         </srv:coupledResource>
-         <!-- Invalid for rule rule.srv.chainoroperations -->
-         <!-- Invalid for rule.srv.operateddataset -->
-         <srv:operatedDataset uuidref="MD01"/>
-         <srv:containsOperations>
-            <srv:SV_OperationMetadata>
-               <srv:operationName>
-                  <gco:CharacterString/>
-               </srv:operationName>
-               <srv:distributedComputingPlatform/>
-               <srv:connectPoint/>
-            </srv:SV_OperationMetadata>
-         </srv:containsOperations>
-         <srv:operatesOn uuidref="MD01"/>
-         <srv:containsChain>
-            <srv:SV_OperationChainMetadata>
-               <srv:name>
-                  <gco:CharacterString/>
-               </srv:name>
-               <srv:operation/>
-            </srv:SV_OperationChainMetadata>
-         </srv:containsChain>
-      </srv:SV_ServiceIdentification>
-   </mdb:identificationInfo>
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/srv_valid.xml b/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/srv_valid.xml
deleted file mode 100644
index c994950aa..000000000
--- a/src/main/resources/input/IHW/xsd/standards.iso.org/ISO19115-2006/iso/19115/-3/srv/2.0/srv_valid.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mds/1.0 ../../mds/1.0/mds.xsd"
-   xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0"
-   xmlns:srv="http://standards.iso.org/iso/19115/-3/srv/2.0" xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/1.0">
-   <mdb:metadataIdentifier/>
-   <mdb:contact/>
-   <mdb:dateInfo/>
-   <mdb:identificationInfo>
-      <srv:SV_ServiceIdentification>
-         <mri:citation/>
-         <mri:abstract/>
-         <srv:serviceType>
-            <gco:ScopedName codeSpace="https://github.com/OSGeo/Cat-Interop">
-               OGC:WPS
-            </gco:ScopedName>
-         </srv:serviceType>
-         <srv:serviceTypeVersion>
-            <gco:CharacterString>1.0</gco:CharacterString>
-         </srv:serviceTypeVersion>
-         <!-- Valid for rule.srv.coupledresource -->
-         <srv:couplingType>
-            <srv:SV_CouplingType codeList="" codeListValue="loose"/>
-         </srv:couplingType>
-         <srv:coupledResource>
-            <srv:SV_CoupledResource>
-               <srv:resourceReference>
-                  <cit:CI_Citation>
-                     <cit:title>
-                        <gco:CharacterString>Reference</gco:CharacterString>
-                     </cit:title>
-                  </cit:CI_Citation>
-               </srv:resourceReference>
-            </srv:SV_CoupledResource>
-         </srv:coupledResource>
-         <!-- Valid for rule.srv.harresourcereforresource -->
-         <srv:coupledResource>
-            <srv:SV_CoupledResource>
-               <srv:resource uuidref="MD02"/>
-            </srv:SV_CoupledResource>
-         </srv:coupledResource>
-         <!-- Valid for rule.srv.operateddataset -->
-         <srv:operatedDataset uuidref="MD01"/>
-         <!-- Valid for rule rule.srv.chainoroperations -->
-         <srv:containsOperations>
-            <srv:SV_OperationMetadata>
-               <srv:operationName>
-                  <gco:CharacterString>operationName</gco:CharacterString>
-               </srv:operationName>
-               <srv:distributedComputingPlatform/>
-               <srv:connectPoint/>
-            </srv:SV_OperationMetadata>
-         </srv:containsOperations>
-         <srv:containsChain>
-            <srv:SV_OperationChainMetadata>
-               <srv:name>
-                  <gco:CharacterString>name</gco:CharacterString>
-               </srv:name>
-               <srv:operation/>
-            </srv:SV_OperationChainMetadata>
-         </srv:containsChain>
-      </srv:SV_ServiceIdentification>
-   </mdb:identificationInfo>
-   <mdb:identificationInfo>
-      <srv:SV_ServiceIdentification>
-         <mri:citation/>
-         <mri:abstract/>
-         <srv:serviceType/>
-         <!-- Valid for rule.srv.operateddataset -->
-         <srv:operatesOn uuidref="MD01"/>
-      </srv:SV_ServiceIdentification>
-   </mdb:identificationInfo>
-</mdb:MD_Metadata>
diff --git a/src/main/resources/input/IHW/xsd/www.geonovum.nl/NEN3610-20110301/NEN3610/v20110301/NEN3610_NEN3610_v1_0_0.xsd b/src/main/resources/input/IHW/xsd/www.geonovum.nl/NEN3610-20110301/NEN3610/v20110301/NEN3610_NEN3610_v1_0_0.xsd
deleted file mode 100644
index 95ad258ae..000000000
--- a/src/main/resources/input/IHW/xsd/www.geonovum.nl/NEN3610-20110301/NEN3610/v20110301/NEN3610_NEN3610_v1_0_0.xsd
+++ /dev/null
@@ -1,414 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:NEN3610="http://www.geonovum.nl/NEN3610/schemas/v20110301"
-           xmlns:GML3="http://www.opengis.net/gml/3.2"
-           xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           targetNamespace="http://www.geonovum.nl/NEN3610/schemas/v20110301"
-           elementFormDefault="qualified"
-           attributeFormDefault="unqualified"
-           version="1.0.0-3">
-   <xs:annotation>
-      <xs:appinfo source="http://www.kadaster.nl/schema-info/uri">http://www.geonovum.nl/NEN3610/schemas</xs:appinfo>
-      <xs:appinfo source="http://www.kadaster.nl/schema-info/version">1.0.0</xs:appinfo>
-      <xs:appinfo source="http://www.kadaster.nl/schema-info/phase">3</xs:appinfo>
-      <xs:appinfo source="http://www.kadaster.nl/schema-info/release">20110301</xs:appinfo>
-      <xs:appinfo source="http://www.kadaster.nl/schema-info/svn">$Id$</xs:appinfo>
-      <xs:documentation source="http://www.kadaster.nl/schema-info/file-location">/v20110301/NEN3610_NEN3610_v1_0_0.xsd</xs:documentation>
-      <xs:documentation source="http://www.kadaster.nl/schema-info/conversion">
-        Dit schema is samengesteld in overeenstemming met de codeerregels vastgelegd in  
-        "ISO 19118: Text of 19118 Geographic information - Encoding, as sent to the ISO Central 
-        Secretariat for publication"
-    </xs:documentation>
-      <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">Dit package bevat de volledige NEN3610-2011 UML. 
-Basis voor dit package is het door Geonovum gedistribueerde nen3610-2011-profile. Dit is uitgebreid met klassen Historie en Levensduur.  Daarnaast zijn stereotypes conform het Basisregistraties Metamodel opgenomen.
-Nb. GML constructies zijn als apart package gedefinieerd. </xs:documentation>
-   </xs:annotation>
-   <xs:import namespace="http://www.opengis.net/gml/3.2"
-      schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
-   <xs:element name="FunctioneelGebied" type="NEN3610:FunctioneelGebied" abstract="true"
-               substitutionGroup="NEN3610:GeoObject"/>
-   <xs:complexType name="FunctioneelGebied" abstract="true">
-      <xs:annotation>
-         <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-begrensd en benoemd gebied dat door een functionele eenheid wordt beschreven
--- Description --
-Voorbeelden zijn: bedrijventerrein, bungalowpark, plantsoen, begraafplaats, jachthaven, windmolenpark, recreatiegebied.
--- Source --
-NEN 3610:2011</xs:documentation>
-      </xs:annotation>
-      <xs:complexContent>
-         <xs:extension base="NEN3610:GeoObject">
-            <xs:sequence/>
-         </xs:extension>
-      </xs:complexContent>
-   </xs:complexType>
-   <xs:element name="Gebouw" type="NEN3610:Gebouw" abstract="true"
-               substitutionGroup="NEN3610:GeoObject"/>
-   <xs:complexType name="Gebouw" abstract="true">
-      <xs:annotation>
-         <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-vrijstaande, overdekte en geheel of gedeeltelijke met wanden omsloten toegankelijke ruimte, die direct of indirect met de grond is verbonden.
--- Description --
-Voorbeelden zijn: huis, schuur, flatgebouw, huizenblok, fabriek.
--- Source --
-NEN 3610:2011</xs:documentation>
-      </xs:annotation>
-      <xs:complexContent>
-         <xs:extension base="NEN3610:GeoObject">
-            <xs:sequence/>
-         </xs:extension>
-      </xs:complexContent>
-   </xs:complexType>
-   <xs:element name="GeoObject" type="NEN3610:GeoObject" abstract="true"/>
-   <xs:complexType name="GeoObject" abstract="true">
-      <xs:annotation>
-         <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-            abstractie van een fenomeen in de werkelijkheid, dat direct of indirect is geassocieerd met een locatie relatief ten opzichte van de aarde
-            -- Description --
-            Van deze klasse worden geen instanties gemaakt. Indien een object een geo-object is, is het altijd een instantie van een subklasse van GeoObject.
-            Alle subklassen van GeoObject hebben conform NEN-EN-ISO 19109:2005 het stereotype «featureType».
-            -- Source --
-            NEN 3610:2011</xs:documentation>
-      </xs:annotation>
-     <xs:sequence/>
-     <xs:attribute name="id" type="xs:ID" use="optional"/>
-   </xs:complexType>
-   <xs:element name="GeografischGebied" type="NEN3610:GeografischGebied" abstract="true"
-               substitutionGroup="NEN3610:GeoObject"/>
-   <xs:complexType name="GeografischGebied" abstract="true">
-      <xs:annotation>
-         <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-geografisch benoemd of aangeduid gebied
--- Description --
-De grenzen zijn niet altijd exact vastgesteld. Voorbeelden zijn: Noordoostpolder, Midden-Nederland, rivierengebied, Veluwe, Zuid-Limburg, kustgebied.
--- Source --
-NEN 3610:2011</xs:documentation>
-      </xs:annotation>
-      <xs:complexContent>
-         <xs:extension base="NEN3610:GeoObject">
-            <xs:sequence/>
-         </xs:extension>
-      </xs:complexContent>
-   </xs:complexType>
-   <xs:element name="Historie" type="NEN3610:Historie" abstract="false"/>
-   <xs:complexType name="Historie" abstract="false">
-      <xs:annotation>
-         <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">Gegevens waarmee historie vastgelegd wordt. Historie betreft alleen voorkomens van objecten, dus het object op een bepaald moment. De historie is materieel (object in de werkelijkheid) en formeel (object in de registratie).
-
-De opbouw van Historie is gebaseerd op NEN3610:2011.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="beginGeldigheid" type="xs:dateTime" minOccurs="1" maxOccurs="1">
-            <xs:annotation>
-               <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-start van de periode waarop deze instantie van het object geldig is in de werkelijkheid.
--- Description --
-Er zijn verschillende datatypes voor de represenstatie van een tijdstip: Afhankelijk van de gebruikerswensen m.b.t. granulariteit kan o.a. worden gekozen uit types TM_Instant, Date of DateTime.
--- Source --
-NEN 3610:2011 en StUF 03.01</xs:documentation>
-            </xs:annotation>
-         </xs:element>
-         <xs:element name="eindGeldigheid" type="xs:dateTime" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-eind van de periode waarop deze instantie van het object geldig is in de werkelijkheid. Wanneer deze waarde niet is ingevuld is de instantie nog geldig
--- Description --
-Er zijn verschillende datatypes voor de representatie van een tijdstip: Afhankelijk van de gebruikerswensen m.b.t. granulariteit kan o.a. worden gekozen uit types TM_Instant, Date of DateTime.
--- Source --
-NEN 3610:2011 en StUF 03.01</xs:documentation>
-            </xs:annotation>
-         </xs:element>
-         <xs:element name="tijdstipRegistratie" type="xs:dateTime" minOccurs="1" maxOccurs="1">
-            <xs:annotation>
-               <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-tijdstip waarop deze instantie van het object is opgenomen in de registratie
--- Description --
-Er zijn verschillende datatypes voor de representatie van een tijdstip: Afhankelijk van de gebruikerswensen m.b.t. granulariteit kan o.a. worden gekozen uit types TM_Instant, Date of DateTime. Voor formele historie zal DateTime in vrijwel alle gevallen de beste keuze zijn.
--- Source --
-NEN 3610:2011 en StUF 03.01</xs:documentation>
-            </xs:annotation>
-         </xs:element>
-         <xs:element name="eindRegistratie" type="xs:dateTime" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-eind van de periode waarop deze instantie van het object geldig is in de registratie. Wanneer deze waarde niet is ingevuld is de instantie nog geldig
--- Description --
-Er zijn verschillende datatypes voor de representatie van een tijdstip: Afhankelijk van de gebruikerswensen m.b.t. granulariteit kan o,a, gekozen worden uit types TM_Instant, Date of DateTime. Voor formele historie zal DateTime in vrijwel alle gevallen de beste keuze zijn.
--- Source --
-NEN 3610:2011 and StUF 03.01</xs:documentation>
-            </xs:annotation>
-         </xs:element>
-      </xs:sequence>
-   </xs:complexType>
-   <xs:element name="Inrichtingselement" type="NEN3610:Inrichtingselement" abstract="true"
-               substitutionGroup="NEN3610:GeoObject"/>
-   <xs:complexType name="Inrichtingselement" abstract="true">
-      <xs:annotation>
-         <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-ruimtelijk object al dan niet ter detaillering dan wel ter inrichting van de overige benoemde ruimtelijke objecten of een ander inrichtingselement
--- Description --
-Inrichtingselementen vormen een diverse klasse. Het zijn objecten die niet zozeer op basis van fysiek voorkomen of hun gebruiksfunctie bij elkaar horen, maar op basis van hun eigenschap dat ze andere objecten inrichten. Het zijn objecten die hierdoor een relatief kleine geometrie hebben. Voorbeelden zijn: stadsbankje, reclamebord, verkeerslicht, verkeersheuvel, fontein, grondwaterput.
--- Source --
-NEN 3610:2011</xs:documentation>
-      </xs:annotation>
-      <xs:complexContent>
-         <xs:extension base="NEN3610:GeoObject">
-            <xs:sequence/>
-         </xs:extension>
-      </xs:complexContent>
-   </xs:complexType>
-   <xs:element name="Kunstwerk" type="NEN3610:Kunstwerk" abstract="true"
-               substitutionGroup="NEN3610:GeoObject"/>
-   <xs:complexType name="Kunstwerk" abstract="true">
-      <xs:annotation>
-         <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-civiel-technisch werk voor de infrastructuur van wegen, water, spoorbanen, waterkeringen en/of leidingen en niet bedoeld voor permanent menselijk verblijf
--- Description --
-Hieronder vallen overbruggingen, waterstaatkundige werken en waterkerende constructies. Overbruggingen kunnen zijn: brug, viaduct, aquaduct enz. Een voorbeeld van een waterstaatkundig werk is een sluis. Voorbeelden van waterkerende constructies zijn stuw en vaste dam.
--- Source --
-NEN 3610:2011</xs:documentation>
-      </xs:annotation>
-      <xs:complexContent>
-         <xs:extension base="NEN3610:GeoObject">
-            <xs:sequence/>
-         </xs:extension>
-      </xs:complexContent>
-   </xs:complexType>
-   <xs:element name="Leiding" type="NEN3610:Leiding" abstract="true"
-               substitutionGroup="NEN3610:GeoObject"/>
-   <xs:complexType name="Leiding" abstract="true">
-      <xs:annotation>
-         <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-buis of kabel bestemd voor de voortgeleiding van energie of materie
--- Description --
-Hoogspanningsleiding, riool, waterleiding, glasvezelkabel, gasleiding.
--- Source --
-NEN 3610:2011</xs:documentation>
-      </xs:annotation>
-      <xs:complexContent>
-         <xs:extension base="NEN3610:GeoObject">
-            <xs:sequence/>
-         </xs:extension>
-      </xs:complexContent>
-   </xs:complexType>
-   <xs:element name="Levensduur" type="NEN3610:Levensduur" abstract="false"/>
-   <xs:complexType name="Levensduur" abstract="false">
-      <xs:annotation>
-         <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">Gegevens waarmee levensduur vastgelegd wordt. Levensduur betreft alleen het laatste voorkomen van een object in de registratie. De levensduur is materieel (object in de werkelijkheid) en formeel (object in de registratie).
-
-De opbouw van Historie is gebaseerd op NEN3610:2011.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="beginTijd" type="xs:dateTime" minOccurs="1" maxOccurs="1">
-            <xs:annotation>
-               <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-tijdstip waarop het object in de werkelijkheid is ontstaan
--- Source --
-NEN 3611:2011</xs:documentation>
-            </xs:annotation>
-         </xs:element>
-         <xs:element name="eindTijd" type="xs:dateTime" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-tijdstip waarop het object in de werkelijk niet meer geldig is
--- Source --
-NEN 3610:2011
-
-</xs:documentation>
-            </xs:annotation>
-         </xs:element>
-         <xs:element name="objectBeginTijd" type="xs:dateTime" minOccurs="1" maxOccurs="1">
-            <xs:annotation>
-               <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-tijdstip waarop het object in de registratie is ontstaan
--- Description --
-Dit tijdstip moet altijd gelijk zijn aan het tijdstipregistratie van het eerste voorkomen van het object.
-Er zijn verschillende datatypes voor de representatie van een tijdstip: Afhankelijk van de gebruikerswensen m.b.t. granulariteit kan o.a. worden gekozen uit types TM_Instant, Date of DateTime.
--- Source --
-NEN 3610:2011</xs:documentation>
-            </xs:annotation>
-         </xs:element>
-         <xs:element name="objectEindTijd" type="xs:dateTime" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-tijdstip waarop het object in de registratie niet meer geldig is
--- Description --
-Er zijn verschillende datatypes voor de representatie van een tijdstip: Afhankelijk van de gebruikerswensen m.b.t. granulariteit kan o.a. worden gekozen uit types TM_Instant, Date of DateTime.
--- Source --
-NEN 3610:2011</xs:documentation>
-            </xs:annotation>
-         </xs:element>
-      </xs:sequence>
-   </xs:complexType>
-   <xs:element name="NEN3610ID" type="NEN3610:NEN3610ID" abstract="false"/>
-   <xs:complexType name="NEN3610ID" abstract="false">
-      <xs:annotation>
-         <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-identificatiegegevens voor de universeel unieke identificatie van een object
--- Description --
-De combinatie van &amp;lsquo;namespace&amp;rsquo; van een registratie, lokale identificatie en versie informatie maken een object uniek identificeerbaar. Met de informatie van deze klasse kan daardoor met zekerheid worden verwezen naar het geïdentificeerde object.
--- Source --
-NEN 3610:2011</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="namespace" minOccurs="1" maxOccurs="1">
-            <xs:annotation>
-               <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-unieke verwijzing naar een registratie van objecten
--- Description --
-Het attribuut &amp;lsquo;namespace&amp;rsquo; is een unieke verwijzing naar de registratie die de identificatie uitdeelt. Deze lijst van registraties wordt beheerd binnen de context van NEN 3610. Binnen Nederland zal deze namespace vrijwel altijd met &amp;lsquo;NL.&amp;rsquo; beginnen.
-De volgende karakters mogen in een namespace aanduiding voorkomen: {&amp;rdquo;A&amp;rdquo;&amp;hellip;&amp;rdquo;Z&amp;rdquo;, &amp;ldquo;a&amp;rdquo;&amp;hellip;&amp;rdquo;z&amp;rdquo;,    &amp;rdquo;0&amp;rdquo;&amp;hellip;&amp;rdquo;9&amp;rdquo;, &amp;ldquo;_&amp;rdquo;,    &amp;ldquo;- &amp;ldquo;,   &amp;ldquo;,&amp;rdquo;,    &amp;rdquo;.&amp;rdquo;}
--- Source --
-NEN 3610:2011</xs:documentation>
-            </xs:annotation>
-            <xs:simpleType>
-               <xs:restriction base="xs:string">
-                  <xs:pattern value="([A-Za-z0-9_\-,\.])+"/>
-               </xs:restriction>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="lokaalID" minOccurs="1" maxOccurs="1">
-            <xs:annotation>
-               <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-unieke identificatiecode binnen een registratie
--- Description --
-&amp;lsquo;LokaalId&amp;rsquo; is de identificatiecode die een object heeft binnen een (lokale) registratie.
-De volgende karakters mogen in een lokaalID voorkomen: {&amp;rdquo;A&amp;rdquo;&amp;hellip;&amp;rdquo;Z&amp;rdquo;,   &amp;ldquo;a&amp;rdquo;&amp;hellip;&amp;rdquo;z&amp;rdquo;, &amp;rdquo;0&amp;rdquo;&amp;hellip;&amp;rdquo;9&amp;rdquo;,    &amp;ldquo;_&amp;rdquo;,    &amp;ldquo;-&amp;ldquo;, &amp;ldquo;,&amp;rdquo;,    &amp;rdquo;.&amp;rdquo;}.
--- Source --
-NEN 3610:2011</xs:documentation>
-            </xs:annotation>
-            <xs:simpleType>
-               <xs:restriction base="xs:string">
-                  <xs:pattern value="([A-Za-z0-9_\-,\.])+"/>
-               </xs:restriction>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="versie" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-versie-aanduiding van een object
--- Description --
-Het attribuut &amp;lsquo;versie&amp;rsquo; maakt geen deel uit van de identificatie van het object maar kan worden gebruikt om verschillende versies van hetzelfde object te identificeren.
--- Source --
-NEN 3610:2011</xs:documentation>
-            </xs:annotation>
-            <xs:simpleType>
-               <xs:restriction base="xs:string">
-                  <xs:pattern value="\S.*"/>
-               </xs:restriction>
-            </xs:simpleType>
-         </xs:element>
-      </xs:sequence>
-   </xs:complexType>
-   <xs:element name="PlanologischGebied" type="NEN3610:PlanologischGebied" abstract="true"
-               substitutionGroup="NEN3610:GeoObject"/>
-   <xs:complexType name="PlanologischGebied" abstract="true">
-      <xs:annotation>
-         <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-niet-tastbaar begrensd gebied waaraan een bepaalde (toekomstige) bestemming, functionele en/of bestuurlijke ruimtelijke ontwikkeling is gekoppeld
--- Description --
-Planologische gebieden vormen de geo-objecten die worden gebruikt om het beleid van de ruimtelijke ordening weer te geven. In de regel zijn het objecten die zijn gekoppeld aan beleidsinformatie die aangeeft wat waar krachtens de wet op de ruimtelijke ordening aan beleid is geformuleerd.
--- Source --
-NEN 3610:2011</xs:documentation>
-      </xs:annotation>
-      <xs:complexContent>
-         <xs:extension base="NEN3610:GeoObject">
-            <xs:sequence/>
-         </xs:extension>
-      </xs:complexContent>
-   </xs:complexType>
-   <xs:element name="RegistratiefGebied" type="NEN3610:RegistratiefGebied" abstract="true"
-               substitutionGroup="NEN3610:GeoObject"/>
-   <xs:complexType name="RegistratiefGebied" abstract="true">
-      <xs:annotation>
-         <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-op basis van wet- of regelgeving afgebakend gebied dat als eenheid geldt van politiek/bestuurlijke verantwoordelijkheid of voor bedrijfsvoering
--- Description --
-Registratieve gebieden vormen een diverse klasse en omvatten gebieden die onder de wet- of regelgeving vallen of die voor bedrijfsvoering administratief van belang zijn. In veel gevallen zal een dergelijk gebied ook een registratieve aanduiding of registratief nummer hebben. Er is geen algemeen attribuut gedefinieerd om deze informatie uit te wisselen omdat registraties hiervoor registratie-eigen attributen hebben. Voorbeelden zijn: gemeente Delft, postcodegebied 2345, politieregio Haaglanden, veiligheidsregio Gelderland Midden, Habitatrichtlijn, Nationaal Park De Hoge Veluwe.
--- Source --
-NEN 3610:2011</xs:documentation>
-      </xs:annotation>
-      <xs:complexContent>
-         <xs:extension base="NEN3610:GeoObject">
-            <xs:sequence/>
-         </xs:extension>
-      </xs:complexContent>
-   </xs:complexType>
-   <xs:element name="Spoorbaan" type="NEN3610:Spoorbaan" abstract="true"
-               substitutionGroup="NEN3610:GeoObject"/>
-   <xs:complexType name="Spoorbaan" abstract="true">
-      <xs:annotation>
-         <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-gebaand gedeelte voor het verkeer over rails
--- Description --
-Voorbeelden zijn: spoorbaan, metrobaan, trambaan.
--- Source --
-NEN 3610:2011</xs:documentation>
-      </xs:annotation>
-      <xs:complexContent>
-         <xs:extension base="NEN3610:GeoObject">
-            <xs:sequence/>
-         </xs:extension>
-      </xs:complexContent>
-   </xs:complexType>
-   <xs:element name="Terrein" type="NEN3610:Terrein" abstract="true"
-               substitutionGroup="NEN3610:GeoObject"/>
-   <xs:complexType name="Terrein" abstract="true">
-      <xs:annotation>
-         <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-door een fysiek voorkomen gekarakteriseerd zichtbaar begrensd stuk grond
--- Description --
-Terrein wordt gebruikt om een zichtbaar (tastbaar) begrensd stuk grond aan te geven waarvoor een bepaald fysiek voorkomen typerend is. Voorbeelden zijn: bos, landschap, bebouwing, landbouwgebied. Belangrijk is dat het stuk grond een zichtbare grens heeft met aangrenzende geo-objecten.
--- Source --
-NEN 3610:2011</xs:documentation>
-      </xs:annotation>
-      <xs:complexContent>
-         <xs:extension base="NEN3610:GeoObject">
-            <xs:sequence/>
-         </xs:extension>
-      </xs:complexContent>
-   </xs:complexType>
-   <xs:element name="Water" type="NEN3610:Water" abstract="true"
-               substitutionGroup="NEN3610:GeoObject"/>
-   <xs:complexType name="Water" abstract="true">
-      <xs:annotation>
-         <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-grondoppervlak in principe bedekt met water
--- Description --
-Voorbeelden zijn: rivier, kanaal, beek, zee, meer, oppervlaktewater in algemene zin. Objecten die in het kader van de waterhuishouding periodiek met water zijn bedekt, vallen hier ook onder.
--- Source --
-NEN 3610:2011</xs:documentation>
-      </xs:annotation>
-      <xs:complexContent>
-         <xs:extension base="NEN3610:GeoObject">
-            <xs:sequence/>
-         </xs:extension>
-      </xs:complexContent>
-   </xs:complexType>
-   <xs:element name="Weg" type="NEN3610:Weg" abstract="true"
-               substitutionGroup="NEN3610:GeoObject"/>
-   <xs:complexType name="Weg" abstract="true">
-      <xs:annotation>
-         <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-gebaand gedeelte voor het wegverkeer en vliegverkeer te land
--- Description --
-Onder de klasse Weg vallen ook start- en landingsbanen voor vliegverkeer.
--- Source --
-NEN 3610:2011</xs:documentation>
-      </xs:annotation>
-      <xs:complexContent>
-         <xs:extension base="NEN3610:GeoObject">
-            <xs:sequence/>
-         </xs:extension>
-      </xs:complexContent>
-   </xs:complexType>
-   <xs:simpleType name="VoidReasonValue">
-      <xs:annotation>
-         <xs:documentation source="http://www.kadaster.nl/schema-info/technical-documentation">-- Definition --
-reden waarom een &amp;rsquo;void-waarde&amp;rsquo; is ingevuld
--- Source --
-NEN 3610:2011
-</xs:documentation>
-      </xs:annotation>
-      <xs:restriction base="xs:string"/>
-   </xs:simpleType>
-</xs:schema>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/www.geonovum.nl/NEN3610-20110301/NEN3610/v20110301/readme.txt b/src/main/resources/input/IHW/xsd/www.geonovum.nl/NEN3610-20110301/NEN3610/v20110301/readme.txt
deleted file mode 100644
index be7e533e6..000000000
--- a/src/main/resources/input/IHW/xsd/www.geonovum.nl/NEN3610-20110301/NEN3610/v20110301/readme.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Dit schema is samengesteld door Kadaster tbv. aansluiting bij NEN3610-2011.
-
-Zie voor meer informatie over IMKAD als sectormodel van NEN3610: 
-http://www.kadaster.nl/window.html?inhoud=/schemas/
-
-NEN3610 is een standaard vastgesteld door Geonovum: 
-http://www.geonovum.nl/
-
-Zie voor NEN3610: 
-http://www.geonovum.nl/geostandaarden/nen3610
-
diff --git a/src/main/resources/input/IHW/xsd/www.geonovum.nl/readme.txt b/src/main/resources/input/IHW/xsd/www.geonovum.nl/readme.txt
deleted file mode 100644
index 2804d51e9..000000000
--- a/src/main/resources/input/IHW/xsd/www.geonovum.nl/readme.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Samengesteld op basis van /brk-interfaces-geonovum.
-
-De resultaten daarvan zijn uitgekleeed zodat alleen de essentiele files conform de veronderstelde Geonovum URL zijn gerepresenteerd.
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gco/basicTypes.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gco/basicTypes.xsd
deleted file mode 100644
index a920a2ae8..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gco/basicTypes.xsd
+++ /dev/null
@@ -1,429 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gco" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gco="http://www.isotc211.org/2005/gco">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:00:05 ====== </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="../xlink/xlinks.xsd"/>
-	<xs:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../gml/gml.xsd"/>
-	<xs:include schemaLocation="../gco/gcoBase.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<!-- =========================================================================== -->
-	<xs:complexType name="TypeName_Type">
-		<xs:annotation>
-			<xs:documentation>A TypeName is a LocalName that references either a recordType or object type in some form of schema. The stored value "aName" is the returned value for the "aName()" operation. This is the types name.  - For parsing from types (or objects) the parsible name normally uses a "." navigation separator, so that it is of the form  [class].[member].[memberOfMember]. ...)</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="aName" type="gco:CharacterString_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="TypeName" type="gco:TypeName_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="TypeName_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:TypeName"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MemberName_Type">
-		<xs:annotation>
-			<xs:documentation>A MemberName is a LocalName that references either an attribute slot in a record or  recordType or an attribute, operation, or association role in an object instance or  type description in some form of schema. The stored value "aName" is the returned value for the "aName()" operation.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="aName" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="attributeType" type="gco:TypeName_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MemberName" type="gco:MemberName_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MemberName_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:MemberName"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="Multiplicity_Type">
-		<xs:annotation>
-			<xs:documentation>Use to represent the possible cardinality of a relation. Represented by a set of simple multiplicity ranges.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="range" type="gco:MultiplicityRange_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="Multiplicity" type="gco:Multiplicity_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Multiplicity_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Multiplicity"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MultiplicityRange_Type">
-		<xs:annotation>
-			<xs:documentation>A component of a multiplicity, consisting of an non-negative lower bound, and a potentially infinite upper bound.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="lower" type="gco:Integer_PropertyType"/>
-					<xs:element name="upper" type="gco:UnlimitedInteger_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MultiplicityRange" type="gco:MultiplicityRange_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MultiplicityRange_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:MultiplicityRange"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!--================================================-->
-	<!-- ================== Measure ===================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Measure" type="gml:MeasureType"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Measure_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Measure"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Length" type="gml:LengthType" substitutionGroup="gco:Measure"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Length_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Length"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Angle" type="gml:AngleType" substitutionGroup="gco:Measure"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Angle_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Angle"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Scale" type="gml:ScaleType" substitutionGroup="gco:Measure"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Scale_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Scale"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Distance" type="gml:LengthType" substitutionGroup="gco:Length"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Distance_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Distance"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="CharacterString" type="xs:string"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CharacterString_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:CharacterString"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Boolean" type="xs:boolean"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Boolean_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Boolean"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractGenericName" type="gml:CodeType" abstract="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="GenericName_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:AbstractGenericName"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="LocalName" type="gml:CodeType" substitutionGroup="gco:AbstractGenericName"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="LocalName_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:LocalName"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="ScopedName" type="gml:CodeType" substitutionGroup="gco:AbstractGenericName"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ScopedName_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:ScopedName"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ============================= UOM ========================================= -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="UomAngle_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="UomLength_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="UomScale_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="UnitOfMeasure_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="UomArea_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="UomVelocity_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="UomTime_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="UomVolume_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- =========================== Date & DateTime ================================= -->
-	<!--=============================================-->
-	<xs:element name="DateTime" type="xs:dateTime"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DateTime_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:DateTime"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:simpleType name="Date_Type">
-		<xs:union memberTypes="xs:date xs:gYearMonth xs:gYear"/>
-	</xs:simpleType>
-	<!-- ........................................................................ -->
-	<xs:element name="Date" type="gco:Date_Type" nillable="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Date_PropertyType">
-		<xs:choice minOccurs="0">
-			<xs:element ref="gco:Date"/>
-			<xs:element ref="gco:DateTime"/>
-		</xs:choice>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- =========================== Number basic type =============================== -->
-	<!--=======================================================-->
-	<xs:complexType name="Number_PropertyType">
-		<xs:choice minOccurs="0">
-			<xs:element ref="gco:Real"/>
-			<xs:element ref="gco:Decimal"/>
-			<xs:element ref="gco:Integer"/>
-		</xs:choice>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Decimal" type="xs:decimal"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Decimal_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Decimal"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Real" type="xs:double"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Real_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Real"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Integer" type="xs:integer"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Integer_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Integer"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- ============================= UnlimitedInteger ================================ -->
-	<!--NB: The encoding mechanism below is based on the use of XCPT (see the usage of xsi:nil in XML instance).-->
-	<!--================= Type ==================-->
-	<xs:complexType name="UnlimitedInteger_Type">
-		<xs:simpleContent>
-			<xs:extension base="xs:nonNegativeInteger">
-				<xs:attribute name="isInfinite" type="xs:boolean"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="UnlimitedInteger" type="gco:UnlimitedInteger_Type" nillable="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="UnlimitedInteger_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:UnlimitedInteger"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- ========================= Record & RecordType ============================== -->
-	<!--================= Record ==================-->
-	<xs:element name="Record"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Record_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Record"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!--================= RecordType ==================-->
-	<xs:complexType name="RecordType_Type">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attributeGroup ref="xlink:simpleLink"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="RecordType" type="gco:RecordType_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="RecordType_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:RecordType"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- =========================== Binary basic type ================================ -->
-	<!--NB: this type is not declared in 19103 but used in 19115. -->
-	<!--================= Type ==================-->
-	<xs:complexType name="Binary_Type">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="src" type="xs:anyURI"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="Binary" type="gco:Binary_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Binary_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Binary"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!--================================================-->
-	<!-- =============================================== -->
-	<!--================================================-->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gco/gco.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gco/gco.xsd
deleted file mode 100644
index 65af021ba..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gco/gco.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gco" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:00:06 ====== </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:include schemaLocation="../gco/basicTypes.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gco/gcoBase.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gco/gcoBase.xsd
deleted file mode 100644
index 5a267a6fa..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gco/gcoBase.xsd
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gco" elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This schema provides:
-		1.  tools to handle specific objects like "code lists" and "record";
-		2. Some XML types representing that do not follow the general encoding rules.</xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="../xlink/xlinks.xsd"/>
-	<xs:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../gml/gml.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- =========================================================================== -->
-	<!-- ========================= IM_Object: abstract Root ============================= -->
-	<!--================= Type ===================-->
-	<xs:complexType name="AbstractObject_Type" abstract="true">
-		<xs:sequence/>
-		<xs:attributeGroup ref="gco:ObjectIdentification"/>
-	</xs:complexType>
-	<!--================= Element =================-->
-	<xs:element name="AbstractObject" type="gco:AbstractObject_Type" abstract="true"/>
-	<!-- ========================================================================== -->
-	<!-- ====================== Reference of a resource =============================== -->
-	<!--The following attributeGroup 'extends' the GML  gml:AssociationAttributeGroup-->
-	<xs:attributeGroup name="ObjectReference">
-		<xs:attributeGroup ref="xlink:simpleLink"/>
-		<xs:attribute name="uuidref" type="xs:string"/>
-	</xs:attributeGroup>
-	<!--================== NULL ====================-->
-	<xs:attribute name="nilReason" type="gml:NilReasonType"/>
-	<!--=============== PropertyType =================-->
-	<xs:complexType name="ObjectReference_PropertyType">
-		<xs:sequence/>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- ====================== Identification of a resource ============================== -->
-	<xs:attributeGroup name="ObjectIdentification">
-		<xs:attribute name="id" type="xs:ID"/>
-		<xs:attribute name="uuid" type="xs:string"/>
-	</xs:attributeGroup>
-	<!-- ========================================================================== -->
-	<!-- ====================== The CodeList prototype ================================= -->
-	<!--It is used to refer to a specific codeListValue in a register-->
-	<!--================= Type ==================-->
-	<xs:complexType name="CodeListValue_Type">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="codeList" type="xs:anyURI" use="required"/>
-				<xs:attribute name="codeListValue" type="xs:anyURI" use="required"/>
-				<xs:attribute name="codeSpace" type="xs:anyURI"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- ========================== The isoType attribute ============================== -->
-	<xs:attribute name="isoType" type="xs:string"/>
-	<!--==============End================-->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/applicationSchema.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/applicationSchema.xsd
deleted file mode 100644
index fbf8f52f6..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/applicationSchema.xsd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:40:03 ====== </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<xs:include schemaLocation="../gmd/citation.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="MD_ApplicationSchemaInformation_Type">
-		<xs:annotation>
-			<xs:documentation>Information about the application schema used to build the dataset</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="name" type="gmd:CI_Citation_PropertyType"/>
-					<xs:element name="schemaLanguage" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="constraintLanguage" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="schemaAscii" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="graphicsFile" type="gco:Binary_PropertyType" minOccurs="0"/>
-					<xs:element name="softwareDevelopmentFile" type="gco:Binary_PropertyType" minOccurs="0"/>
-					<xs:element name="softwareDevelopmentFileFormat" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_ApplicationSchemaInformation" type="gmd:MD_ApplicationSchemaInformation_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ApplicationSchemaInformation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_ApplicationSchemaInformation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/citation.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/citation.xsd
deleted file mode 100644
index b4508da36..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/citation.xsd
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:40:04 ====== </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<xs:include schemaLocation="../gmd/referenceSystem.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="CI_ResponsibleParty_Type">
-		<xs:annotation>
-			<xs:documentation>Identification of, and means of communication with, person(s) and organisations associated with the dataset</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="individualName" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="organisationName" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="positionName" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="contactInfo" type="gmd:CI_Contact_PropertyType" minOccurs="0"/>
-					<xs:element name="role" type="gmd:CI_RoleCode_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CI_ResponsibleParty" type="gmd:CI_ResponsibleParty_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_ResponsibleParty_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_ResponsibleParty"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="CI_Citation_Type">
-		<xs:annotation>
-			<xs:documentation>Standardized resource reference</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="title" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="alternateTitle" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="date" type="gmd:CI_Date_PropertyType" maxOccurs="unbounded"/>
-					<xs:element name="edition" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="editionDate" type="gco:Date_PropertyType" minOccurs="0"/>
-					<xs:element name="identifier" type="gmd:MD_Identifier_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="citedResponsibleParty" type="gmd:CI_ResponsibleParty_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="presentationForm" type="gmd:CI_PresentationFormCode_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="series" type="gmd:CI_Series_PropertyType" minOccurs="0"/>
-					<xs:element name="otherCitationDetails" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="collectiveTitle" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="ISBN" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="ISSN" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CI_Citation" type="gmd:CI_Citation_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_Citation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_Citation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="CI_Address_Type">
-		<xs:annotation>
-			<xs:documentation>Location of the responsible individual or organisation</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="deliveryPoint" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="city" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="administrativeArea" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="postalCode" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="country" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="electronicMailAddress" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CI_Address" type="gmd:CI_Address_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_Address_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_Address"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="CI_OnlineResource_Type">
-		<xs:annotation>
-			<xs:documentation>Information about online sources from which the dataset, specification, or community profile name and extended metadata elements can be obtained.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="linkage" type="gmd:URL_PropertyType"/>
-					<xs:element name="protocol" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="applicationProfile" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="name" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="description" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="function" type="gmd:CI_OnLineFunctionCode_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CI_OnlineResource" type="gmd:CI_OnlineResource_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_OnlineResource_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_OnlineResource"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="CI_Contact_Type">
-		<xs:annotation>
-			<xs:documentation>Information required enabling contact with the  responsible person and/or organisation</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="phone" type="gmd:CI_Telephone_PropertyType" minOccurs="0"/>
-					<xs:element name="address" type="gmd:CI_Address_PropertyType" minOccurs="0"/>
-					<xs:element name="onlineResource" type="gmd:CI_OnlineResource_PropertyType" minOccurs="0"/>
-					<xs:element name="hoursOfService" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="contactInstructions" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CI_Contact" type="gmd:CI_Contact_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_Contact_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_Contact"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="CI_Telephone_Type">
-		<xs:annotation>
-			<xs:documentation>Telephone numbers for contacting the responsible individual or organisation</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="voice" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="facsimile" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CI_Telephone" type="gmd:CI_Telephone_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_Telephone_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_Telephone"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="CI_Date_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="date" type="gco:Date_PropertyType"/>
-					<xs:element name="dateType" type="gmd:CI_DateTypeCode_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CI_Date" type="gmd:CI_Date_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_Date_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_Date"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="CI_Series_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="name" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="issueIdentification" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="page" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CI_Series" type="gmd:CI_Series_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_Series_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_Series"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="URL" type="xs:anyURI"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="URL_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:URL"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="CI_RoleCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_RoleCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_RoleCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="CI_PresentationFormCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_PresentationFormCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_PresentationFormCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="CI_OnLineFunctionCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_OnLineFunctionCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_OnLineFunctionCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="CI_DateTypeCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_DateTypeCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_DateTypeCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/constraints.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/constraints.xsd
deleted file mode 100644
index d3cf9416c..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/constraints.xsd
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:40:01 ====== </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="MD_Constraints_Type">
-		<xs:annotation>
-			<xs:documentation>Restrictions on the access and use of a dataset or metadata</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="useLimitation" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Constraints" type="gmd:MD_Constraints_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Constraints_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Constraints"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_LegalConstraints_Type">
-		<xs:annotation>
-			<xs:documentation>Restrictions and legal prerequisites for accessing and using the dataset.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:MD_Constraints_Type">
-				<xs:sequence>
-					<xs:element name="accessConstraints" type="gmd:MD_RestrictionCode_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="useConstraints" type="gmd:MD_RestrictionCode_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="otherConstraints" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_LegalConstraints" type="gmd:MD_LegalConstraints_Type" substitutionGroup="gmd:MD_Constraints"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_LegalConstraints_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_LegalConstraints"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_SecurityConstraints_Type">
-		<xs:annotation>
-			<xs:documentation>Handling restrictions imposed on the dataset because of national security, privacy, or other concerns</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:MD_Constraints_Type">
-				<xs:sequence>
-					<xs:element name="classification" type="gmd:MD_ClassificationCode_PropertyType"/>
-					<xs:element name="userNote" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="classificationSystem" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="handlingDescription" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_SecurityConstraints" type="gmd:MD_SecurityConstraints_Type" substitutionGroup="gmd:MD_Constraints"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_SecurityConstraints_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_SecurityConstraints"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_ClassificationCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ClassificationCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_ClassificationCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_RestrictionCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_RestrictionCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_RestrictionCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/content.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/content.xsd
deleted file mode 100644
index 9089c3699..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/content.xsd
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:40:03 ====== </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<xs:include schemaLocation="../gmd/citation.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="MD_FeatureCatalogueDescription_Type">
-		<xs:annotation>
-			<xs:documentation>Information identifing the feature catalogue</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractMD_ContentInformation_Type">
-				<xs:sequence>
-					<xs:element name="complianceCode" type="gco:Boolean_PropertyType" minOccurs="0"/>
-					<xs:element name="language" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="includedWithDataset" type="gco:Boolean_PropertyType"/>
-					<xs:element name="featureTypes" type="gco:GenericName_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="featureCatalogueCitation" type="gmd:CI_Citation_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_FeatureCatalogueDescription" type="gmd:MD_FeatureCatalogueDescription_Type" substitutionGroup="gmd:AbstractMD_ContentInformation"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_FeatureCatalogueDescription_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_FeatureCatalogueDescription"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_CoverageDescription_Type">
-		<xs:annotation>
-			<xs:documentation>Information about the domain of the raster cell</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractMD_ContentInformation_Type">
-				<xs:sequence>
-					<xs:element name="attributeDescription" type="gco:RecordType_PropertyType"/>
-					<xs:element name="contentType" type="gmd:MD_CoverageContentTypeCode_PropertyType"/>
-					<xs:element name="dimension" type="gmd:MD_RangeDimension_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_CoverageDescription" type="gmd:MD_CoverageDescription_Type" substitutionGroup="gmd:AbstractMD_ContentInformation"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_CoverageDescription_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_CoverageDescription"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_ImageDescription_Type">
-		<xs:annotation>
-			<xs:documentation>Information about an image's suitability for use</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:MD_CoverageDescription_Type">
-				<xs:sequence>
-					<xs:element name="illuminationElevationAngle" type="gco:Real_PropertyType" minOccurs="0"/>
-					<xs:element name="illuminationAzimuthAngle" type="gco:Real_PropertyType" minOccurs="0"/>
-					<xs:element name="imagingCondition" type="gmd:MD_ImagingConditionCode_PropertyType" minOccurs="0"/>
-					<xs:element name="imageQualityCode" type="gmd:MD_Identifier_PropertyType" minOccurs="0"/>
-					<xs:element name="cloudCoverPercentage" type="gco:Real_PropertyType" minOccurs="0"/>
-					<xs:element name="processingLevelCode" type="gmd:MD_Identifier_PropertyType" minOccurs="0"/>
-					<xs:element name="compressionGenerationQuantity" type="gco:Integer_PropertyType" minOccurs="0"/>
-					<xs:element name="triangulationIndicator" type="gco:Boolean_PropertyType" minOccurs="0"/>
-					<xs:element name="radiometricCalibrationDataAvailability" type="gco:Boolean_PropertyType" minOccurs="0"/>
-					<xs:element name="cameraCalibrationInformationAvailability" type="gco:Boolean_PropertyType" minOccurs="0"/>
-					<xs:element name="filmDistortionInformationAvailability" type="gco:Boolean_PropertyType" minOccurs="0"/>
-					<xs:element name="lensDistortionInformationAvailability" type="gco:Boolean_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_ImageDescription" type="gmd:MD_ImageDescription_Type" substitutionGroup="gmd:MD_CoverageDescription"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ImageDescription_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_ImageDescription"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="AbstractMD_ContentInformation_Type" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractMD_ContentInformation" type="gmd:AbstractMD_ContentInformation_Type" abstract="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ContentInformation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractMD_ContentInformation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_RangeDimension_Type">
-		<xs:annotation>
-			<xs:documentation>Set of adjacent wavelengths in the electro-magnetic spectrum with a common characteristic, such as the visible band</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="sequenceIdentifier" type="gco:MemberName_PropertyType" minOccurs="0"/>
-					<xs:element name="descriptor" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_RangeDimension" type="gmd:MD_RangeDimension_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_RangeDimension_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_RangeDimension"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_Band_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:MD_RangeDimension_Type">
-				<xs:sequence>
-					<xs:element name="maxValue" type="gco:Real_PropertyType" minOccurs="0"/>
-					<xs:element name="minValue" type="gco:Real_PropertyType" minOccurs="0"/>
-					<xs:element name="units" type="gco:UomLength_PropertyType" minOccurs="0"/>
-					<xs:element name="peakResponse" type="gco:Real_PropertyType" minOccurs="0"/>
-					<xs:element name="bitsPerValue" type="gco:Integer_PropertyType" minOccurs="0"/>
-					<xs:element name="toneGradation" type="gco:Integer_PropertyType" minOccurs="0"/>
-					<xs:element name="scaleFactor" type="gco:Real_PropertyType" minOccurs="0"/>
-					<xs:element name="offset" type="gco:Real_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Band" type="gmd:MD_Band_Type" substitutionGroup="gmd:MD_RangeDimension"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Band_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Band"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_CoverageContentTypeCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_CoverageContentTypeCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_CoverageContentTypeCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_ImagingConditionCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ImagingConditionCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_ImagingConditionCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/dataQuality.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/dataQuality.xsd
deleted file mode 100644
index 70762bfdd..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/dataQuality.xsd
+++ /dev/null
@@ -1,554 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:40:01 ====== </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<xs:include schemaLocation="../gmd/identification.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="LI_ProcessStep_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="description" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="rationale" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="dateTime" type="gco:DateTime_PropertyType" minOccurs="0"/>
-					<xs:element name="processor" type="gmd:CI_ResponsibleParty_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="source" type="gmd:LI_Source_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="LI_ProcessStep" type="gmd:LI_ProcessStep_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="LI_ProcessStep_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:LI_ProcessStep"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="LI_Source_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="description" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="scaleDenominator" type="gmd:MD_RepresentativeFraction_PropertyType" minOccurs="0"/>
-					<xs:element name="sourceReferenceSystem" type="gmd:MD_ReferenceSystem_PropertyType" minOccurs="0"/>
-					<xs:element name="sourceCitation" type="gmd:CI_Citation_PropertyType" minOccurs="0"/>
-					<xs:element name="sourceExtent" type="gmd:EX_Extent_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="sourceStep" type="gmd:LI_ProcessStep_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="LI_Source" type="gmd:LI_Source_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="LI_Source_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:LI_Source"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="LI_Lineage_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="statement" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="processStep" type="gmd:LI_ProcessStep_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="source" type="gmd:LI_Source_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="LI_Lineage" type="gmd:LI_Lineage_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="LI_Lineage_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:LI_Lineage"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_ConformanceResult_Type">
-		<xs:annotation>
-			<xs:documentation>quantitative_result from Quality Procedures -  - renamed to remove implied use limitiation.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_Result_Type">
-				<xs:sequence>
-					<xs:element name="specification" type="gmd:CI_Citation_PropertyType"/>
-					<xs:element name="explanation" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="pass" type="gco:Boolean_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_ConformanceResult" type="gmd:DQ_ConformanceResult_Type" substitutionGroup="gmd:AbstractDQ_Result"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_ConformanceResult_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_ConformanceResult"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_QuantitativeResult_Type">
-		<xs:annotation>
-			<xs:documentation>Quantitative_conformance_measure from Quality Procedures.  -  - Renamed to remove implied use limitation -  - OCL - -- result is type specified by valueDomain - result.tupleType = valueDomain</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_Result_Type">
-				<xs:sequence>
-					<xs:element name="valueType" type="gco:RecordType_PropertyType" minOccurs="0"/>
-					<xs:element name="valueUnit" type="gco:UnitOfMeasure_PropertyType"/>
-					<xs:element name="errorStatistic" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="value" type="gco:Record_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_QuantitativeResult" type="gmd:DQ_QuantitativeResult_Type" substitutionGroup="gmd:AbstractDQ_Result"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_QuantitativeResult_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_QuantitativeResult"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="AbstractDQ_Result_Type" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractDQ_Result" type="gmd:AbstractDQ_Result_Type" abstract="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_Result_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractDQ_Result"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_TemporalValidity_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_TemporalAccuracy_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_TemporalValidity" type="gmd:DQ_TemporalValidity_Type" substitutionGroup="gmd:AbstractDQ_TemporalAccuracy"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_TemporalValidity_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_TemporalValidity"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_TemporalConsistency_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_TemporalAccuracy_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_TemporalConsistency" type="gmd:DQ_TemporalConsistency_Type" substitutionGroup="gmd:AbstractDQ_TemporalAccuracy"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_TemporalConsistency_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_TemporalConsistency"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_AccuracyOfATimeMeasurement_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_TemporalAccuracy_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_AccuracyOfATimeMeasurement" type="gmd:DQ_AccuracyOfATimeMeasurement_Type" substitutionGroup="gmd:AbstractDQ_TemporalAccuracy"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_AccuracyOfATimeMeasurement_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_AccuracyOfATimeMeasurement"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_QuantitativeAttributeAccuracy_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_ThematicAccuracy_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_QuantitativeAttributeAccuracy" type="gmd:DQ_QuantitativeAttributeAccuracy_Type" substitutionGroup="gmd:AbstractDQ_ThematicAccuracy"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_QuantitativeAttributeAccuracy_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_QuantitativeAttributeAccuracy"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_NonQuantitativeAttributeAccuracy_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_ThematicAccuracy_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_NonQuantitativeAttributeAccuracy" type="gmd:DQ_NonQuantitativeAttributeAccuracy_Type" substitutionGroup="gmd:AbstractDQ_ThematicAccuracy"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_NonQuantitativeAttributeAccuracy_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_NonQuantitativeAttributeAccuracy"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_ThematicClassificationCorrectness_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_ThematicAccuracy_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_ThematicClassificationCorrectness" type="gmd:DQ_ThematicClassificationCorrectness_Type" substitutionGroup="gmd:AbstractDQ_ThematicAccuracy"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_ThematicClassificationCorrectness_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_ThematicClassificationCorrectness"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_RelativeInternalPositionalAccuracy_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_PositionalAccuracy_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_RelativeInternalPositionalAccuracy" type="gmd:DQ_RelativeInternalPositionalAccuracy_Type" substitutionGroup="gmd:AbstractDQ_PositionalAccuracy"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_RelativeInternalPositionalAccuracy_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_RelativeInternalPositionalAccuracy"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_GriddedDataPositionalAccuracy_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_PositionalAccuracy_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_GriddedDataPositionalAccuracy" type="gmd:DQ_GriddedDataPositionalAccuracy_Type" substitutionGroup="gmd:AbstractDQ_PositionalAccuracy"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_GriddedDataPositionalAccuracy_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_GriddedDataPositionalAccuracy"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_AbsoluteExternalPositionalAccuracy_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_PositionalAccuracy_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_AbsoluteExternalPositionalAccuracy" type="gmd:DQ_AbsoluteExternalPositionalAccuracy_Type" substitutionGroup="gmd:AbstractDQ_PositionalAccuracy"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_AbsoluteExternalPositionalAccuracy_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_AbsoluteExternalPositionalAccuracy"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_TopologicalConsistency_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_LogicalConsistency_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_TopologicalConsistency" type="gmd:DQ_TopologicalConsistency_Type" substitutionGroup="gmd:AbstractDQ_LogicalConsistency"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_TopologicalConsistency_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_TopologicalConsistency"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_FormatConsistency_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_LogicalConsistency_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_FormatConsistency" type="gmd:DQ_FormatConsistency_Type" substitutionGroup="gmd:AbstractDQ_LogicalConsistency"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_FormatConsistency_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_FormatConsistency"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_DomainConsistency_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_LogicalConsistency_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_DomainConsistency" type="gmd:DQ_DomainConsistency_Type" substitutionGroup="gmd:AbstractDQ_LogicalConsistency"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_DomainConsistency_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_DomainConsistency"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_ConceptualConsistency_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_LogicalConsistency_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_ConceptualConsistency" type="gmd:DQ_ConceptualConsistency_Type" substitutionGroup="gmd:AbstractDQ_LogicalConsistency"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_ConceptualConsistency_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_ConceptualConsistency"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_CompletenessOmission_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_Completeness_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_CompletenessOmission" type="gmd:DQ_CompletenessOmission_Type" substitutionGroup="gmd:AbstractDQ_Completeness"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_CompletenessOmission_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_CompletenessOmission"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_CompletenessCommission_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_Completeness_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_CompletenessCommission" type="gmd:DQ_CompletenessCommission_Type" substitutionGroup="gmd:AbstractDQ_Completeness"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_CompletenessCommission_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_CompletenessCommission"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="AbstractDQ_TemporalAccuracy_Type" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_Element_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractDQ_TemporalAccuracy" type="gmd:AbstractDQ_TemporalAccuracy_Type" abstract="true" substitutionGroup="gmd:AbstractDQ_Element"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_TemporalAccuracy_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractDQ_TemporalAccuracy"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="AbstractDQ_ThematicAccuracy_Type" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_Element_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractDQ_ThematicAccuracy" type="gmd:AbstractDQ_ThematicAccuracy_Type" abstract="true" substitutionGroup="gmd:AbstractDQ_Element"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_ThematicAccuracy_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractDQ_ThematicAccuracy"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="AbstractDQ_PositionalAccuracy_Type" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_Element_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractDQ_PositionalAccuracy" type="gmd:AbstractDQ_PositionalAccuracy_Type" abstract="true" substitutionGroup="gmd:AbstractDQ_Element"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_PositionalAccuracy_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractDQ_PositionalAccuracy"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="AbstractDQ_LogicalConsistency_Type" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_Element_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractDQ_LogicalConsistency" type="gmd:AbstractDQ_LogicalConsistency_Type" abstract="true" substitutionGroup="gmd:AbstractDQ_Element"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_LogicalConsistency_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractDQ_LogicalConsistency"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="AbstractDQ_Completeness_Type" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_Element_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractDQ_Completeness" type="gmd:AbstractDQ_Completeness_Type" abstract="true" substitutionGroup="gmd:AbstractDQ_Element"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_Completeness_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractDQ_Completeness"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="AbstractDQ_Element_Type" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="nameOfMeasure" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="measureIdentification" type="gmd:MD_Identifier_PropertyType" minOccurs="0"/>
-					<xs:element name="measureDescription" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="evaluationMethodType" type="gmd:DQ_EvaluationMethodTypeCode_PropertyType" minOccurs="0"/>
-					<xs:element name="evaluationMethodDescription" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="evaluationProcedure" type="gmd:CI_Citation_PropertyType" minOccurs="0"/>
-					<xs:element name="dateTime" type="gco:DateTime_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="result" type="gmd:DQ_Result_PropertyType" maxOccurs="2"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractDQ_Element" type="gmd:AbstractDQ_Element_Type" abstract="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_Element_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractDQ_Element"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_DataQuality_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="scope" type="gmd:DQ_Scope_PropertyType"/>
-					<xs:element name="report" type="gmd:DQ_Element_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="lineage" type="gmd:LI_Lineage_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_DataQuality" type="gmd:DQ_DataQuality_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_DataQuality_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_DataQuality"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_Scope_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="level" type="gmd:MD_ScopeCode_PropertyType"/>
-					<xs:element name="extent" type="gmd:EX_Extent_PropertyType" minOccurs="0"/>
-					<xs:element name="levelDescription" type="gmd:MD_ScopeDescription_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_Scope" type="gmd:DQ_Scope_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_Scope_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_Scope"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_EvaluationMethodTypeCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_EvaluationMethodTypeCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_EvaluationMethodTypeCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/distribution.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/distribution.xsd
deleted file mode 100644
index fee05da7a..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/distribution.xsd
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:40:03 ====== </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<xs:include schemaLocation="../gmd/citation.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="MD_Medium_Type">
-		<xs:annotation>
-			<xs:documentation>Information about the media on which the data can be distributed</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="name" type="gmd:MD_MediumNameCode_PropertyType" minOccurs="0"/>
-					<xs:element name="density" type="gco:Real_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="densityUnits" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="volumes" type="gco:Integer_PropertyType" minOccurs="0"/>
-					<xs:element name="mediumFormat" type="gmd:MD_MediumFormatCode_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="mediumNote" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Medium" type="gmd:MD_Medium_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Medium_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Medium"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_DigitalTransferOptions_Type">
-		<xs:annotation>
-			<xs:documentation>Technical means and media by which a dataset is obtained from the distributor</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="unitsOfDistribution" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="transferSize" type="gco:Real_PropertyType" minOccurs="0"/>
-					<xs:element name="onLine" type="gmd:CI_OnlineResource_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="offLine" type="gmd:MD_Medium_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_DigitalTransferOptions" type="gmd:MD_DigitalTransferOptions_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_DigitalTransferOptions_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_DigitalTransferOptions"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_StandardOrderProcess_Type">
-		<xs:annotation>
-			<xs:documentation>Common ways in which the dataset may be obtained or received, and related instructions and fee information</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="fees" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="plannedAvailableDateTime" type="gco:DateTime_PropertyType" minOccurs="0"/>
-					<xs:element name="orderingInstructions" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="turnaround" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_StandardOrderProcess" type="gmd:MD_StandardOrderProcess_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_StandardOrderProcess_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_StandardOrderProcess"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_Distributor_Type">
-		<xs:annotation>
-			<xs:documentation>Information about the distributor</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="distributorContact" type="gmd:CI_ResponsibleParty_PropertyType"/>
-					<xs:element name="distributionOrderProcess" type="gmd:MD_StandardOrderProcess_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="distributorFormat" type="gmd:MD_Format_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="distributorTransferOptions" type="gmd:MD_DigitalTransferOptions_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Distributor" type="gmd:MD_Distributor_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Distributor_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Distributor"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_Distribution_Type">
-		<xs:annotation>
-			<xs:documentation>Information about the distributor of and options for obtaining the dataset</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="distributionFormat" type="gmd:MD_Format_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="distributor" type="gmd:MD_Distributor_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="transferOptions" type="gmd:MD_DigitalTransferOptions_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Distribution" type="gmd:MD_Distribution_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Distribution_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Distribution"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_Format_Type">
-		<xs:annotation>
-			<xs:documentation>Description of the form of the data to be distributed</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="name" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="version" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="amendmentNumber" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="specification" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="fileDecompressionTechnique" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="formatDistributor" type="gmd:MD_Distributor_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Format" type="gmd:MD_Format_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Format_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Format"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_DistributionUnits" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_DistributionUnits_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_DistributionUnits"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_MediumFormatCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_MediumFormatCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_MediumFormatCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_MediumNameCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_MediumNameCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_MediumNameCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/extent.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/extent.xsd
deleted file mode 100644
index 47d2a38a5..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/extent.xsd
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gsr="http://www.isotc211.org/2005/gsr" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gts="http://www.isotc211.org/2005/gts" xmlns:gss="http://www.isotc211.org/2005/gss" xmlns:gmd="http://www.isotc211.org/2005/gmd">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:40:04 ====== </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gss" schemaLocation="../gss/gss.xsd"/>
-	<xs:import namespace="http://www.isotc211.org/2005/gts" schemaLocation="../gts/gts.xsd"/>
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<xs:import namespace="http://www.isotc211.org/2005/gsr" schemaLocation="../gsr/gsr.xsd"/>
-	<xs:include schemaLocation="../gmd/referenceSystem.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="EX_TemporalExtent_Type">
-		<xs:annotation>
-			<xs:documentation>Time period covered by the content of the dataset</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="extent" type="gts:TM_Primitive_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="EX_TemporalExtent" type="gmd:EX_TemporalExtent_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="EX_TemporalExtent_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:EX_TemporalExtent"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="EX_VerticalExtent_Type">
-		<xs:annotation>
-			<xs:documentation>Vertical domain of dataset</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="minimumValue" type="gco:Real_PropertyType"/>
-					<xs:element name="maximumValue" type="gco:Real_PropertyType"/>
-					<xs:element name="verticalCRS" type="gsr:SC_CRS_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="EX_VerticalExtent" type="gmd:EX_VerticalExtent_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="EX_VerticalExtent_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:EX_VerticalExtent"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="EX_BoundingPolygon_Type">
-		<xs:annotation>
-			<xs:documentation>Boundary enclosing the dataset expressed as the closed set of (x,y) coordinates of the polygon (last point replicates first point)</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractEX_GeographicExtent_Type">
-				<xs:sequence>
-					<xs:element name="polygon" type="gss:GM_Object_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="EX_BoundingPolygon" type="gmd:EX_BoundingPolygon_Type" substitutionGroup="gmd:AbstractEX_GeographicExtent"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="EX_BoundingPolygon_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:EX_BoundingPolygon"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="EX_Extent_Type">
-		<xs:annotation>
-			<xs:documentation>Information about spatial, vertical, and temporal extent</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="description" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="geographicElement" type="gmd:EX_GeographicExtent_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="temporalElement" type="gmd:EX_TemporalExtent_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="verticalElement" type="gmd:EX_VerticalExtent_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="EX_Extent" type="gmd:EX_Extent_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="EX_Extent_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:EX_Extent"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="AbstractEX_GeographicExtent_Type" abstract="true">
-		<xs:annotation>
-			<xs:documentation>Geographic area of the dataset</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="extentTypeCode" type="gco:Boolean_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractEX_GeographicExtent" type="gmd:AbstractEX_GeographicExtent_Type" abstract="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="EX_GeographicExtent_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractEX_GeographicExtent"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="EX_GeographicBoundingBox_Type">
-		<xs:annotation>
-			<xs:documentation>Geographic area of the entire dataset referenced to WGS 84</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractEX_GeographicExtent_Type">
-				<xs:sequence>
-					<xs:element name="westBoundLongitude" type="gco:Decimal_PropertyType"/>
-					<xs:element name="eastBoundLongitude" type="gco:Decimal_PropertyType"/>
-					<xs:element name="southBoundLatitude" type="gco:Decimal_PropertyType"/>
-					<xs:element name="northBoundLatitude" type="gco:Decimal_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="EX_GeographicBoundingBox" type="gmd:EX_GeographicBoundingBox_Type" substitutionGroup="gmd:AbstractEX_GeographicExtent"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="EX_GeographicBoundingBox_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:EX_GeographicBoundingBox"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="EX_SpatialTemporalExtent_Type">
-		<xs:annotation>
-			<xs:documentation>Extent with respect to date and time</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:EX_TemporalExtent_Type">
-				<xs:sequence>
-					<xs:element name="spatialExtent" type="gmd:EX_GeographicExtent_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="EX_SpatialTemporalExtent" type="gmd:EX_SpatialTemporalExtent_Type" substitutionGroup="gmd:EX_TemporalExtent"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="EX_SpatialTemporalExtent_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:EX_SpatialTemporalExtent"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="EX_GeographicDescription_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractEX_GeographicExtent_Type">
-				<xs:sequence>
-					<xs:element name="geographicIdentifier" type="gmd:MD_Identifier_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="EX_GeographicDescription" type="gmd:EX_GeographicDescription_Type" substitutionGroup="gmd:AbstractEX_GeographicExtent"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="EX_GeographicDescription_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:EX_GeographicDescription"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/freeText.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/freeText.xsd
deleted file mode 100644
index ec541c98d..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/freeText.xsd
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 03-17-2005 17:21:53 ====== Informative package (concepts are not implementable) - pragmatic approach for encoding</xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<xs:include schemaLocation="../gmd/identification.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="PT_FreeText_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="textGroup" type="gmd:LocalisedCharacterString_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="PT_FreeText" type="gmd:PT_FreeText_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="PT_FreeText_PropertyType">
-		<xs:complexContent>
-			<xs:extension base="gco:CharacterString_PropertyType">
-				<xs:sequence minOccurs="0">
-					<xs:element ref="gmd:PT_FreeText"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="PT_Locale_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="languageCode" type="gmd:LanguageCode_PropertyType"/>
-					<xs:element name="country" type="gmd:Country_PropertyType" minOccurs="0"/>
-					<xs:element name="characterEncoding" type="gmd:MD_CharacterSetCode_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="PT_Locale" type="gmd:PT_Locale_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="PT_Locale_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:PT_Locale"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="LocalisedCharacterString_Type">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="id" type="xs:ID"/>
-				<xs:attribute name="locale" type="xs:anyURI"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="LocalisedCharacterString" type="gmd:LocalisedCharacterString_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="LocalisedCharacterString_PropertyType">
-		<xs:complexContent>
-			<xs:extension base="gco:ObjectReference_PropertyType">
-				<xs:sequence minOccurs="0">
-					<xs:element ref="gmd:LocalisedCharacterString"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="PT_LocaleContainer_Type">
-		<xs:sequence>
-			<xs:element name="description" type="gco:CharacterString_PropertyType"/>
-			<xs:element name="locale" type="gmd:PT_Locale_PropertyType"/>
-			<xs:element name="date" type="gmd:CI_Date_PropertyType" maxOccurs="unbounded"/>
-			<xs:element name="responsibleParty" type="gmd:CI_ResponsibleParty_PropertyType" maxOccurs="unbounded"/>
-			<xs:element name="localisedString" type="gmd:LocalisedCharacterString_PropertyType" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="PT_LocaleContainer" type="gmd:PT_LocaleContainer_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="PT_LocaleContainer_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:PT_LocaleContainer"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- =========================================================================== -->
-	<!-- =========================================================================== -->
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="LanguageCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="LanguageCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:LanguageCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Country" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Country_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:Country"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!--====EOF====-->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/gmd.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/gmd.xsd
deleted file mode 100644
index 5a5975a73..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/gmd.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gmd="http://www.isotc211.org/2005/gmd">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:40:04 ====== </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:include schemaLocation="../gmd/metadataApplication.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/identification.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/identification.xsd
deleted file mode 100644
index 852babb78..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/identification.xsd
+++ /dev/null
@@ -1,348 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:40:05 ====== </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<xs:include schemaLocation="../gmd/constraints.xsd"/>
-	<xs:include schemaLocation="../gmd/distribution.xsd"/>
-	<xs:include schemaLocation="../gmd/maintenance.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="AbstractMD_Identification_Type" abstract="true">
-		<xs:annotation>
-			<xs:documentation>Basic information about data</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="citation" type="gmd:CI_Citation_PropertyType"/>
-					<xs:element name="abstract" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="purpose" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="credit" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="status" type="gmd:MD_ProgressCode_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="pointOfContact" type="gmd:CI_ResponsibleParty_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="resourceMaintenance" type="gmd:MD_MaintenanceInformation_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="graphicOverview" type="gmd:MD_BrowseGraphic_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="resourceFormat" type="gmd:MD_Format_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="descriptiveKeywords" type="gmd:MD_Keywords_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="resourceSpecificUsage" type="gmd:MD_Usage_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="resourceConstraints" type="gmd:MD_Constraints_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="aggregationInfo" type="gmd:MD_AggregateInformation_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractMD_Identification" type="gmd:AbstractMD_Identification_Type" abstract="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Identification_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractMD_Identification"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_BrowseGraphic_Type">
-		<xs:annotation>
-			<xs:documentation>Graphic that provides an illustration of the dataset (should include a legend for the graphic)</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="fileName" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="fileDescription" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="fileType" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_BrowseGraphic" type="gmd:MD_BrowseGraphic_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_BrowseGraphic_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_BrowseGraphic"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_DataIdentification_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractMD_Identification_Type">
-				<xs:sequence>
-					<xs:element name="spatialRepresentationType" type="gmd:MD_SpatialRepresentationTypeCode_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="spatialResolution" type="gmd:MD_Resolution_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="language" type="gco:CharacterString_PropertyType" maxOccurs="unbounded"/>
-					<xs:element name="characterSet" type="gmd:MD_CharacterSetCode_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="topicCategory" type="gmd:MD_TopicCategoryCode_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="environmentDescription" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="extent" type="gmd:EX_Extent_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="supplementalInformation" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_DataIdentification" type="gmd:MD_DataIdentification_Type" substitutionGroup="gmd:AbstractMD_Identification"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_DataIdentification_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_DataIdentification"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_ServiceIdentification_Type">
-		<xs:annotation>
-			<xs:documentation>See 19119 for further info</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractMD_Identification_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_ServiceIdentification" type="gmd:MD_ServiceIdentification_Type" substitutionGroup="gmd:AbstractMD_Identification"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ServiceIdentification_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_ServiceIdentification"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_RepresentativeFraction_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="denominator" type="gco:Integer_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_RepresentativeFraction" type="gmd:MD_RepresentativeFraction_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_RepresentativeFraction_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_RepresentativeFraction"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_Usage_Type">
-		<xs:annotation>
-			<xs:documentation>Brief description of ways in which the dataset is currently used.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="specificUsage" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="usageDateTime" type="gco:DateTime_PropertyType" minOccurs="0"/>
-					<xs:element name="userDeterminedLimitations" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="userContactInfo" type="gmd:CI_ResponsibleParty_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Usage" type="gmd:MD_Usage_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Usage_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Usage"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_Keywords_Type">
-		<xs:annotation>
-			<xs:documentation>Keywords, their type and reference source</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="keyword" type="gco:CharacterString_PropertyType" maxOccurs="unbounded"/>
-					<xs:element name="type" type="gmd:MD_KeywordTypeCode_PropertyType" minOccurs="0"/>
-					<xs:element name="thesaurusName" type="gmd:CI_Citation_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Keywords" type="gmd:MD_Keywords_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Keywords_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Keywords"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DS_Association_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DS_Association" type="gmd:DS_Association_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_Association_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DS_Association"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_AggregateInformation_Type">
-		<xs:annotation>
-			<xs:documentation>Encapsulates the dataset aggregation information</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="aggregateDataSetName" type="gmd:CI_Citation_PropertyType" minOccurs="0"/>
-					<xs:element name="aggregateDataSetIdentifier" type="gmd:MD_Identifier_PropertyType" minOccurs="0"/>
-					<xs:element name="associationType" type="gmd:DS_AssociationTypeCode_PropertyType"/>
-					<xs:element name="initiativeType" type="gmd:DS_InitiativeTypeCode_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_AggregateInformation" type="gmd:MD_AggregateInformation_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_AggregateInformation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_AggregateInformation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_Resolution_Type">
-		<xs:choice>
-			<xs:element name="equivalentScale" type="gmd:MD_RepresentativeFraction_PropertyType"/>
-			<xs:element name="distance" type="gco:Distance_PropertyType"/>
-		</xs:choice>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Resolution" type="gmd:MD_Resolution_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Resolution_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Resolution"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:simpleType name="MD_TopicCategoryCode_Type">
-		<xs:annotation>
-			<xs:documentation>High-level geospatial data thematic classification to assist in the grouping and search of available geospatial datasets</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="farming"/>
-			<xs:enumeration value="biota"/>
-			<xs:enumeration value="boundaries"/>
-			<xs:enumeration value="climatologyMeteorologyAtmosphere"/>
-			<xs:enumeration value="economy"/>
-			<xs:enumeration value="elevation"/>
-			<xs:enumeration value="environment"/>
-			<xs:enumeration value="geoscientificInformation"/>
-			<xs:enumeration value="health"/>
-			<xs:enumeration value="imageryBaseMapsEarthCover"/>
-			<xs:enumeration value="intelligenceMilitary"/>
-			<xs:enumeration value="inlandWaters"/>
-			<xs:enumeration value="location"/>
-			<xs:enumeration value="oceans"/>
-			<xs:enumeration value="planningCadastre"/>
-			<xs:enumeration value="society"/>
-			<xs:enumeration value="structure"/>
-			<xs:enumeration value="transportation"/>
-			<xs:enumeration value="utilitiesCommunication"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_TopicCategoryCode" type="gmd:MD_TopicCategoryCode_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_TopicCategoryCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_TopicCategoryCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_CharacterSetCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_CharacterSetCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_CharacterSetCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_SpatialRepresentationTypeCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_SpatialRepresentationTypeCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_SpatialRepresentationTypeCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_ProgressCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ProgressCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_ProgressCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_KeywordTypeCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_KeywordTypeCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_KeywordTypeCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="DS_AssociationTypeCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_AssociationTypeCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DS_AssociationTypeCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="DS_InitiativeTypeCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_InitiativeTypeCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DS_InitiativeTypeCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/maintenance.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/maintenance.xsd
deleted file mode 100644
index 7d1d9b13f..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/maintenance.xsd
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gts="http://www.isotc211.org/2005/gts" xmlns:gmd="http://www.isotc211.org/2005/gmd">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:40:04 ====== Status of the dataset or progress of a review</xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gts" schemaLocation="../gts/gts.xsd"/>
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<xs:include schemaLocation="../gmd/citation.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="MD_MaintenanceInformation_Type">
-		<xs:annotation>
-			<xs:documentation>Information about the scope and frequency of updating</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="maintenanceAndUpdateFrequency" type="gmd:MD_MaintenanceFrequencyCode_PropertyType"/>
-					<xs:element name="dateOfNextUpdate" type="gco:Date_PropertyType" minOccurs="0"/>
-					<xs:element name="userDefinedMaintenanceFrequency" type="gts:TM_PeriodDuration_PropertyType" minOccurs="0"/>
-					<xs:element name="updateScope" type="gmd:MD_ScopeCode_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="updateScopeDescription" type="gmd:MD_ScopeDescription_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="maintenanceNote" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="contact" type="gmd:CI_ResponsibleParty_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_MaintenanceInformation" type="gmd:MD_MaintenanceInformation_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_MaintenanceInformation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_MaintenanceInformation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_ScopeDescription_Type">
-		<xs:annotation>
-			<xs:documentation>Description of the class of information covered by the information</xs:documentation>
-		</xs:annotation>
-		<xs:choice>
-			<xs:element name="attributes" type="gco:ObjectReference_PropertyType" maxOccurs="unbounded"/>
-			<xs:element name="features" type="gco:ObjectReference_PropertyType" maxOccurs="unbounded"/>
-			<xs:element name="featureInstances" type="gco:ObjectReference_PropertyType" maxOccurs="unbounded"/>
-			<xs:element name="attributeInstances" type="gco:ObjectReference_PropertyType" maxOccurs="unbounded"/>
-			<xs:element name="dataset" type="gco:CharacterString_PropertyType"/>
-			<xs:element name="other" type="gco:CharacterString_PropertyType"/>
-		</xs:choice>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_ScopeDescription" type="gmd:MD_ScopeDescription_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ScopeDescription_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_ScopeDescription"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_MaintenanceFrequencyCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_MaintenanceFrequencyCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_MaintenanceFrequencyCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_ScopeCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ScopeCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_ScopeCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/metadataApplication.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/metadataApplication.xsd
deleted file mode 100644
index d63ec419d..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/metadataApplication.xsd
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:40:05 ====== </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<xs:include schemaLocation="../gmd/metadataEntity.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="AbstractDS_Aggregate_Type" abstract="true">
-		<xs:annotation>
-			<xs:documentation>Identifiable collection of datasets</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="composedOf" type="gmd:DS_DataSet_PropertyType" maxOccurs="unbounded"/>
-					<xs:element name="seriesMetadata" type="gmd:MD_Metadata_PropertyType" maxOccurs="unbounded"/>
-					<xs:element name="subset" type="gmd:DS_Aggregate_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="superset" type="gmd:DS_Aggregate_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractDS_Aggregate" type="gmd:AbstractDS_Aggregate_Type" abstract="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_Aggregate_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractDS_Aggregate"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DS_DataSet_Type">
-		<xs:annotation>
-			<xs:documentation>Identifiable collection of data</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="has" type="gmd:MD_Metadata_PropertyType" maxOccurs="unbounded"/>
-					<xs:element name="partOf" type="gmd:DS_Aggregate_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DS_DataSet" type="gmd:DS_DataSet_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_DataSet_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DS_DataSet"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DS_OtherAggregate_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDS_Aggregate_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DS_OtherAggregate" type="gmd:DS_OtherAggregate_Type" substitutionGroup="gmd:AbstractDS_Aggregate"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_OtherAggregate_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DS_OtherAggregate"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DS_Series_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDS_Aggregate_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DS_Series" type="gmd:DS_Series_Type" substitutionGroup="gmd:AbstractDS_Aggregate"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_Series_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DS_Series"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DS_Initiative_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDS_Aggregate_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DS_Initiative" type="gmd:DS_Initiative_Type" substitutionGroup="gmd:AbstractDS_Aggregate"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_Initiative_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DS_Initiative"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DS_Platform_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:DS_Series_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DS_Platform" type="gmd:DS_Platform_Type" substitutionGroup="gmd:DS_Series"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_Platform_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DS_Platform"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DS_Sensor_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:DS_Series_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DS_Sensor" type="gmd:DS_Sensor_Type" substitutionGroup="gmd:DS_Series"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_Sensor_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DS_Sensor"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DS_ProductionSeries_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:DS_Series_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DS_ProductionSeries" type="gmd:DS_ProductionSeries_Type" substitutionGroup="gmd:DS_Series"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_ProductionSeries_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DS_ProductionSeries"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DS_StereoMate_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:DS_OtherAggregate_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DS_StereoMate" type="gmd:DS_StereoMate_Type" substitutionGroup="gmd:DS_OtherAggregate"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_StereoMate_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DS_StereoMate"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/metadataEntity.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/metadataEntity.xsd
deleted file mode 100644
index 77c4a27d9..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/metadataEntity.xsd
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:40:00 ====== </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<xs:include schemaLocation="../gmd/spatialRepresentation.xsd"/>
-	<xs:include schemaLocation="../gmd/metadataExtension.xsd"/>
-	<xs:include schemaLocation="../gmd/content.xsd"/>
-	<xs:include schemaLocation="../gmd/metadataApplication.xsd"/>
-	<xs:include schemaLocation="../gmd/applicationSchema.xsd"/>
-	<xs:include schemaLocation="../gmd/portrayalCatalogue.xsd"/>
-	<xs:include schemaLocation="../gmd/dataQuality.xsd"/>
-	<xs:include schemaLocation="../gmd/freeText.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="MD_Metadata_Type">
-		<xs:annotation>
-			<xs:documentation>Information about the metadata</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="fileIdentifier" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="language" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="characterSet" type="gmd:MD_CharacterSetCode_PropertyType" minOccurs="0"/>
-					<xs:element name="parentIdentifier" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="hierarchyLevel" type="gmd:MD_ScopeCode_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="hierarchyLevelName" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="contact" type="gmd:CI_ResponsibleParty_PropertyType" maxOccurs="unbounded"/>
-					<xs:element name="dateStamp" type="gco:Date_PropertyType"/>
-					<xs:element name="metadataStandardName" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="metadataStandardVersion" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="dataSetURI" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="locale" type="gmd:PT_Locale_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="spatialRepresentationInfo" type="gmd:MD_SpatialRepresentation_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="referenceSystemInfo" type="gmd:MD_ReferenceSystem_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="metadataExtensionInfo" type="gmd:MD_MetadataExtensionInformation_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="identificationInfo" type="gmd:MD_Identification_PropertyType" maxOccurs="unbounded"/>
-					<xs:element name="contentInfo" type="gmd:MD_ContentInformation_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="distributionInfo" type="gmd:MD_Distribution_PropertyType" minOccurs="0"/>
-					<xs:element name="dataQualityInfo" type="gmd:DQ_DataQuality_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="portrayalCatalogueInfo" type="gmd:MD_PortrayalCatalogueReference_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="metadataConstraints" type="gmd:MD_Constraints_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="applicationSchemaInfo" type="gmd:MD_ApplicationSchemaInformation_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="metadataMaintenance" type="gmd:MD_MaintenanceInformation_PropertyType" minOccurs="0"/>
-					<xs:element name="series" type="gmd:DS_Aggregate_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="describes" type="gmd:DS_DataSet_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="propertyType" type="gco:ObjectReference_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="featureType" type="gco:ObjectReference_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="featureAttribute" type="gco:ObjectReference_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Metadata" type="gmd:MD_Metadata_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Metadata_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Metadata"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/metadataExtension.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/metadataExtension.xsd
deleted file mode 100644
index 21202ecce..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/metadataExtension.xsd
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:40:03 ====== Method used to represent geographic information in the dataset</xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<xs:include schemaLocation="../gmd/citation.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="MD_ExtendedElementInformation_Type">
-		<xs:annotation>
-			<xs:documentation>New metadata element, not found in ISO 19115, which is required to describe geographic data</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="name" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="shortName" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="domainCode" type="gco:Integer_PropertyType" minOccurs="0"/>
-					<xs:element name="definition" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="obligation" type="gmd:MD_ObligationCode_PropertyType" minOccurs="0"/>
-					<xs:element name="condition" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="dataType" type="gmd:MD_DatatypeCode_PropertyType"/>
-					<xs:element name="maximumOccurrence" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="domainValue" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="parentEntity" type="gco:CharacterString_PropertyType" maxOccurs="unbounded"/>
-					<xs:element name="rule" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="rationale" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="source" type="gmd:CI_ResponsibleParty_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_ExtendedElementInformation" type="gmd:MD_ExtendedElementInformation_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ExtendedElementInformation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_ExtendedElementInformation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_MetadataExtensionInformation_Type">
-		<xs:annotation>
-			<xs:documentation>Information describing metadata extensions.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="extensionOnLineResource" type="gmd:CI_OnlineResource_PropertyType" minOccurs="0"/>
-					<xs:element name="extendedElementInformation" type="gmd:MD_ExtendedElementInformation_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_MetadataExtensionInformation" type="gmd:MD_MetadataExtensionInformation_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_MetadataExtensionInformation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_MetadataExtensionInformation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:simpleType name="MD_ObligationCode_Type">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="mandatory"/>
-			<xs:enumeration value="optional"/>
-			<xs:enumeration value="conditional"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_ObligationCode" type="gmd:MD_ObligationCode_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ObligationCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_ObligationCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_DatatypeCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_DatatypeCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_DatatypeCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/portrayalCatalogue.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/portrayalCatalogue.xsd
deleted file mode 100644
index 0b774c6d3..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/portrayalCatalogue.xsd
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:40:03 ====== </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<xs:include schemaLocation="../gmd/citation.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="MD_PortrayalCatalogueReference_Type">
-		<xs:annotation>
-			<xs:documentation>Information identifing the portrayal catalogue used</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="portrayalCatalogueCitation" type="gmd:CI_Citation_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_PortrayalCatalogueReference" type="gmd:MD_PortrayalCatalogueReference_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_PortrayalCatalogueReference_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_PortrayalCatalogueReference"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/referenceSystem.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/referenceSystem.xsd
deleted file mode 100644
index bf3864bb8..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/referenceSystem.xsd
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:40:04 ====== </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<xs:include schemaLocation="../gmd/citation.xsd"/>
-	<xs:include schemaLocation="../gmd/extent.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="RS_Identifier_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:MD_Identifier_Type">
-				<xs:sequence>
-					<xs:element name="codeSpace" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="version" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="RS_Identifier" type="gmd:RS_Identifier_Type" substitutionGroup="gmd:MD_Identifier"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="RS_Identifier_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:RS_Identifier"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_ReferenceSystem_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="referenceSystemIdentifier" type="gmd:RS_Identifier_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_ReferenceSystem" type="gmd:MD_ReferenceSystem_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ReferenceSystem_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_ReferenceSystem"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_Identifier_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="authority" type="gmd:CI_Citation_PropertyType" minOccurs="0"/>
-					<xs:element name="code" type="gco:CharacterString_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Identifier" type="gmd:MD_Identifier_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Identifier_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Identifier"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="AbstractRS_ReferenceSystem_Type" abstract="true">
-		<xs:annotation>
-			<xs:documentation>Description of the spatial and temporal reference systems used in the dataset</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="name" type="gmd:RS_Identifier_PropertyType"/>
-					<xs:element name="domainOfValidity" type="gmd:EX_Extent_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractRS_ReferenceSystem" type="gmd:AbstractRS_ReferenceSystem_Type" abstract="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="RS_ReferenceSystem_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractRS_ReferenceSystem"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/spatialRepresentation.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/spatialRepresentation.xsd
deleted file mode 100644
index e67de3836..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmd/spatialRepresentation.xsd
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gss="http://www.isotc211.org/2005/gss" xmlns:gmd="http://www.isotc211.org/2005/gmd">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:40:02 ====== Frequency with which modifications and deletations are made to the data after it is first produced</xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gss" schemaLocation="../gss/gss.xsd"/>
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<xs:include schemaLocation="../gmd/citation.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="MD_GridSpatialRepresentation_Type">
-		<xs:annotation>
-			<xs:documentation>Types and numbers of raster spatial objects in the dataset</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractMD_SpatialRepresentation_Type">
-				<xs:sequence>
-					<xs:element name="numberOfDimensions" type="gco:Integer_PropertyType"/>
-					<xs:element name="axisDimensionProperties" type="gmd:MD_Dimension_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="cellGeometry" type="gmd:MD_CellGeometryCode_PropertyType"/>
-					<xs:element name="transformationParameterAvailability" type="gco:Boolean_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_GridSpatialRepresentation" type="gmd:MD_GridSpatialRepresentation_Type" substitutionGroup="gmd:AbstractMD_SpatialRepresentation"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_GridSpatialRepresentation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_GridSpatialRepresentation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_VectorSpatialRepresentation_Type">
-		<xs:annotation>
-			<xs:documentation>Information about the vector spatial objects in the dataset</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractMD_SpatialRepresentation_Type">
-				<xs:sequence>
-					<xs:element name="topologyLevel" type="gmd:MD_TopologyLevelCode_PropertyType" minOccurs="0"/>
-					<xs:element name="geometricObjects" type="gmd:MD_GeometricObjects_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_VectorSpatialRepresentation" type="gmd:MD_VectorSpatialRepresentation_Type" substitutionGroup="gmd:AbstractMD_SpatialRepresentation"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_VectorSpatialRepresentation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_VectorSpatialRepresentation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="AbstractMD_SpatialRepresentation_Type" abstract="true">
-		<xs:annotation>
-			<xs:documentation>Digital mechanism used to represent spatial information</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractMD_SpatialRepresentation" type="gmd:AbstractMD_SpatialRepresentation_Type" abstract="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_SpatialRepresentation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractMD_SpatialRepresentation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_Georeferenceable_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:MD_GridSpatialRepresentation_Type">
-				<xs:sequence>
-					<xs:element name="controlPointAvailability" type="gco:Boolean_PropertyType"/>
-					<xs:element name="orientationParameterAvailability" type="gco:Boolean_PropertyType"/>
-					<xs:element name="orientationParameterDescription" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="georeferencedParameters" type="gco:Record_PropertyType"/>
-					<xs:element name="parameterCitation" type="gmd:CI_Citation_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Georeferenceable" type="gmd:MD_Georeferenceable_Type" substitutionGroup="gmd:MD_GridSpatialRepresentation"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Georeferenceable_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Georeferenceable"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_Dimension_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="dimensionName" type="gmd:MD_DimensionNameTypeCode_PropertyType"/>
-					<xs:element name="dimensionSize" type="gco:Integer_PropertyType"/>
-					<xs:element name="resolution" type="gco:Measure_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Dimension" type="gmd:MD_Dimension_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Dimension_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Dimension"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_Georectified_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:MD_GridSpatialRepresentation_Type">
-				<xs:sequence>
-					<xs:element name="checkPointAvailability" type="gco:Boolean_PropertyType"/>
-					<xs:element name="checkPointDescription" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="cornerPoints" type="gss:GM_Point_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="centerPoint" type="gss:GM_Point_PropertyType" minOccurs="0"/>
-					<xs:element name="pointInPixel" type="gmd:MD_PixelOrientationCode_PropertyType"/>
-					<xs:element name="transformationDimensionDescription" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="transformationDimensionMapping" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="2"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Georectified" type="gmd:MD_Georectified_Type" substitutionGroup="gmd:MD_GridSpatialRepresentation"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Georectified_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Georectified"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_GeometricObjects_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="geometricObjectType" type="gmd:MD_GeometricObjectTypeCode_PropertyType"/>
-					<xs:element name="geometricObjectCount" type="gco:Integer_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_GeometricObjects" type="gmd:MD_GeometricObjects_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_GeometricObjects_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_GeometricObjects"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:simpleType name="MD_PixelOrientationCode_Type">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="center"/>
-			<xs:enumeration value="lowerLeft"/>
-			<xs:enumeration value="lowerRight"/>
-			<xs:enumeration value="upperRight"/>
-			<xs:enumeration value="upperLeft"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_PixelOrientationCode" type="gmd:MD_PixelOrientationCode_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_PixelOrientationCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_PixelOrientationCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_TopologyLevelCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_TopologyLevelCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_TopologyLevelCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_GeometricObjectTypeCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_GeometricObjectTypeCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_GeometricObjectTypeCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_CellGeometryCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_CellGeometryCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_CellGeometryCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_DimensionNameTypeCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_DimensionNameTypeCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_DimensionNameTypeCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmx/catalogues.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmx/catalogues.xsd
deleted file mode 100644
index 6746f226c..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmx/catalogues.xsd
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmx" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gmx="http://www.isotc211.org/2005/gmx">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 04-27-2005 17:16:11 ====== Handcrafted</xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="../gmd/gmd.xsd"/>
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<xs:include schemaLocation="../gmx/uomItem.xsd"/>
-	<xs:include schemaLocation="../gmx/codelistItem.xsd"/>
-	<xs:include schemaLocation="../gmx/crsItem.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="AbstractCT_Catalogue_Type" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="name" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="scope" type="gco:CharacterString_PropertyType" maxOccurs="unbounded"/>
-					<xs:element name="fieldOfApplication" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="versionNumber" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="versionDate" type="gco:Date_PropertyType"/>
-					<xs:element name="language" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="characterSet" type="gmd:MD_CharacterSetCode_PropertyType" minOccurs="0"/>
-					<xs:element name="locale" type="gmd:PT_Locale_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="subCatalogue" type="gmx:CT_Catalogue_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractCT_Catalogue" type="gmx:AbstractCT_Catalogue_Type" abstract="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CT_Catalogue_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:AbstractCT_Catalogue"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="CT_CodelistCatalogue_Type">
-		<xs:complexContent>
-			<xs:extension base="gmx:AbstractCT_Catalogue_Type">
-				<xs:sequence>
-					<xs:element name="codelistItem" type="gmx:CT_Codelist_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CT_CodelistCatalogue" type="gmx:CT_CodelistCatalogue_Type" substitutionGroup="gmx:AbstractCT_Catalogue"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CT_CodelistCatalogue_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:CT_CodelistCatalogue"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="CT_CrsCatalogue_Type">
-		<xs:complexContent>
-			<xs:extension base="gmx:AbstractCT_Catalogue_Type">
-				<xs:sequence>
-					<xs:element name="crs" type="gmx:CT_CRS_PropertyType" maxOccurs="unbounded"/>
-					<xs:element name="coordinateSystem" type="gmx:CT_CoordinateSystem_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="axis" type="gmx:CT_CoordinateSystemAxis_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="datum" type="gmx:CT_Datum_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="ellipsoid" type="gmx:CT_Ellipsoid_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="primeMeridian" type="gmx:CT_PrimeMeridian_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="operation" type="gmx:CT_Operation_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="operationMethod" type="gmx:CT_OperationMethod_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="parameters" type="gmx:CT_OperationParameters_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CT_CrsCatalogue" type="gmx:CT_CrsCatalogue_Type" substitutionGroup="gmx:AbstractCT_Catalogue"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CT_CrsCatalogue_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:CT_CrsCatalogue"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="CT_UomCatalogue_Type">
-		<xs:complexContent>
-			<xs:extension base="gmx:AbstractCT_Catalogue_Type">
-				<xs:sequence>
-					<xs:element name="uomItem" type="gmx:UnitDefinition_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CT_UomCatalogue" type="gmx:CT_UomCatalogue_Type" substitutionGroup="gmx:AbstractCT_Catalogue"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CT_UomCatalogue_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:CT_UomCatalogue"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmx/codelistItem.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmx/codelistItem.xsd
deleted file mode 100644
index fb8faa9f9..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmx/codelistItem.xsd
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmx" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmx="http://www.isotc211.org/2005/gmx">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 03-15-2005 09:14:50 ====== </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<xs:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../gml/gml.xsd"/><!--IM 430 -->
-	<xs:import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="../gmd/gmd.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="CT_CodelistValue_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:CodeDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="CT_Codelist_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:CodeListDictionary"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="CodeDefinition_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:DefinitionType"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CodeDefinition" type="gmx:CodeDefinition_Type" substitutionGroup="gml:Definition"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CodeDefinition_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:CodeDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="CodeListDictionary_Type">
-		<xs:annotation>
-			<xs:documentation>Constraints: - 1) metadataProperty.card = 0 - 2) dictionaryEntry.card = 0</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gml:DictionaryType">
-				<xs:sequence>
-					<xs:element name="codeEntry" type="gmx:CodeDefinition_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CodeListDictionary" type="gmx:CodeListDictionary_Type" substitutionGroup="gml:Dictionary"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CodeListDictionary_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:CodeListDictionary"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_CodeDefinition_Type">
-		<xs:complexContent>
-			<xs:extension base="gmx:CodeDefinition_Type">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:CodeAlternativeExpression_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_CodeDefinition" type="gmx:ML_CodeDefinition_Type" substitutionGroup="gmx:CodeDefinition"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_CodeDefinition_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_CodeDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_CodeListDictionary_Type">
-		<xs:annotation>
-			<xs:documentation>Constraint: codeEntry.type = ML_CodeListDefinition</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmx:CodeListDictionary_Type">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:ClAlternativeExpression_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_CodeListDictionary" type="gmx:ML_CodeListDictionary_Type" substitutionGroup="gmx:CodeListDictionary"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_CodeListDictionary_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_CodeListDictionary"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- =========================================================================== -->
-	<!--===================== Alternative Expresssion type ===============================-->
-	<xs:complexType name="ClAlternativeExpression_Type">
-		<xs:annotation>
-			<xs:documentation>XML attributes contraints: - 1) Id is mandatory - 2) codeSpace (type xsd:anyURI) is mandatory</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gml:DefinitionType">
-				<xs:sequence>
-					<xs:element name="locale" type="gmd:PT_Locale_PropertyType"/>
-				</xs:sequence>
-				<xs:attribute name="codeSpace" type="xs:anyURI" use="required"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ClAlternativeExpression" type="gmx:ClAlternativeExpression_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ClAlternativeExpression_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ClAlternativeExpression"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- =========================================================================== -->
-	<xs:complexType name="CodeAlternativeExpression_Type">
-		<xs:annotation>
-			<xs:documentation>XML attributes contraints: - 1) Id is mandatory - 2) codeSpace (type xsd:anyURI) is mandatory</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gml:DefinitionType">
-				<xs:sequence>
-					<xs:element name="locale" type="gmd:PT_Locale_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-				<xs:attribute name="codeSpace" type="xs:anyURI" use="required"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CodeAlternativeExpression" type="gmx:CodeAlternativeExpression_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CodeAlternativeExpression_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:CodeAlternativeExpression"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!--===End Of File===-->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmx/crsItem.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmx/crsItem.xsd
deleted file mode 100644
index d6499ffb2..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmx/crsItem.xsd
+++ /dev/null
@@ -1,1030 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmx" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmx="http://www.isotc211.org/2005/gmx">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 03-15-2005 09:15:11 ====== </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../gml/gml.xsd"/>
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<xs:import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="../gmd/gmd.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="CT_CRS_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:AbstractCRS"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="CT_CoordinateSystem_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:AbstractCoordinateSystem"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="CT_CoordinateSystemAxis_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:CoordinateSystemAxis"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="CT_Datum_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:AbstractDatum"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="CT_Ellipsoid_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:Ellipsoid"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="CT_PrimeMeridian_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:PrimeMeridian"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="CT_Operation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:AbstractCoordinateOperation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="CT_OperationMethod_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:OperationMethod"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="CT_OperationParameters_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:AbstractGeneralOperationParameter"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!--============================= Multilingual types ===============================-->
-	<!--============================== GML extensions ===============================-->
-	<!--================ GML XSchema: coordinateReferenceSystems.xsd ==================-->
-	<xs:complexType name="ML_CompoundCRS_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:CompoundCRSType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:CrsAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_CompoundCRS" type="gmx:ML_CompoundCRS_Type" substitutionGroup="gml:CompoundCRS"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_CompoundCRS_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_CompoundCRS"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!--### gml:GeocentricCRS and gml:GeographicCRS were deprecated in 19136 DIS and replaced with gml:GeodeticCRS ###-->
-	<!--<xs:complexType name="ML_GeocentricCRS_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:GeocentricCRSType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:CrsAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>-->
-	<!-- ........................................................................ -->
-	<!--<xs:element name="ML_GeocentricCRS" type="gmx:ML_GeocentricCRS_Type" substitutionGroup="gml:GeocentricCRS"/>-->
-	<!-- ........................................................................ -->
-	<!--<xs:complexType name="ML_GeocentricCRS_PropertyType">
-		<xs:sequence>
-			<xs:element ref="gmx:ML_GeocentricCRS" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>-->
-	<!-- =========================================================================== -->
-	<!--### gml:GeocentricCRS and gml:GeographicCRS were deprecated in 19136 DIS and replaced with gml:GeodeticCRS ###-->
-	<!--<xs:complexType name="ML_GeographicCRS_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:GeographicCRSType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:CrsAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>-->
-	<!-- ........................................................................ -->
-	<!--<xs:element name="ML_GeographicCRS" type="gmx:ML_GeographicCRS_Type" substitutionGroup="gml:GeographicCRS"/>-->
-	<!-- ........................................................................ -->
-	<!--<xs:complexType name="ML_GeographicCRS_PropertyType">
-		<xs:sequence>
-			<xs:element ref="gmx:ML_GeographicCRS" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>-->
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_GeodeticCRS_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:GeodeticCRSType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:CrsAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_GeodeticCRS" type="gmx:ML_GeodeticCRS_Type" substitutionGroup="gml:GeodeticCRS"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_GeodeticCRS_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_GeodeticCRS"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_EngineeringCRS_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:EngineeringCRSType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:CrsAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_EngineeringCRS" type="gmx:ML_EngineeringCRS_Type" substitutionGroup="gml:EngineeringCRS"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_EngineeringCRS_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_EngineeringCRS"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_VerticalCRS_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:VerticalCRSType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:CrsAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_VerticalCRS" type="gmx:ML_VerticalCRS_Type" substitutionGroup="gml:VerticalCRS"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_VerticalCRS_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_VerticalCRS"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_TemporalCRS_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:TemporalCRSType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:CrsAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_TemporalCRS" type="gmx:ML_TemporalCRS_Type" substitutionGroup="gml:TemporalCRS"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_TemporalCRS_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_TemporalCRS"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_ImageCRS_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:ImageCRSType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:CrsAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_ImageCRS" type="gmx:ML_ImageCRS_Type" substitutionGroup="gml:ImageCRS"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_ImageCRS_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_ImageCRS"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_ProjectedCRS_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:ProjectedCRSType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:CrsAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_ProjectedCRS" type="gmx:ML_ProjectedCRS_Type" substitutionGroup="gml:ProjectedCRS"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_ProjectedCRS_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_ProjectedCRS"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_DerivedCRS_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:DerivedCRSType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:CrsAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_DerivedCRS" type="gmx:ML_DerivedCRS_Type" substitutionGroup="gml:DerivedCRS"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_DerivedCRS_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_DerivedCRS"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!--====================== GML XSchema: coordinateSystems.xsd =====================-->
-	<xs:complexType name="ML_CoordinateSystemAxis_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:CoordinateSystemAxisType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:CoordinateSystemAxisAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_CoordinateSystemAxis" type="gmx:ML_CoordinateSystemAxis_Type" substitutionGroup="gml:CoordinateSystemAxis"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_CoordinateSystemAxis_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_CoordinateSystemAxis"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_EllipsoidalCS_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:EllipsoidalCSType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:CoordinateSystemAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_EllipsoidalCS" type="gmx:ML_EllipsoidalCS_Type" substitutionGroup="gml:EllipsoidalCS"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_EllipsoidalCS_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_EllipsoidalCS"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_CartesianCS_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:CartesianCSType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:CoordinateSystemAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_CartesianCS" type="gmx:ML_CartesianCS_Type" substitutionGroup="gml:CartesianCS"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_CartesianCS_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_CartesianCS"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_AffineCS_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:AffineCSType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:CoordinateSystemAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_AffineCS" type="gmx:ML_AffineCS_Type" substitutionGroup="gml:AffineCS"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_AffineCS_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_AffineCS"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_UserDefinedCS_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:UserDefinedCSType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:CoordinateSystemAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_UserDefinedCS" type="gmx:ML_UserDefinedCS_Type" substitutionGroup="gml:UserDefinedCS"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_UserDefinedCS_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_UserDefinedCS"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_VerticalCS_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:VerticalCSType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:CoordinateSystemAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_VerticalCS" type="gmx:ML_VerticalCS_Type" substitutionGroup="gml:VerticalCS"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_VerticalCS_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_VerticalCS"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_TimeCS_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:TimeCSType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:CoordinateSystemAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_TimeCS" type="gmx:ML_TimeCS_Type" substitutionGroup="gml:TimeCS"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_TimeCS_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_TimeCS"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_CylindricalCS_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:CylindricalCSType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:CoordinateSystemAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_CylindricalCS" type="gmx:ML_CylindricalCS_Type" substitutionGroup="gml:CylindricalCS"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_CylindricalCS_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_CylindricalCS"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_SphericalCS_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:SphericalCSType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:CoordinateSystemAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_SphericalCS" type="gmx:ML_SphericalCS_Type" substitutionGroup="gml:SphericalCS"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_SphericalCS_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_SphericalCS"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_PolarCS_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:PolarCSType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:CoordinateSystemAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_PolarCS" type="gmx:ML_PolarCS_Type" substitutionGroup="gml:PolarCS"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_PolarCS_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_PolarCS"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_LinearCS_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:LinearCSType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:CoordinateSystemAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_LinearCS" type="gmx:ML_LinearCS_Type" substitutionGroup="gml:LinearCS"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_LinearCS_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_LinearCS"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!--========================== GML XSchema: datums.xsd ===========================-->
-	<xs:complexType name="ML_Ellipsoid_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:EllipsoidType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:EllipsoidAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_Ellipsoid" type="gmx:ML_Ellipsoid_Type" substitutionGroup="gml:Ellipsoid"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_Ellipsoid_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_Ellipsoid"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_PrimeMeridian_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:PrimeMeridianType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:PrimeMeridianAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_PrimeMeridian" type="gmx:ML_PrimeMeridian_Type" substitutionGroup="gml:PrimeMeridian"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_PrimeMeridian_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_PrimeMeridian"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_TemporalDatum_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:TemporalDatumType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:DatumAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_TemporalDatum" type="gmx:ML_TemporalDatum_Type" substitutionGroup="gml:TemporalDatum"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_TemporalDatum_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_TemporalDatum"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_VerticalDatum_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:VerticalDatumType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:DatumAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_VerticalDatum" type="gmx:ML_VerticalDatum_Type" substitutionGroup="gml:VerticalDatum"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_VerticalDatum_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_VerticalDatum"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_ImageDatum_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:ImageDatumType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:DatumAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_ImageDatum" type="gmx:ML_ImageDatum_Type" substitutionGroup="gml:ImageDatum"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_ImageDatum_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_ImageDatum"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_EngineeringDatum_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:EngineeringDatumType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:DatumAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_EngineeringDatum" type="gmx:ML_EngineeringDatum_Type" substitutionGroup="gml:EngineeringDatum"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_EngineeringDatum_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_EngineeringDatum"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_GeodeticDatum_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:GeodeticDatumType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:DatumAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_GeodeticDatum" type="gmx:ML_GeodeticDatum_Type" substitutionGroup="gml:GeodeticDatum"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_GeodeticDatum_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_GeodeticDatum"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!--==================== GML XSchema: coordinateOperations.xsd ======================-->
-	<xs:complexType name="ML_ConcatenatedOperation_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:ConcatenatedOperationType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:OperationAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_ConcatenatedOperation" type="gmx:ML_ConcatenatedOperation_Type" substitutionGroup="gml:ConcatenatedOperation"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_ConcatenatedOperation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_ConcatenatedOperation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_PassThroughOperation_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:PassThroughOperationType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:OperationAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_PassThroughOperation" type="gmx:ML_PassThroughOperation_Type" substitutionGroup="gml:PassThroughOperation"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_PassThroughOperation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_PassThroughOperation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_Transformation_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:TransformationType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:OperationAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_Transformation" type="gmx:ML_Transformation_Type" substitutionGroup="gml:Transformation"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_Transformation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_Transformation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_Conversion_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:ConversionType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:OperationAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_Conversion" type="gmx:ML_Conversion_Type" substitutionGroup="gml:Conversion"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_Conversion_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_Conversion"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_OperationMethod_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:OperationMethodType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:OperationMethodAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_OperationMethod" type="gmx:ML_OperationMethod_Type" substitutionGroup="gml:OperationMethod"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_OperationMethod_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_OperationMethod"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_OperationParameterGroup_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:OperationParameterGroupType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:OperationParameterAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_OperationParameterGroup" type="gmx:ML_OperationParameterGroup_Type" substitutionGroup="gml:OperationParameterGroup"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_OperationParameterGroup_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_OperationParameterGroup"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_OperationParameter_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:OperationParameterType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:OperationParameterAlt_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_OperationParameter" type="gmx:ML_OperationParameter_Type" substitutionGroup="gml:OperationParameter"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_OperationParameter_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_OperationParameter"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!--===================== Alternative Expresssion types ==============================-->
-	<xs:complexType name="CrsAlt_Type">
-		<xs:annotation>
-			<xs:documentation>XML attributes contraints: - 1) Id is mandatory - 2) codeSpace (type xsd:anyURI) is mandatory</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gml:AbstractCRSType">
-				<xs:sequence>
-					<xs:element name="locale" type="gmd:PT_Locale_PropertyType"/>
-				</xs:sequence>
-				<xs:attribute name="codeSpace" type="xs:anyURI" use="required"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CrsAlt" type="gmx:CrsAlt_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CrsAlt_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:CrsAlt"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="CoordinateSystemAlt_Type">
-		<xs:annotation>
-			<xs:documentation>XML attributes contraints: - 1) Id is mandatory - 2) codeSpace (type xsd:anyURI) is mandatory</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gml:IdentifiedObjectType">
-				<xs:sequence>
-					<xs:element name="locale" type="gmd:PT_Locale_PropertyType"/>
-				</xs:sequence>
-				<xs:attributeGroup ref="gml:AggregationAttributeGroup"/>
-				<xs:attribute name="codeSpace" type="xs:anyURI" use="required"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CoordinateSystemAlt" type="gmx:CoordinateSystemAlt_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CoordinateSystemAlt_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:CoordinateSystemAlt"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="CoordinateSystemAxisAlt_Type">
-		<xs:annotation>
-			<xs:documentation>XML attributes contraints: - 1) Id is mandatory - 2) codeSpace (type xsd:anyURI) is mandatory</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gml:CoordinateSystemAxisType">
-				<xs:sequence>
-					<xs:element name="locale" type="gmd:PT_Locale_PropertyType"/>
-				</xs:sequence>
-				<xs:attribute name="codeSpace" type="xs:anyURI" use="required"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CoordinateSystemAxisAlt" type="gmx:CoordinateSystemAxisAlt_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CoordinateSystemAxisAlt_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:CoordinateSystemAxisAlt"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DatumAlt_Type">
-		<xs:annotation>
-			<xs:documentation>XML attributes contraints: - 1) Id is mandatory - 2) codeSpace (type xsd:anyURI) is mandatory</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gml:AbstractDatumType">
-				<xs:sequence>
-					<xs:element name="locale" type="gmd:PT_Locale_PropertyType"/>
-				</xs:sequence>
-				<xs:attribute name="codeSpace" type="xs:anyURI" use="required"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DatumAlt" type="gmx:DatumAlt_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DatumAlt_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:DatumAlt"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="EllipsoidAlt_Type">
-		<xs:annotation>
-			<xs:documentation>XML attributes contraints: - 1) Id is mandatory - 2) codeSpace (type xsd:anyURI) is mandatory</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gml:IdentifiedObjectType">
-				<xs:sequence>
-					<xs:element name="locale" type="gmd:PT_Locale_PropertyType"/>
-				</xs:sequence>
-				<xs:attribute name="codeSpace" type="xs:anyURI" use="required"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="EllipsoidAlt" type="gmx:EllipsoidAlt_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="EllipsoidAlt_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:EllipsoidAlt"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="PrimeMeridianAlt_Type">
-		<xs:annotation>
-			<xs:documentation>XML attributes contraints: - 1) Id is mandatory - 2) codeSpace (type xsd:anyURI) is mandatory</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gml:IdentifiedObjectType">
-				<xs:sequence>
-					<xs:element name="locale" type="gmd:PT_Locale_PropertyType"/>
-				</xs:sequence>
-				<xs:attribute name="codeSpace" type="xs:anyURI" use="required"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="PrimeMeridianAlt" type="gmx:PrimeMeridianAlt_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="PrimeMeridianAlt_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:PrimeMeridianAlt"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="OperationAlt_Type">
-		<xs:annotation>
-			<xs:documentation>XML attributes contraints: - 1) Id is mandatory - 2) codeSpace (type xsd:anyURI) is mandatory</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gml:AbstractCoordinateOperationType">
-				<xs:sequence>
-					<xs:element name="locale" type="gmd:PT_Locale_PropertyType"/>
-				</xs:sequence>
-				<xs:attribute name="codeSpace" type="xs:anyURI" use="required"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="OperationAlt" type="gmx:OperationAlt_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="OperationAlt_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:OperationAlt"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="OperationMethodAlt_Type">
-		<xs:annotation>
-			<xs:documentation>XML attributes contraints: - 1) Id is mandatory - 2) codeSpace (type xsd:anyURI) is mandatory</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gml:IdentifiedObjectType">
-				<xs:sequence>
-					<xs:element name="locale" type="gmd:PT_Locale_PropertyType"/>
-				</xs:sequence>
-				<xs:attribute name="codeSpace" type="xs:anyURI" use="required"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="OperationMethodAlt" type="gmx:OperationMethodAlt_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="OperationMethodAlt_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:OperationMethodAlt"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="OperationParameterAlt_Type">
-		<xs:annotation>
-			<xs:documentation>XML attributes contraints: - 1) Id is mandatory - 2) codeSpace (type xsd:anyURI) is mandatory</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gml:OperationParameterType">
-				<xs:sequence>
-					<xs:element name="locale" type="gmd:PT_Locale_PropertyType"/>
-				</xs:sequence>
-				<xs:attribute name="codeSpace" type="xs:anyURI" use="required"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="OperationParameterAlt" type="gmx:OperationParameterAlt_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="OperationParameterAlt_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:OperationParameterAlt"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- === End of file === -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmx/extendedTypes.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmx/extendedTypes.xsd
deleted file mode 100644
index bf4e13791..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmx/extendedTypes.xsd
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmx" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmx="http://www.isotc211.org/2005/gmx">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 03-14-2005 12:00:20 ====== Handcrafted</xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="../xlink/xlinks.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<!-- ======================== Handcrafted types =================================== -->
-	<!-- ========================================================================== -->
-	<!-- ====================== The FileName prototype ================================ -->
-	<!--It is used to point to a source file and is substitutable for CharacterString-->
-	<!--================= Type ==================-->
-	<xs:complexType name="FileName_Type">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="src" type="xs:anyURI"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="FileName" type="gmx:FileName_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="FileName_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:FileName"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- ====================== The MimeFileType prototype ============================= -->
-	<!--It is used to provide information on file types and is substitutable for CharacterString-->
-	<!--================= Type ==================-->
-	<xs:complexType name="MimeFileType_Type">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="type" type="xs:string" use="required"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MimeFileType" type="gmx:MimeFileType_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MimeFileType_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:MimeFileType"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- ======================= The Anchor prototype ================================ -->
-	<!--It is used to point to a registred definition-->
-	<!--================= Type ==================-->
-	<xs:complexType name="Anchor_Type">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attributeGroup ref="xlink:simpleLink"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="Anchor" type="gmx:Anchor_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Anchor_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:Anchor"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!--======= End of Schema ======-->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmx/gmx.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmx/gmx.xsd
deleted file mode 100644
index 4c1a8f5b9..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmx/gmx.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema elementFormDefault="qualified" targetNamespace="http://www.isotc211.org/2005/gmx" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gmx="http://www.isotc211.org/2005/gmx">
-    <!-- ================================= Annotation ================================ -->
-    <xs:annotation>
-        <xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 03-18-2005 11:12:17 ====== </xs:documentation>
-    </xs:annotation>
-    <!-- ================================== Imports ================================== -->
-    <xs:include schemaLocation="../gmx/gmxUsage.xsd"/>
-    <!-- ########################################################################### -->
-    <!-- ########################################################################### -->
-    <!-- ================================== Classes ================================= -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmx/gmxUsage.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmx/gmxUsage.xsd
deleted file mode 100644
index e9b4b7f9a..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmx/gmxUsage.xsd
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmx" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gmx="http://www.isotc211.org/2005/gmx">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 04-27-2005 17:15:30 ====== </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="../gmd/gmd.xsd"/>
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<xs:include schemaLocation="../gmx/catalogues.xsd"/>
-	<xs:include schemaLocation="../gmx/extendedTypes.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="MX_Aggregate_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDS_Aggregate_Type">
-				<xs:sequence>
-					<xs:element name="aggregateCatalogue" type="gmx:CT_Catalogue_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="aggregateFile" type="gmx:MX_SupportFile_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MX_Aggregate" type="gmx:MX_Aggregate_Type" substitutionGroup="gmd:AbstractDS_Aggregate"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MX_Aggregate_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:MX_Aggregate"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MX_DataSet_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:DS_DataSet_Type">
-				<xs:sequence>
-					<xs:element name="dataFile" type="gmx:MX_DataFile_PropertyType" maxOccurs="unbounded"/>
-					<xs:element name="datasetCatalogue" type="gmx:CT_Catalogue_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="supportFile" type="gmx:MX_SupportFile_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MX_DataSet" type="gmx:MX_DataSet_Type" substitutionGroup="gmd:DS_DataSet"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MX_DataSet_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:MX_DataSet"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MX_DataFile_Type">
-		<xs:complexContent>
-			<xs:extension base="gmx:AbstractMX_File_Type">
-				<xs:sequence>
-					<xs:element name="featureTypes" type="gco:GenericName_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="fileFormat" type="gmd:MD_Format_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MX_DataFile" type="gmx:MX_DataFile_Type" substitutionGroup="gmx:AbstractMX_File"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MX_DataFile_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:MX_DataFile"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MX_SupportFile_Type">
-		<xs:complexContent>
-			<xs:extension base="gmx:AbstractMX_File_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MX_SupportFile" type="gmx:MX_SupportFile_Type" substitutionGroup="gmx:AbstractMX_File"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MX_SupportFile_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:MX_SupportFile"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="AbstractMX_File_Type" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="fileName" type="gmx:FileName_PropertyType"/>
-					<xs:element name="fileDescription" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="fileType" type="gmx:MimeFileType_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractMX_File" type="gmx:AbstractMX_File_Type" abstract="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MX_File_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:AbstractMX_File"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MX_ScopeCode" type="gco:CodeListValue_Type" substitutionGroup="gmd:MD_ScopeCode"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MX_ScopeCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:MX_ScopeCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmx/uomItem.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmx/uomItem.xsd
deleted file mode 100644
index f2ac3f479..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gmx/uomItem.xsd
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmx" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmx="http://www.isotc211.org/2005/gmx">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 03-15-2005 09:15:02 ====== </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<xs:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../gml/gml.xsd"/>
-	<xs:import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="../gmd/gmd.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="UnitDefinition_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="BaseUnit_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:BaseUnit"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="DerivedUnit_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:DerivedUnit"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="ConventionalUnit_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:ConventionalUnit"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_BaseUnit_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:BaseUnitType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:UomAlternativeExpression_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_BaseUnit" type="gmx:ML_BaseUnit_Type" substitutionGroup="gml:BaseUnit"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_BaseUnit_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_BaseUnit"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_DerivedUnit_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:DerivedUnitType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:UomAlternativeExpression_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_DerivedUnit" type="gmx:ML_DerivedUnit_Type" substitutionGroup="gml:DerivedUnit"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_DerivedUnit_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_DerivedUnit"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_ConventionalUnit_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:ConventionalUnitType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:UomAlternativeExpression_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_ConventionalUnit" type="gmx:ML_ConventionalUnit_Type" substitutionGroup="gml:ConventionalUnit"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_ConventionalUnit_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_ConventionalUnit"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="ML_UnitDefinition_Type">
-		<xs:complexContent>
-			<xs:extension base="gml:UnitDefinitionType">
-				<xs:sequence>
-					<xs:element name="alternativeExpression" type="gmx:UomAlternativeExpression_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="ML_UnitDefinition" type="gmx:ML_UnitDefinition_Type" substitutionGroup="gml:UnitDefinition"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ML_UnitDefinition_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:ML_UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- =========================================================================== -->
-	<!--===================== Alternative Expresssion type ===============================-->
-	<xs:complexType name="UomAlternativeExpression_Type">
-		<xs:annotation>
-			<xs:documentation>XML attributes contraints: - 1) Id is mandatory - 2) codeSpace (type xsd:anyURI) is mandatory</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gml:UnitDefinitionType">
-				<xs:sequence>
-					<xs:element name="locale" type="gmd:PT_Locale_PropertyType"/>
-				</xs:sequence>
-				<xs:attribute name="codeSpace" type="xs:anyURI" use="required"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="UomAlternativeExpression" type="gmx:UomAlternativeExpression_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="UomAlternativeExpression_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmx:UomAlternativeExpression"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- =========================================================================== -->
-	<!-- === End of file === -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gsr/gsr.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gsr/gsr.xsd
deleted file mode 100644
index 8f7f428dd..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gsr/gsr.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gsr" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gsr="http://www.isotc211.org/2005/gsr">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:24:48 ====== </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:include schemaLocation="../gsr/spatialReferencing.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gsr/spatialReferencing.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gsr/spatialReferencing.xsd
deleted file mode 100644
index 524766e6b..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gsr/spatialReferencing.xsd
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gsr" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gsr="http://www.isotc211.org/2005/gsr">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:24:48 ====== </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<xs:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../gml/gml.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<!-- ........................................................................ -->
-	<!--==XCGE: gml:AbstractCRS==-->
-	<!-- ........................................................................ -->
-	<xs:complexType name="SC_CRS_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:AbstractCRS"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gss/geometry.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gss/geometry.xsd
deleted file mode 100644
index 0c920e00f..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gss/geometry.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gss" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gss="http://www.isotc211.org/2005/gss">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:14:37 ====== The geometry packages (Figure 4) contain the various classes for coordinate geometry. All of these classes through the root class GM_Object inherit an optional association to a coordinate reference system. All direct positions exposed through the interfaces defined in this standard shall be in the coordinate reference system of the geometric object accessed. All elements of a geometric complex, composite, or aggregate shall be associated to the same coordinate reference system. When instances of GM_Object are aggregated in another GM_Object (such as a GM_Aggregate, or GM_Complex) which already has a coordinate reference system specified, then these elements are assumed to be in that same coordinate reference system unless otherwise specified.  - The geometry package has several internal packages that separate primitive geometric objects, aggregates and complexes, which have a more elaborate internal structure than simple aggregates. Figure 4 shows the dependencies between the geometry packages as well as a list of classes for each package - Figure 5 shows the basic classes defined in the geometry packages. Any object that inherits the semantics of the GM_Object acts as a set of direct positions. Its behavior will be determined by which direct positions it contains. Objects under GM_Primitive will be open, that is, they will not contain their boundary points; curves will not contain their end points, surfaces will not contain their boundary curves, and solids will not contain their bounding surfaces. Objects under GM_Complex will be closed, that is, they will contain their boundary points. This leads to some apparent ambiguity. A representation of a line as a primitive must reference its end points, but will not contain these points as a set of direct positions. A representation of a line as a complex will also reference its end points, and will contain these points as a set of direct positions. This means that identical digital representations will have slightly different semantics depending on whether they are accessed as primitives or complexes.  - This difference of semantics is most striking in the GM_CompositeCurve. Composite curves are used to represent features whose geometry could also be represented as curve primitives. From a cartographic point of view, these two representations are not different. From a topological point of view, they are different. This distinction appears in the inheritance diagram (Figure 5) as an inheritance relationship between GM_CompositeCurve and GM_OrientableCurve. The primary semantics of a GM_CompositeCurve (see 6.6.5) is as a closed GM_Object, but it may also act as an open GM_Object under GM_Primitive operations (see 6.3.10). Interface protocols depending upon the topological details of this object will have to be distinguished as to whether they have been inherited from GM_Primitive or GM_Complex, where the distinction first occurs. Even though these protocols have been inherited from the same operations defined at GM_Object, they will act differently depending upon the branch of the inheritance tree from which they have inherited semantics. Creators of implementation profiles may take this into account and use a proxy mechanism for realization relationships that cause semantic dissonance. Such a procedure will be necessary in object-oriented programming and databases in systems that disallow multiple inheritance or make limiting assumptions about method binding.</xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../gml/gml.xsd"/>
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<!-- ........................................................................ -->
-	<!--==XCGE: gml:Point==-->
-	<!-- ........................................................................ -->
-	<xs:complexType name="GM_Point_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:Point"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!--==XCGE: gml:AbstractGeometry==-->
-	<!-- ........................................................................ -->
-	<xs:complexType name="GM_Object_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:AbstractGeometry"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gss/gss.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gss/gss.xsd
deleted file mode 100644
index f8cac1855..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gss/gss.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gss" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gss="http://www.isotc211.org/2005/gss">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:14:37 ====== This package contains the normative (Geometry and Topology) parts of the model for ISO 19107. This document should be referred to as the official description of the Model. If there are any differences, then ISO 19107 takes precedence.  -  - This packages also contains example (informative) of applications of 19107.</xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:include schemaLocation="../gss/geometry.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gts/gts.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gts/gts.xsd
deleted file mode 100644
index a4edb52ce..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gts/gts.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gts" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gts="http://www.isotc211.org/2005/gts">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:18:09 ====== </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:include schemaLocation="../gts/temporalObjects.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gts/temporalObjects.xsd b/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gts/temporalObjects.xsd
deleted file mode 100644
index e822718dc..000000000
--- a/src/main/resources/input/IHW/xsd/www.isotc211.org/GEOMATICS-20050101/gts/temporalObjects.xsd
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gts" elementFormDefault="qualified" version="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gts="http://www.isotc211.org/2005/gts">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>This file was generated from ISO TC/211 UML class diagrams == 01-26-2005 12:18:09 ====== </xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../gml/gml.xsd"/>
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="../gco/gco.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<!-- ........................................................................ -->
-	<!--==XCGE: gml:AbstractTimePrimitive==-->
-	<!-- ........................................................................ -->
-	<xs:complexType name="TM_Primitive_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:AbstractTimePrimitive"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="TM_PeriodDuration" type="xs:duration"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="TM_PeriodDuration_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gts:TM_PeriodDuration"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/CITYGML20-20120201/citygml/relief/2.0/relief.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/CITYGML20-20120201/citygml/relief/2.0/relief.xsd
deleted file mode 100644
index 1fe650c38..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/CITYGML20-20120201/citygml/relief/2.0/relief.xsd
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- CityGML Version No. 2.0, February 2012 -->
-<!-- CityGML - GML 3.1.1 application schema for 3D city models -->
-<!-- International encoding standard of the Open Geospatial Consortium, see http://www.opengeospatial.org/standards/citygml -->
-<!-- Jointly developed by the Special Interest Group 3D (SIG 3D) of GDI-DE, see http://www.sig3d.org               -->
-<!-- For further information see: http://www.citygml.org -->
-<xs:schema xmlns="http://www.opengis.net/citygml/relief/2.0" xmlns:core="http://www.opengis.net/citygml/2.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" targetNamespace="http://www.opengis.net/citygml/relief/2.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0.0">
-	<xs:annotation>
-		<xs:documentation>
-	CityGML is an OGC Standard.
-	Copyright (c) 2012 Open Geospatial Consortium.
-	To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</xs:documentation>
-	</xs:annotation>
-	<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-	<xs:import namespace="http://www.opengis.net/citygml/2.0" schemaLocation="http://schemas.opengis.net/citygml/2.0/cityGMLBase.xsd"/>
-	<!-- ========================================================================================= -->
-	<!-- ==================================CityGML Relief module ===================================== -->
-	<!-- ========================================================================================= -->
-	<xs:complexType name="ReliefFeatureType">
-		<xs:annotation>
-			<xs:documentation>Type describing the features of the Digital Terrain Model. As subclass of _CityObject, a ReliefFeature
-				inherits all attributes and relations, in particular an id, names, external references, and generalization relations.
-			</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="core:AbstractCityObjectType">
-				<xs:sequence>
-					<xs:element name="lod" type="core:integerBetween0and4"/>
-					<xs:element name="reliefComponent" type="ReliefComponentPropertyType" maxOccurs="unbounded"/>
-					<xs:element ref="_GenericApplicationPropertyOfReliefFeature" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ========================================================================================= -->
-	<xs:element name="ReliefFeature" type="ReliefFeatureType" substitutionGroup="core:_CityObject"/>
-	<!-- ========================================================================================= -->
-	<xs:element name="_GenericApplicationPropertyOfReliefFeature" type="xs:anyType" abstract="true"/>
-	<!-- ========================================================================================= -->
-	<xs:complexType name="AbstractReliefComponentType" abstract="true">
-		<xs:annotation>
-			<xs:documentation>Type describing the components of a relief feature - either a TIN, a Grid, mass points or break lines. As
-				subclass of _CityObject, a ReliefComponent inherits all attributes and relations, in particular an id, names, external
-				references, and generalization relations. </xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="core:AbstractCityObjectType">
-				<xs:sequence>
-					<xs:element name="lod" type="core:integerBetween0and4"/>
-					<xs:element name="extent" type="gml:PolygonPropertyType" minOccurs="0"/>
-					<xs:element ref="_GenericApplicationPropertyOfReliefComponent" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ========================================================================================= -->
-	<xs:element name="_ReliefComponent" type="AbstractReliefComponentType" abstract="true" substitutionGroup="core:_CityObject"/>
-	<!-- ========================================================================================= -->
-	<xs:element name="_GenericApplicationPropertyOfReliefComponent" type="xs:anyType" abstract="true"/>
-	<!-- ========================================================================================= -->
-	<xs:complexType name="ReliefComponentPropertyType">
-		<xs:annotation>
-			<xs:documentation>Denotes the relation of a ReliefFeature to its components. The ReliefComponentPropertyType element must
-				either carry a reference to a _ReliefComponent object or contain a _ReliefComponent object inline, but neither both nor
-				none. </xs:documentation>
-		</xs:annotation>
-		<xs:sequence minOccurs="0">
-			<xs:element ref="_ReliefComponent"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<!-- ========================================================================================= -->
-	<xs:complexType name="TINReliefType">
-		<xs:annotation>
-			<xs:documentation>Type describing the TIN component of a relief feature. As subclass of _CityObject, a TINRelief inherits
-				all attributes and relations, in particular an id, names, external references, and generalization relations.
-			</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="AbstractReliefComponentType">
-				<xs:sequence>
-					<xs:element name="tin" type="tinPropertyType"/>
-					<xs:element ref="_GenericApplicationPropertyOfTinRelief" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ========================================================================================= -->
-	<xs:element name="TINRelief" type="TINReliefType" substitutionGroup="_ReliefComponent"/>
-	<!-- ========================================================================================= -->
-	<xs:element name="_GenericApplicationPropertyOfTinRelief" type="xs:anyType" abstract="true"/>
-	<!-- ========================================================================================= -->
-	<xs:complexType name="RasterReliefType">
-		<xs:annotation>
-			<xs:documentation>Type describing the raster component of a relief feature. As subclass of _CityObject, a RasterRelief
-				inherits all attributes and relations, in particular an id, names, external references, and generalization relations.
-			</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="AbstractReliefComponentType">
-				<xs:sequence>
-					<xs:element name="grid" type="gridPropertyType"/>
-					<xs:element ref="_GenericApplicationPropertyOfRasterRelief" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ========================================================================================= -->
-	<xs:element name="RasterRelief" type="RasterReliefType" substitutionGroup="_ReliefComponent"/>
-	<!-- ========================================================================================= -->
-	<xs:element name="_GenericApplicationPropertyOfRasterRelief" type="xs:anyType" abstract="true"/>
-	<!-- ========================================================================================= -->
-	<xs:complexType name="MassPointReliefType">
-		<xs:annotation>
-			<xs:documentation>Type describing the mass point component of a relief feature. As subclass of _CityObject, a MassPoint
-				Relief inherits all attributes and relations, in particular an id, names, external references, and generalization
-				relations. </xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="AbstractReliefComponentType">
-				<xs:sequence>
-					<xs:element name="reliefPoints" type="gml:MultiPointPropertyType"/>
-					<xs:element ref="_GenericApplicationPropertyOfMassPointRelief" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ========================================================================================= -->
-	<xs:element name="MassPointRelief" type="MassPointReliefType" substitutionGroup="_ReliefComponent"/>
-	<!-- ========================================================================================= -->
-	<xs:element name="_GenericApplicationPropertyOfMassPointRelief" type="xs:anyType" abstract="true"/>
-	<!-- ========================================================================================= -->
-	<xs:complexType name="BreaklineReliefType">
-		<xs:annotation>
-			<xs:documentation>Type describing the break line Component of a relief feature. A break line relief consists of break lines
-				or ridgeOrValleyLines. As subclass of _CityObject, a BreaklineRelief inherits all attributes and relations, in particular
-				an id, names, external references, and generalization relations. </xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="AbstractReliefComponentType">
-				<xs:sequence>
-					<xs:element name="ridgeOrValleyLines" type="gml:MultiCurvePropertyType" minOccurs="0"/>
-					<xs:element name="breaklines" type="gml:MultiCurvePropertyType" minOccurs="0"/>
-					<xs:element ref="_GenericApplicationPropertyOfBreaklineRelief" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ========================================================================================= -->
-	<xs:element name="BreaklineRelief" type="BreaklineReliefType" substitutionGroup="_ReliefComponent"/>
-	<!-- ========================================================================================= -->
-	<xs:element name="_GenericApplicationPropertyOfBreaklineRelief" type="xs:anyType" abstract="true"/>
-	<!-- ========================================================================================= -->
-	<xs:complexType name="tinPropertyType">
-		<xs:annotation>
-			<xs:documentation>Denotes the relation of a TINRelief to its components. The tinPropertyType element must either carry a
-				reference to a gml:TriangulatedSurface object or contain a gml:TriangulatedSurface object inline, but neither both nor
-				none. </xs:documentation>
-		</xs:annotation>
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:TriangulatedSurface"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<!-- ========================================================================================= -->
-	<xs:complexType name="gridPropertyType">
-		<xs:annotation>
-			<xs:documentation>Denotes the relation of a RasterReliefType to its components. The gridPropertyType element must either
-				carry a reference to a gml:RectifiedGridCoverage object or contain a gml:RectifiedGridCoverage object inline, but neither
-				both nor none. </xs:documentation>
-		</xs:annotation>
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:RectifiedGridCoverage"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<!-- ========================================================================================= -->
-	<!-- ============= The height values of the grid are represented by Elevation elements, which have a height  ====== -->
-	<!-- ============= value and a unit of measurement, e.g. meter.                                                                                 ====== -->
-	<!-- ========================================================================================= -->
-	<xs:element name="Elevation" type="gml:LengthType" substitutionGroup="gml:_Object"/>
-	<!-- ========================================================================================= -->
-</xs:schema>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/ReadMe.txt b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/ReadMe.txt
deleted file mode 100644
index 500e23dd0..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/ReadMe.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-OpenGIS(r) GML schema ReadMe.txt
------------------------------------------------------------------------
-
-OpenGIS Geography Markup Language (GML) Encoding Standard
-
-More information on the OGC GML standard may be found at
- http://www.opengeospatial.org/standards/gml
-
-The most current schema are available at http://schemas.opengis.net/ .
-
------------------------------------------------------------------------
-
-Note: The root document of the GML 3.x schema is the file "gml.xsd".
-
-2010-01-28  Kevin Stegemoller
-  * v1.0-v3.2: update/verify copyright (06-135r7 s#3.2)
-  * v1.0-v3.2: update relative schema imports to absolute URLs (06-135r7 s#15)
-  * v1.0-v3.2: updated xsd:schema:@version attribute (06-135r7 s#13.4)
-  * v1.0-v3.2: add archives (.zip) files of previous versions
-  * v1.0-v3.2: create/update ReadMe.txt (06-135r7 s#17)
-
-2007-09-06  Kevin Stegemoller
-
-  * v3.2.1: Posted GML 3.2.1 (ISO 19136) schemas from OGC 07-036
-	  See http://schemas.opengis.net/gml/3.2.1/gml_3_2_1-ReadMe.txt
-
-NOTICE: GML 2.1.2 will link to the newest version of GML 2.1.2.x .  As
-of 5 September 2007, the contents of 2.1.2 contain GML 2.1.2.1 per OGC
-06-189.  If you have questions, please contact the webmaster (at)
-opengeospatial.org. -- 2007-09-05  Kevin Stegemoller
-
-2007-08-27  Chris Holmes
-
-  * v2.1.2: update 2.1.2.1 and ReadMe.txt changes
-  * v2.1.2.0: Contains previous version of GML 2.1.2 (pre- 5 Sep 2007)
-  * v2.1.2.1: Contains Corrigendum 1 for GML 2.1.2 schema fix (OGC 06-189).
-  * v2.1.2.1: Corrigendum 1 for GML 2.1.2 schema fix (OGC 06-189) includes:
-    + Official schema location is now http://schemas.opengis.net
-    + replace xlink import schema location with ../../xlink/1.0.0/xlinks.xsd
-    + remove gml/2.1.2/xlinks.xsd (optional, as is now unused).
-    + geometry.xsd: fixed so will now validate by conformant processors by:
-    + geometry.xsd: moving minOccurs/maxOccurs cardinality indicators from
-      <element> declarations to their containing <sequence> elements in the
-      context of the GML property pattern. -- SJDC 2006-12-07
-    + gml:Coord is suppressed. -- SJDC 2006-12-07
-
-2005-11-22  Arliss Whiteside
-
-  * GML versions 2.0.0 through 3.1.1: The sets of XML Schema Documents for
-    OpenGIS GML Versions 2.0.0 through 3.1.1 have been edited to reflect the
-    corrigenda to all those OGC documents that is based on the change requests: 
-    OGC 05-068r1 "Store xlinks.xsd file at a fixed location"
-    OGC 05-081r2 "Change to use relative paths"
-    OGC 05-105 "Remove description and copyright tags from XML schema documents"
- 
-  * Note: check each OGC numbered document for detailed changes.
-
------------------------------------------------------------------------
-
-Policies, Procedures, Terms, and Conditions of OGC(r) are available
-  http://www.opengeospatial.org/ogc/legal/ .
-
-Copyright (c) 2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-
------------------------------------------------------------------------
-
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/SchematronConstraints.xml b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/SchematronConstraints.xml
deleted file mode 100644
index 6cfd40f19..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/SchematronConstraints.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xml:lang="en">
-	<sch:title>Schematron constraints for GML / ISO 19136</sch:title>
-	<sch:ns prefix="sch" uri="http://purl.oclc.org/dsdl/schematron"/>
-	<sch:ns prefix="gml" uri="http://www.opengis.net/gml/3.2"/>
-	<sch:ns prefix="xlink" uri="http://www.w3.org/1999/xlink"/>
-	<sch:pattern>
-		<sch:rule context="gml:ValueArray">
-			<sch:assert test="not(@codeSpace and @uom)">ValueArray may not carry both a reference to a codeSpace and a uom</sch:assert>
-		</sch:rule>
-	</sch:pattern>
-	<sch:pattern>
-		<sch:rule context="gml:ValueArray">
-			<sch:assert test="count(gml:valueComponent/*) = count(gml:valueComponent/*[name() = name(../../gml:valueComponent[1]/*[1])])">All components shall be of the same type</sch:assert>
-			<sch:assert test="count(gml:valueComponents/*) = count(gml:valueComponents/*[name() = name(../*[1])])">All components shall be of the same type</sch:assert>
-		</sch:rule>
-	</sch:pattern>
-	<sch:pattern>
-		<sch:rule context="gml:pos">
-			<sch:assert test="not(@srsDimension) or @srsName">The presence of a dimension attribute implies the presence of the srsName attribute.</sch:assert>
-			<sch:assert test="not(@axisLabels) or @srsName">The presence of an axisLabels attribute implies the presence of the srsName attribute.</sch:assert>
-			<sch:assert test="not(@uomLabels) or @srsName">The presence of an uomLabels attribute implies the presence of the srsName attribute.</sch:assert>
-			<sch:assert test="(not(@uomLabels) and not(@axisLabels)) or (@uomLabels and @axisLabels)">The presence of an uomLabels attribute implies the presence of the axisLabels attribute and vice versa.</sch:assert>
-		</sch:rule>
-	</sch:pattern>
-	<sch:pattern>
-		<sch:rule context="gml:PolyhedralSurface">
-			<sch:assert test="count(gml:patches/*)=count(gml:patches/gml:PolygonPatch)">All patches shall be gml:PolygonPatch elements or an element in the substitution group of gml:PolygonPatch. Note that the test currently does not identify substitutable elements correctly, this will require the use of XPath 2 in the future.</sch:assert>
-		</sch:rule>
-	</sch:pattern>
-	<sch:pattern>
-		<sch:rule context="gml:TriangulatedSurface">
-			<sch:assert test="count(gml:patches/*)=count(gml:patches/gml:Triangle)">All patches shall be gml:Triangle elements or an element in the substitution group of gml:PolygonPatch. Note that the test currently does not identify substitutable elements correctly, this will require the use of XPath 2 in the future.</sch:assert>
-		</sch:rule>
-	</sch:pattern>
-	<sch:pattern>
-		<sch:rule context="gml:abstractStrictAssociationRole">
-			<sch:assert test="not(@xlink:href and (*|text()))">Property element may not carry both a reference to an object and contain an object.</sch:assert>
-			<sch:assert test="@xlink:href | (*|text())">Property element shall either carry a reference to an object or contain an object.</sch:assert>
-		</sch:rule>
-	</sch:pattern>
-	<sch:pattern>
-		<sch:rule context="gml:MultiPointDomain">
-			<sch:assert test="count(gml:domainSet/*)=count(gml:domainSet/gml:MultiPoint)">All values in the domain set shall be gml:MultiPoint elements or an element in its substitution group. Note that the test currently does not identify substitutable elements correctly, this will require the use of XPath 2 in the future.</sch:assert>
-		</sch:rule>
-	</sch:pattern>
-	<sch:pattern>
-		<sch:rule context="gml:MultiCurveDomain">
-			<sch:assert test="count(gml:domainSet/*)=count(gml:domainSet/gml:MultiCurve)">All values in the domain set shall be gml:MultiCurve elements or an element in its substitution group. Note that the test currently does not identify substitutable elements correctly, this will require the use of XPath 2 in the future.</sch:assert>
-		</sch:rule>
-	</sch:pattern>
-	<sch:pattern>
-		<sch:rule context="gml:MultiSurfaceDomain">
-			<sch:assert test="count(gml:domainSet/*)=count(gml:domainSet/gml:MultiSurface)">All values in the domain set shall be gml:MultiSurface elements or an element in its substitution group. Note that the test currently does not identify substitutable elements correctly, this will require the use of XPath 2 in the future.</sch:assert>
-		</sch:rule>
-	</sch:pattern>
-	<sch:pattern>
-		<sch:rule context="gml:MultiSolidDomain">
-			<sch:assert test="count(gml:domainSet/*)=count(gml:domainSet/gml:MultiSolid)">All values in the domain set shall be gml:MultiSolid elements or an element in its substitution group. Note that the test currently does not identify substitutable elements correctly, this will require the use of XPath 2 in the future.</sch:assert>
-		</sch:rule>
-	</sch:pattern>
-	<sch:pattern>
-		<sch:rule context="gml:GridDomain">
-			<sch:assert test="count(gml:domainSet/*)=count(gml:domainSet/gml:Grid)">All values in the domain set shall be gml:Grid elements or an element in its substitution group. Note that the test currently does not identify substitutable elements correctly, this will require the use of XPath 2 in the future.</sch:assert>
-		</sch:rule>
-	</sch:pattern>
-	<sch:pattern>
-		<sch:rule context="gml:RectifiedGridDomain">
-			<sch:assert test="count(gml:domainSet/*)=count(gml:domainSet/gml:RectifiedGrid)">All values in the domain set shall be gml:RectifiedGrid elements or an element in its substitution group. Note that the test currently does not identify substitutable elements correctly, this will require the use of XPath 2 in the future.</sch:assert>
-		</sch:rule>
-	</sch:pattern>
-</sch:schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/basicTypes.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/basicTypes.xsd
deleted file mode 100644
index 152e6e91f..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/basicTypes.xsd
+++ /dev/null
@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:basicTypes:3.2.1">basicTypes.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 8.2.
-W3C XML Schema provides a set of built-in "simple" types which define methods for representing values as literals without internal markup.  These are described in W3C XML Schema Part 2:2001.  Because GML is an XML encoding in which instances are described using XML Schema, these simple types shall be used as far as possible and practical for the representation of data types.  W3C XML Schema also provides methods for defining 
--	new simple types by restriction and combination of the built-in types, and 
--	complex types, with simple content, but which also have XML attributes.  
-In many places where a suitable built-in simple type is not available, simple content types derived using the XML Schema mechanisms are used for the representation of data types in GML.  
-A set of these simple content types that are required by several GML components are defined in the basicTypes schema, as well as some elements based on them. These are primarily based around components needed to record amounts, counts, flags and terms, together with support for exceptions or null values.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<simpleType name="NilReasonType">
-		<annotation>
-			<documentation>gml:NilReasonType defines a content model that allows recording of an explanation for a void value or other exception.
-gml:NilReasonType is a union of the following enumerated values:
--	inapplicable there is no value
--	missing the correct value is not readily available to the sender of this data. Furthermore, a correct value may not exist
--	template the value will be available later
--	unknown the correct value is not known to, and not computable by, the sender of this data. However, a correct value probably exists
--	withheld the value is not divulged
--	other:text other brief explanation, where text is a string of two or more characters with no included spaces
-and
--	anyURI which should refer to a resource which describes the reason for the exception
-A particular community may choose to assign more detailed semantics to the standard values provided. Alternatively, the URI method enables a specific or more complete explanation for the absence of a value to be provided elsewhere and indicated by-reference in an instance document.
-gml:NilReasonType is used as a member of a union in a number of simple content types where it is necessary to permit a value from the NilReasonType union as an alternative to the primary type.</documentation>
-		</annotation>
-		<union memberTypes="gml:NilReasonEnumeration anyURI"/>
-	</simpleType>
-	<simpleType name="NilReasonEnumeration">
-		<union>
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="inapplicable"/>
-					<enumeration value="missing"/>
-					<enumeration value="template"/>
-					<enumeration value="unknown"/>
-					<enumeration value="withheld"/>
-				</restriction>
-			</simpleType>
-			<simpleType>
-				<restriction base="string">
-					<pattern value="other:\w{2,}"/>
-				</restriction>
-			</simpleType>
-		</union>
-	</simpleType>
-	<simpleType name="SignType">
-		<annotation>
-			<documentation>gml:SignType is a convenience type with values "+" (plus) and "-" (minus).</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="-"/>
-			<enumeration value="+"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="booleanOrNilReason">
-		<annotation>
-			<documentation>Extension to the respective XML Schema built-in simple type to allow a choice of either a value of the built-in simple type or a reason for a nil value.</documentation>
-		</annotation>
-		<union memberTypes="gml:NilReasonEnumeration boolean anyURI"/>
-	</simpleType>
-	<simpleType name="doubleOrNilReason">
-		<annotation>
-			<documentation>Extension to the respective XML Schema built-in simple type to allow a choice of either a value of the built-in simple type or a reason for a nil value.</documentation>
-		</annotation>
-		<union memberTypes="gml:NilReasonEnumeration double anyURI"/>
-	</simpleType>
-	<simpleType name="integerOrNilReason">
-		<annotation>
-			<documentation>Extension to the respective XML Schema built-in simple type to allow a choice of either a value of the built-in simple type or a reason for a nil value.</documentation>
-		</annotation>
-		<union memberTypes="gml:NilReasonEnumeration integer anyURI"/>
-	</simpleType>
-	<simpleType name="NameOrNilReason">
-		<annotation>
-			<documentation>Extension to the respective XML Schema built-in simple type to allow a choice of either a value of the built-in simple type or a reason for a nil value.</documentation>
-		</annotation>
-		<union memberTypes="gml:NilReasonEnumeration Name anyURI"/>
-	</simpleType>
-	<simpleType name="stringOrNilReason">
-		<annotation>
-			<documentation>Extension to the respective XML Schema built-in simple type to allow a choice of either a value of the built-in simple type or a reason for a nil value.</documentation>
-		</annotation>
-		<union memberTypes="gml:NilReasonEnumeration string anyURI"/>
-	</simpleType>
-	<complexType name="CodeType">
-		<annotation>
-			<documentation>gml:CodeType is a generalized type to be used for a term, keyword or name.
-It adds a XML attribute codeSpace to a term, where the value of the codeSpace attribute (if present) shall indicate a dictionary, thesaurus, classification scheme, authority, or pattern for the term.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="string">
-				<attribute name="codeSpace" type="anyURI"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<complexType name="CodeWithAuthorityType">
-		<annotation>
-			<documentation>gml:CodeWithAuthorityType requires that the codeSpace attribute is provided in an instance.</documentation>
-		</annotation>
-		<simpleContent>
-			<restriction base="gml:CodeType">
-				<attribute name="codeSpace" type="anyURI" use="required"/>
-			</restriction>
-		</simpleContent>
-	</complexType>
-	<complexType name="MeasureType">
-		<annotation>
-			<documentation>gml:MeasureType supports recording an amount encoded as a value of XML Schema double, together with a units of measure indicated by an attribute uom, short for "units Of measure". The value of the uom attribute identifies a reference system for the amount, usually a ratio or interval scale.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="double">
-				<attribute name="uom" type="gml:UomIdentifier" use="required"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<simpleType name="UomIdentifier">
-		<annotation>
-			<documentation>The simple type gml:UomIdentifer defines the syntax and value space of the unit of measure identifier.</documentation>
-		</annotation>
-		<union memberTypes="gml:UomSymbol gml:UomURI"/>
-	</simpleType>
-	<simpleType name="UomSymbol">
-		<annotation>
-			<documentation>This type specifies a character string of length at least one, and restricted such that it must not contain any of the following characters: ":" (colon), " " (space), (newline), (carriage return), (tab). This allows values corresponding to familiar abbreviations, such as "kg", "m/s", etc. 
-It is recommended that the symbol be an identifier for a unit of measure as specified in the "Unified Code of Units of Measure" (UCUM) (http://aurora.regenstrief.org/UCUM). This provides a set of symbols and a grammar for constructing identifiers for units of measure that are unique, and may be easily entered with a keyboard supporting the limited character set known as 7-bit ASCII. ISO 2955 formerly provided a specification with this scope, but was withdrawn in 2001. UCUM largely follows ISO 2955 with modifications to remove ambiguities and other problems.</documentation>
-		</annotation>
-		<restriction base="string">
-			<pattern value="[^: \n\r\t]+"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="UomURI">
-		<annotation>
-			<documentation>This type specifies a URI, restricted such that it must start with one of the following sequences: "#", "./", "../", or a string of characters followed by a ":". These patterns ensure that the most common URI forms are supported, including absolute and relative URIs and URIs that are simple fragment identifiers, but prohibits certain forms of relative URI that could be mistaken for unit of measure symbol . 
-NOTE	It is possible to re-write such a relative URI to conform to the restriction (e.g. "./m/s").
-In an instance document, on elements of type gml:MeasureType the mandatory uom attribute shall carry a value corresponding to either 
--	a conventional unit of measure symbol,
--	a link to a definition of a unit of measure that does not have a conventional symbol, or when it is desired to indicate a precise or variant definition.</documentation>
-		</annotation>
-		<restriction base="anyURI">
-			<pattern value="([a-zA-Z][a-zA-Z0-9\-\+\.]*:|\.\./|\./|#).*"/>
-		</restriction>
-	</simpleType>
-	<complexType name="CoordinatesType">
-		<annotation>
-			<documentation>This type is deprecated for tuples with ordinate values that are numbers.
-CoordinatesType is a text string, intended to be used to record an array of tuples or coordinates. 
-While it is not possible to enforce the internal structure of the string through schema validation, some optional attributes have been provided in previous versions of GML to support a description of the internal structure. These attributes are deprecated. The attributes were intended to be used as follows:
-Decimal	symbol used for a decimal point (default="." a stop or period)
-cs        	symbol used to separate components within a tuple or coordinate string (default="," a comma)
-ts        	symbol used to separate tuples or coordinate strings (default=" " a space)
-Since it is based on the XML Schema string type, CoordinatesType may be used in the construction of tables of tuples or arrays of tuples, including ones that contain mixed text and numeric values.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="string">
-				<attribute name="decimal" type="string" default="."/>
-				<attribute name="cs" type="string" default=","/>
-				<attribute name="ts" type="string" default="&#x20;"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<simpleType name="booleanList">
-		<annotation>
-			<documentation>A type for a list of values of the respective simple type.</documentation>
-		</annotation>
-		<list itemType="boolean"/>
-	</simpleType>
-	<simpleType name="doubleList">
-		<annotation>
-			<documentation>A type for a list of values of the respective simple type.</documentation>
-		</annotation>
-		<list itemType="double"/>
-	</simpleType>
-	<simpleType name="integerList">
-		<annotation>
-			<documentation>A type for a list of values of the respective simple type.</documentation>
-		</annotation>
-		<list itemType="integer"/>
-	</simpleType>
-	<simpleType name="NameList">
-		<annotation>
-			<documentation>A type for a list of values of the respective simple type.</documentation>
-		</annotation>
-		<list itemType="Name"/>
-	</simpleType>
-	<simpleType name="NCNameList">
-		<annotation>
-			<documentation>A type for a list of values of the respective simple type.</documentation>
-		</annotation>
-		<list itemType="NCName"/>
-	</simpleType>
-	<simpleType name="QNameList">
-		<annotation>
-			<documentation>A type for a list of values of the respective simple type.</documentation>
-		</annotation>
-		<list itemType="QName"/>
-	</simpleType>
-	<simpleType name="booleanOrNilReasonList">
-		<annotation>
-			<documentation>A type for a list of values of the respective simple type.</documentation>
-		</annotation>
-		<list itemType="gml:booleanOrNilReason"/>
-	</simpleType>
-	<simpleType name="NameOrNilReasonList">
-		<annotation>
-			<documentation>A type for a list of values of the respective simple type.</documentation>
-		</annotation>
-		<list itemType="gml:NameOrNilReason"/>
-	</simpleType>
-	<simpleType name="doubleOrNilReasonList">
-		<annotation>
-			<documentation>A type for a list of values of the respective simple type.</documentation>
-		</annotation>
-		<list itemType="gml:doubleOrNilReason"/>
-	</simpleType>
-	<simpleType name="integerOrNilReasonList">
-		<annotation>
-			<documentation>A type for a list of values of the respective simple type.</documentation>
-		</annotation>
-		<list itemType="gml:integerOrNilReason"/>
-	</simpleType>
-	<complexType name="CodeListType">
-		<annotation>
-			<documentation>gml:CodeListType provides for lists of terms. The values in an instance element shall all be valid according to the rules of the dictionary, classification scheme, or authority identified by the value of its codeSpace attribute.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:NameList">
-				<attribute name="codeSpace" type="anyURI"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<complexType name="CodeOrNilReasonListType">
-		<annotation>
-			<documentation>gml:CodeOrNilReasonListType provides for lists of terms. The values in an instance element shall all be valid according to the rules of the dictionary, classification scheme, or authority identified by the value of its codeSpace attribute. An instance element may also include embedded values from NilReasonType. It is intended to be used in situations where a term or classification is expected, but the value may be absent for some reason.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:NameOrNilReasonList">
-				<attribute name="codeSpace" type="anyURI"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<complexType name="MeasureListType">
-		<annotation>
-			<documentation>gml:MeasureListType provides for a list of quantities.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:doubleList">
-				<attribute name="uom" type="gml:UomIdentifier" use="required"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<complexType name="MeasureOrNilReasonListType">
-		<annotation>
-			<documentation>gml:MeasureOrNilReasonListType provides for a list of quantities. An instance element may also include embedded values from NilReasonType. It is intended to be used in situations where a value is expected, but the value may be absent for some reason.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:doubleOrNilReasonList">
-				<attribute name="uom" type="gml:UomIdentifier" use="required"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/coordinateOperations.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/coordinateOperations.xsd
deleted file mode 100644
index af9f2e4a9..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/coordinateOperations.xsd
+++ /dev/null
@@ -1,524 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" xml:lang="en" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns="http://www.w3.org/2001/XMLSchema" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:coordinateOperations:3.2.1">coordinateOperations.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 13.6.
-The spatial or temporal coordinate operations schema components can be divided into five logical parts, which define elements and types for XML encoding of the definitions of:
--	Multiple abstract coordinate operations
--	Multiple concrete types of coordinate operations, including Transformations and Conversions
--	Abstract and concrete parameter values and groups
--	Operation methods
--	Abstract and concrete operation parameters and groups
-These schema component encodes the Coordinate Operation package of the UML Model for ISO 19111 Clause 11.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="referenceSystems.xsd"/>
-	<include schemaLocation="measures.xsd"/>
-	<import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
-	<element name="AbstractCoordinateOperation" type="gml:AbstractCoordinateOperationType" abstract="true" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>gml:AbstractCoordinateOperation is a mathematical operation on coordinates that transforms or converts coordinates to another coordinate reference system. Many but not all coordinate operations (from CRS A to CRS B) also uniquely define the inverse operation (from CRS B to CRS A). In some cases, the operation method algorithm for the inverse operation is the same as for the forward algorithm, but the signs of some operation parameter values shall be reversed. In other cases, different algorithms are required for the forward and inverse operations, but the same operation parameter values are used. If (some) entirely different parameter values are needed, a different coordinate operation shall be defined.
-The optional coordinateOperationAccuracy property elements provide estimates of the impact of this coordinate operation on point position accuracy.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractCoordinateOperationType" abstract="true">
-		<complexContent>
-			<extension base="gml:IdentifiedObjectType">
-				<sequence>
-					<element ref="gml:domainOfValidity" minOccurs="0"/>
-					<element ref="gml:scope" maxOccurs="unbounded"/>
-					<element ref="gml:operationVersion" minOccurs="0"/>
-					<element ref="gml:coordinateOperationAccuracy" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:sourceCRS" minOccurs="0"/>
-					<element ref="gml:targetCRS" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="operationVersion" type="string">
-		<annotation>
-			<documentation>gml:operationVersion is the version of the coordinate transformation (i.e., instantiation due to the stochastic nature of the parameters). Mandatory when describing a transformation, and should not be supplied for a conversion.</documentation>
-		</annotation>
-	</element>
-	<element name="coordinateOperationAccuracy">
-		<annotation>
-			<documentation>gml:coordinateOperationAccuracy is an association role to a DQ_PositionalAccuracy object as encoded in ISO/TS 19139, either referencing or containing the definition of that positional accuracy. That object contains an estimate of the impact of this coordinate operation on point accuracy. That is, it gives position error estimates for the target coordinates of this coordinate operation, assuming no errors in the source coordinates.</documentation>
-		</annotation>
-		<complexType>
-			<sequence minOccurs="0">
-				<element ref="gmd:AbstractDQ_PositionalAccuracy"/>
-			</sequence>
-			<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</complexType>
-	</element>
-	<element name="sourceCRS" type="gml:CRSPropertyType">
-		<annotation>
-			<documentation>gml:sourceCRS is an association role to the source CRS (coordinate reference system) of this coordinate operation.</documentation>
-		</annotation>
-	</element>
-	<element name="targetCRS" type="gml:CRSPropertyType">
-		<annotation>
-			<documentation>gml:targetCRS is an association role to the target CRS (coordinate reference system) of this coordinate operation.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CoordinateOperationPropertyType">
-		<annotation>
-			<documentation>gml:CoordinateOperationPropertyType is a property type for association roles to a coordinate operation, either referencing or containing the definition of that coordinate operation.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractCoordinateOperation"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="AbstractSingleOperation" type="gml:AbstractCoordinateOperationType" abstract="true" substitutionGroup="gml:AbstractCoordinateOperation">
-		<annotation>
-			<documentation>gml:AbstractSingleOperation is a single (not concatenated) coordinate operation.</documentation>
-		</annotation>
-	</element>
-	<complexType name="SingleOperationPropertyType">
-		<annotation>
-			<documentation>gml:SingleOperationPropertyType is a property type for association roles to a single operation, either referencing or containing the definition of that single operation.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractSingleOperation"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="AbstractGeneralConversion" type="gml:AbstractGeneralConversionType" abstract="true" substitutionGroup="gml:AbstractOperation">
-		<annotation>
-			<documentation>gm:AbstractGeneralConversion is an abstract operation on coordinates that does not include any change of datum. The best-known example of a coordinate conversion is a map projection. The parameters describing coordinate conversions are defined rather than empirically derived. Note that some conversions have no parameters. The operationVersion, sourceCRS, and targetCRS elements are omitted in a coordinate conversion.
-This abstract complex type is expected to be extended for well-known operation methods with many Conversion instances, in GML Application Schemas that define operation-method-specialized element names and contents. This conversion uses an operation method, usually with associated parameter values. However, operation methods and parameter values are directly associated with concrete subtypes, not with this abstract type. All concrete types derived from this type shall extend this type to include a "usesMethod" element that references the "OperationMethod" element. Similarly, all concrete types derived from this type shall extend this type to include zero or more elements each named "uses...Value" that each use the type of an element substitutable for the "AbstractGeneralParameterValue" element.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractGeneralConversionType" abstract="true">
-		<complexContent>
-			<restriction base="gml:AbstractCoordinateOperationType">
-				<sequence>
-					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:description" minOccurs="0"/>
-					<element ref="gml:descriptionReference" minOccurs="0"/>
-					<element ref="gml:identifier"/>
-					<element ref="gml:name" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:remarks" minOccurs="0"/>
-					<element ref="gml:domainOfValidity" minOccurs="0"/>
-					<element ref="gml:scope" maxOccurs="unbounded"/>
-					<element ref="gml:coordinateOperationAccuracy" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-				<attribute ref="gml:id" use="required"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<complexType name="GeneralConversionPropertyType">
-		<annotation>
-			<documentation>gml:GeneralConversionPropertyType is a property type for association roles to a general conversion, either referencing or containing the definition of that conversion.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractGeneralConversion"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="AbstractGeneralTransformation" type="gml:AbstractGeneralTransformationType" abstract="true" substitutionGroup="gml:AbstractOperation">
-		<annotation>
-			<documentation>gml:AbstractGeneralTransformation is an abstract operation on coordinates that usually includes a change of Datum. The parameters of a coordinate transformation are empirically derived from data containing the coordinates of a series of points in both coordinate reference systems. This computational process is usually "over-determined", allowing derivation of error (or accuracy) estimates for the transformation. Also, the stochastic nature of the parameters may result in multiple (different) versions of the same coordinate transformation. The operationVersion, sourceCRS, and targetCRS proeprty elements are mandatory in a coordinate transformation.
-This abstract complex type is expected to be extended for well-known operation methods with many Transformation instances, in Application Schemas that define operation-method-specialized value element names and contents. This transformation uses an operation method with associated parameter values. However, operation methods and parameter values are directly associated with concrete subtypes, not with this abstract type. All concrete types derived from this type shall extend this type to include a "usesMethod" element that references one "OperationMethod" element. Similarly, all concrete types derived from this type shall extend this type to include one or more elements each named "uses...Value" that each use the type of an element substitutable for the "AbstractGeneralParameterValue" element.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractGeneralTransformationType" abstract="true">
-		<complexContent>
-			<restriction base="gml:AbstractCoordinateOperationType">
-				<sequence>
-					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:description" minOccurs="0"/>
-					<element ref="gml:descriptionReference" minOccurs="0"/>
-					<element ref="gml:identifier"/>
-					<element ref="gml:name" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:remarks" minOccurs="0"/>
-					<element ref="gml:domainOfValidity" minOccurs="0"/>
-					<element ref="gml:scope" maxOccurs="unbounded"/>
-					<element ref="gml:operationVersion"/>
-					<element ref="gml:coordinateOperationAccuracy" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:sourceCRS"/>
-					<element ref="gml:targetCRS"/>
-				</sequence>
-				<attribute ref="gml:id" use="required"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<complexType name="GeneralTransformationPropertyType">
-		<annotation>
-			<documentation>gml:GeneralTransformationPropertyType is a property type for association roles to a general transformation, either referencing or containing the definition of that transformation.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractGeneralTransformation"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="ConcatenatedOperation" type="gml:ConcatenatedOperationType" substitutionGroup="gml:AbstractCoordinateOperation"/>
-	<complexType name="ConcatenatedOperationType">
-		<annotation>
-			<documentation>gml:ConcatenatedOperation is an ordered sequence of two or more coordinate operations. This sequence of operations is constrained by the requirement that the source coordinate reference system of step (n+1) must be the same as the target coordinate reference system of step (n). The source coordinate reference system of the first step and the target coordinate reference system of the last step are the source and target coordinate reference system associated with the concatenated operation. Instead of a forward operation, an inverse operation may be used for one or more of the operation steps mentioned above, if the inverse operation is uniquely defined by the forward operation.
-The gml:coordOperation property elements are an ordered sequence of associations to the two or more operations used by this concatenated operation. The AggregationAttributeGroup should be used to specify that the coordOperation associations are ordered.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCoordinateOperationType">
-				<sequence>
-					<element ref="gml:coordOperation" minOccurs="2" maxOccurs="unbounded"/>
-				</sequence>
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="coordOperation" type="gml:CoordinateOperationPropertyType">
-		<annotation>
-			<documentation>gml:coordOperation is an association role to a coordinate operation.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ConcatenatedOperationPropertyType">
-		<annotation>
-			<documentation>gml:ConcatenatedOperationPropertyType is a property type for association roles to a concatenated operation, either referencing or containing the definition of that concatenated operation.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:ConcatenatedOperation"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="PassThroughOperation" type="gml:PassThroughOperationType" substitutionGroup="gml:AbstractSingleOperation">
-		<annotation>
-			<documentation>gml:PassThroughOperation is a pass-through operation specifies that a subset of a coordinate tuple is subject to a specific coordinate operation.
-The modifiedCoordinate property elements are an ordered sequence of positive integers defining the positions in a coordinate tuple of the coordinates affected by this pass-through operation. The AggregationAttributeGroup should be used to specify that the modifiedCoordinate elements are ordered.</documentation>
-		</annotation>
-	</element>
-	<complexType name="PassThroughOperationType">
-		<complexContent>
-			<extension base="gml:AbstractCoordinateOperationType">
-				<sequence>
-					<element ref="gml:modifiedCoordinate" maxOccurs="unbounded"/>
-					<element ref="gml:coordOperation"/>
-				</sequence>
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="modifiedCoordinate" type="positiveInteger">
-		<annotation>
-			<documentation>gml:modifiedCoordinate is a positive integer defining a position in a coordinate tuple.</documentation>
-		</annotation>
-	</element>
-	<complexType name="PassThroughOperationPropertyType">
-		<annotation>
-			<documentation>gml:PassThroughOperationPropertyType is a property type for association roles to a pass through operation, either referencing or containing the definition of that pass through operation.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:PassThroughOperation"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="Conversion" type="gml:ConversionType" substitutionGroup="gml:AbstractGeneralConversion">
-		<annotation>
-			<documentation>gml:Conversion is a concrete operation on coordinates that does not include any change of Datum. The best-known example of a coordinate conversion is a map projection. The parameters describing coordinate conversions are defined rather than empirically derived. Note that some conversions have no parameters.
-This concrete complex type can be used without using a GML Application Schema that defines operation-method-specialized element names and contents, especially for methods with only one Conversion instance.
-The usesValue property elements are an unordered list of composition associations to the set of parameter values used by this conversion operation.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ConversionType">
-		<complexContent>
-			<extension base="gml:AbstractGeneralConversionType">
-				<sequence>
-					<element ref="gml:method"/>
-					<element ref="gml:parameterValue" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="method" type="gml:OperationMethodPropertyType">
-		<annotation>
-			<documentation>gml:method is an association role to the operation method used by a coordinate operation.</documentation>
-		</annotation>
-	</element>
-	<element name="parameterValue" type="gml:AbstractGeneralParameterValuePropertyType">
-		<annotation>
-			<documentation>gml:parameterValue is a composition association to a parameter value or group of parameter values used by a coordinate operation.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ConversionPropertyType">
-		<annotation>
-			<documentation>gml:ConversionPropertyType is a property type for association roles to a concrete general-purpose conversion, either referencing or containing the definition of that conversion.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:Conversion"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="Transformation" type="gml:TransformationType" substitutionGroup="gml:AbstractGeneralTransformation">
-		<annotation>
-			<documentation>gml:Transformation is a concrete object element derived from gml:GeneralTransformation (13.6.2.13).
-This concrete object can be used for all operation methods, without using a GML Application Schema that defines operation-method-specialized element names and contents, especially for methods with only one Transformation instance.
-The parameterValue elements are an unordered list of composition associations to the set of parameter values used by this conversion operation.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TransformationType">
-		<complexContent>
-			<extension base="gml:AbstractGeneralTransformationType">
-				<sequence>
-					<element ref="gml:method"/>
-					<element ref="gml:parameterValue" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TransformationPropertyType">
-		<annotation>
-			<documentation>gml:TransformationPropertyType is a property type for association roles to a transformation, either referencing or containing the definition of that transformation.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:Transformation"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="AbstractGeneralParameterValue" type="gml:AbstractGeneralParameterValueType" abstract="true" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>gml:AbstractGeneralParameterValue is an abstract parameter value or group of parameter values.
-This abstract complexType is expected to be extended and restricted for well-known operation methods with many instances, in Application Schemas that define operation-method-specialized element names and contents. Specific parameter value elements are directly contained in concrete subtypes, not in this abstract type. All concrete types derived from this type shall extend this type to include one "...Value" element with an appropriate type, which should be one of the element types allowed in the ParameterValueType. In addition, all derived concrete types shall extend this type to include a "operationParameter" property element that references one element substitutable for the "OperationParameter" object element.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractGeneralParameterValueType" abstract="true">
-		<sequence/>
-	</complexType>
-	<complexType name="AbstractGeneralParameterValuePropertyType">
-		<annotation>
-			<documentation>gml:AbstractGeneralParameterValuePropertyType is a  property type for inline association roles to a parameter value or group of parameter values, always containing the values.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:AbstractGeneralParameterValue"/>
-		</sequence>
-	</complexType>
-	<element name="ParameterValue" type="gml:ParameterValueType" substitutionGroup="gml:AbstractGeneralParameterValue">
-		<annotation>
-			<documentation>gml:ParameterValue is a parameter value, an ordered sequence of values, or a reference to a file of parameter values. This concrete complex type may be used for operation methods without using an Application Schema that defines operation-method-specialized element names and contents, especially for methods with only one instance. This complex type may be used, extended, or restricted for well-known operation methods, especially for methods with many instances.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ParameterValueType">
-		<complexContent>
-			<extension base="gml:AbstractGeneralParameterValueType">
-				<sequence>
-					<choice>
-						<element ref="gml:value"/>
-						<element ref="gml:dmsAngleValue"/>
-						<element ref="gml:stringValue"/>
-						<element ref="gml:integerValue"/>
-						<element ref="gml:booleanValue"/>
-						<element ref="gml:valueList"/>
-						<element ref="gml:integerValueList"/>
-						<element ref="gml:valueFile"/>
-					</choice>
-					<element ref="gml:operationParameter"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="value" type="gml:MeasureType">
-		<annotation>
-			<documentation>gml:value is a numeric value of an operation parameter, with its associated unit of measure.</documentation>
-		</annotation>
-	</element>
-	<element name="stringValue" type="string">
-		<annotation>
-			<documentation>gml:stringValue is a character string value of an operation parameter. A string value does not have an associated unit of measure.</documentation>
-		</annotation>
-	</element>
-	<element name="integerValue" type="positiveInteger">
-		<annotation>
-			<documentation>gml:integerValue is a positive integer value of an operation parameter, usually used for a count. An integer value does not have an associated unit of measure.</documentation>
-		</annotation>
-	</element>
-	<element name="booleanValue" type="boolean">
-		<annotation>
-			<documentation>gml:booleanValue is a boolean value of an operation parameter. A Boolean value does not have an associated unit of measure.</documentation>
-		</annotation>
-	</element>
-	<element name="valueList" type="gml:MeasureListType">
-		<annotation>
-			<documentation>gml:valueList is an ordered sequence of two or more numeric values of an operation parameter list, where each value has the same associated unit of measure. An element of this type contains a space-separated sequence of double values.</documentation>
-		</annotation>
-	</element>
-	<element name="integerValueList" type="gml:integerList">
-		<annotation>
-			<documentation>gml:integerValueList is an ordered sequence of two or more integer values of an operation parameter list, usually used for counts. These integer values do not have an associated unit of measure. An element of this type contains a space-separated sequence of integer values.</documentation>
-		</annotation>
-	</element>
-	<element name="valueFile" type="anyURI">
-		<annotation>
-			<documentation>gml:valueFile is a reference to a file or a part of a file containing one or more parameter values, each numeric value with its associated unit of measure. When referencing a part of a file, that file shall contain multiple identified parts, such as an XML encoded document. Furthermore, the referenced file or part of a file may reference another part of the same or different files, as allowed in XML documents.</documentation>
-		</annotation>
-	</element>
-	<element name="operationParameter" type="gml:OperationParameterPropertyType">
-		<annotation>
-			<documentation>gml:operationParameter is an association role to the operation parameter of which this is a value.</documentation>
-		</annotation>
-	</element>
-	<element name="ParameterValueGroup" type="gml:ParameterValueGroupType" substitutionGroup="gml:AbstractGeneralParameterValue">
-		<annotation>
-			<documentation>gml:ParameterValueGroup is a group of related parameter values. The same group can be repeated more than once in a Conversion, Transformation, or higher level ParameterValueGroup, if those instances contain different values of one or more parameterValues which suitably distinquish among those groups. This concrete complex type can be used for operation methods without using an Application Schema that defines operation-method-specialized element names and contents. This complex type may be used, extended, or restricted for well-known operation methods, especially for methods with only one instance.
-The parameterValue elements are an unordered set of composition association roles to the parameter values and groups of values included in this group.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ParameterValueGroupType">
-		<complexContent>
-			<extension base="gml:AbstractGeneralParameterValueType">
-				<sequence>
-					<element ref="gml:parameterValue" minOccurs="2" maxOccurs="unbounded"/>
-					<element ref="gml:group"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="group" type="gml:OperationParameterGroupPropertyType">
-		<annotation>
-			<documentation>gml:group is an association role to the operation parameter group for which this element provides parameter values.</documentation>
-		</annotation>
-	</element>
-	<element name="OperationMethod" type="gml:OperationMethodType" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>gml:OperationMethod is a method (algorithm or procedure) used to perform a coordinate operation. Most operation methods use a number of operation parameters, although some coordinate conversions use none. Each coordinate operation using the method assigns values to these parameters.
-The parameter elements are an unordered list of associations to the set of operation parameters and parameter groups used by this operation method.</documentation>
-		</annotation>
-	</element>
-	<complexType name="OperationMethodType">
-		<complexContent>
-			<extension base="gml:IdentifiedObjectType">
-				<sequence>
-					<choice>
-						<element ref="gml:formulaCitation"/>
-						<element ref="gml:formula"/>
-					</choice>
-					<element ref="gml:sourceDimensions" minOccurs="0"/>
-					<element ref="gml:targetDimensions" minOccurs="0"/>
-					<element ref="gml:parameter" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="formulaCitation">
-		<annotation>
-			<documentation>gml:formulaCitation provides a reference to a publication giving the formula(s) or procedure used by an coordinate operation method.</documentation>
-		</annotation>
-		<complexType>
-			<sequence minOccurs="0">
-				<element ref="gmd:CI_Citation"/>
-			</sequence>
-			<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</complexType>
-	</element>
-	<element name="formula" type="gml:CodeType">
-		<annotation>
-			<documentation>gml:formula Formula(s) or procedure used by an operation method. The use of the codespace attribite has been deprecated. The property value shall be a character string.</documentation>
-		</annotation>
-	</element>
-	<element name="sourceDimensions" type="positiveInteger">
-		<annotation>
-			<documentation>gml:sourceDimensions is the number of dimensions in the source CRS of this operation method.</documentation>
-		</annotation>
-	</element>
-	<element name="targetDimensions" type="positiveInteger">
-		<annotation>
-			<documentation>gml:targetDimensions is the number of dimensions in the target CRS of this operation method.</documentation>
-		</annotation>
-	</element>
-	<element name="parameter" type="gml:AbstractGeneralOperationParameterPropertyType">
-		<annotation>
-			<documentation>gml:parameter is an association to an operation parameter or parameter group.</documentation>
-		</annotation>
-	</element>
-	<complexType name="OperationMethodPropertyType">
-		<annotation>
-			<documentation>gml:OperationMethodPropertyType is a property type for association roles to a concrete general-purpose operation method, either referencing or containing the definition of that method.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:OperationMethod"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="AbstractGeneralOperationParameter" type="gml:AbstractGeneralOperationParameterType" abstract="true" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>gml:GeneralOperationParameter is the abstract definition of a parameter or group of parameters used by an operation method.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractGeneralOperationParameterType" abstract="true">
-		<complexContent>
-			<extension base="gml:IdentifiedObjectType">
-				<sequence>
-					<element ref="gml:minimumOccurs" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="minimumOccurs" type="nonNegativeInteger">
-		<annotation>
-			<documentation>gml:minimumOccurs is the minimum number of times that values for this parameter group or parameter are required. If this attribute is omitted, the minimum number shall be one.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractGeneralOperationParameterPropertyType">
-		<annotation>
-			<documentation>gml:AbstractGeneralOperationParameterPropertyType is a property type for association roles to an operation parameter or group, either referencing or containing the definition of that parameter or group.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractGeneralOperationParameter"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="OperationParameter" type="gml:OperationParameterType" substitutionGroup="gml:AbstractGeneralOperationParameter">
-		<annotation>
-			<documentation>gml:OperationParameter is the definition of a parameter used by an operation method. Most parameter values are numeric, but other types of parameter values are possible. This complex type is expected to be used or extended for all operation methods, without defining operation-method-specialized element names.</documentation>
-		</annotation>
-	</element>
-	<complexType name="OperationParameterType">
-		<complexContent>
-			<extension base="gml:AbstractGeneralOperationParameterType">
-				<sequence/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="OperationParameterPropertyType">
-		<annotation>
-			<documentation>gml:OperationParameterPropertyType is a property type for association roles to an operation parameter, either referencing or containing the definition of that parameter.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:OperationParameter"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="OperationParameterGroup" type="gml:OperationParameterGroupType" substitutionGroup="gml:AbstractGeneralOperationParameter">
-		<annotation>
-			<documentation>gml:OperationParameterGroup is the definition of a group of parameters used by an operation method. This complex type is expected to be used or extended for all applicable operation methods, without defining operation-method-specialized element names.
-The generalOperationParameter elements are an unordered list of associations to the set of operation parameters that are members of this group.</documentation>
-		</annotation>
-	</element>
-	<complexType name="OperationParameterGroupType">
-		<complexContent>
-			<extension base="gml:AbstractGeneralOperationParameterType">
-				<sequence>
-					<element ref="gml:maximumOccurs" minOccurs="0"/>
-					<element ref="gml:parameter" minOccurs="2" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="maximumOccurs" type="positiveInteger">
-		<annotation>
-			<documentation>gml:maximumOccurs is the maximum number of times that values for this parameter group may be included. If this attribute is omitted, the maximum number shall be one.</documentation>
-		</annotation>
-	</element>
-	<complexType name="OperationParameterGroupPropertyType">
-		<annotation>
-			<documentation>gml:OperationParameterPropertyType is a property type for association roles to an operation parameter group, either referencing or containing the definition of that parameter group.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:OperationParameterGroup"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/coordinateReferenceSystems.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/coordinateReferenceSystems.xsd
deleted file mode 100644
index ad14d2b4a..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/coordinateReferenceSystems.xsd
+++ /dev/null
@@ -1,372 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" xml:lang="en" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:coordinateReferenceSystems:3.2.1">coordinateReferenceSystems.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 13.3.
-The spatial-temporal coordinate reference systems schema components are divided into two logical parts. One part defines elements and types for XML encoding of abstract coordinate reference systems definitions. The larger part defines specialized constructs for XML encoding of definitions of the multiple concrete types of spatial-temporal coordinate reference systems.
-These schema components encode the Coordinate Reference System packages of the UML Models of ISO 19111 Clause 8 and ISO/DIS 19136 D.3.10, with the exception of the abstract "SC_CRS" class.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="coordinateSystems.xsd"/>
-	<include schemaLocation="datums.xsd"/>
-	<include schemaLocation="coordinateOperations.xsd"/>
-	<element name="AbstractSingleCRS" type="gml:AbstractCRSType" abstract="true" substitutionGroup="gml:AbstractCRS">
-		<annotation>
-			<documentation>gml:AbstractSingleCRS implements a coordinate reference system consisting of one coordinate system and one datum (as opposed to a Compound CRS).</documentation>
-		</annotation>
-	</element>
-	<complexType name="SingleCRSPropertyType">
-		<annotation>
-			<documentation>gml:SingleCRSPropertyType is a property type for association roles to a single coordinate reference system, either referencing or containing the definition of that coordinate reference system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractSingleCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="AbstractGeneralDerivedCRS" type="gml:AbstractGeneralDerivedCRSType" abstract="true" substitutionGroup="gml:AbstractSingleCRS">
-		<annotation>
-			<documentation>gml:AbstractGeneralDerivedCRS is a coordinate reference system that is defined by its coordinate conversion from another coordinate reference system. This abstract complex type shall not be used, extended, or restricted, in a GML Application Schema, to define a concrete subtype with a meaning equivalent to a concrete subtype specified in this document.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractGeneralDerivedCRSType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractCRSType">
-				<sequence>
-					<element ref="gml:conversion"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="conversion" type="gml:GeneralConversionPropertyType">
-		<annotation>
-			<documentation>gml:conversion is an association role to the coordinate conversion used to define the derived CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="CompoundCRS" type="gml:CompoundCRSType" substitutionGroup="gml:AbstractCRS">
-		<annotation>
-			<documentation>gml:CompundCRS is a coordinate reference system describing the position of points through two or more independent coordinate reference systems. It is associated with a non-repeating sequence of two or more instances of SingleCRS.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CompoundCRSType">
-		<complexContent>
-			<extension base="gml:AbstractCRSType">
-				<sequence>
-					<element ref="gml:componentReferenceSystem" minOccurs="2" maxOccurs="unbounded"/>
-				</sequence>
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="componentReferenceSystem" type="gml:SingleCRSPropertyType">
-		<annotation>
-			<documentation>The gml:componentReferenceSystem elements are an ordered sequence of associations to all the component coordinate reference systems included in this compound coordinate reference system. The gml:AggregationAttributeGroup should be used to specify that the gml:componentReferenceSystem properties are ordered.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CompoundCRSPropertyType">
-		<annotation>
-			<documentation>gml:CompoundCRSPropertyType is a property type for association roles to a compound coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:CompoundCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="GeodeticCRS" type="gml:GeodeticCRSType" substitutionGroup="gml:AbstractSingleCRS"/>
-	<complexType name="GeodeticCRSType">
-		<annotation>
-			<documentation>gml:GeodeticCRS is a coordinate reference system based on a geodetic datum.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCRSType">
-				<sequence>
-					<choice>
-						<element ref="gml:ellipsoidalCS"/>
-						<element ref="gml:cartesianCS"/>
-						<element ref="gml:sphericalCS"/>
-					</choice>
-					<element ref="gml:geodeticDatum"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="ellipsoidalCS" type="gml:EllipsoidalCSPropertyType">
-		<annotation>
-			<documentation>gml:ellipsoidalCS is an association role to the ellipsoidal coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="cartesianCS" type="gml:CartesianCSPropertyType">
-		<annotation>
-			<documentation>gml:cartesianCS is an association role to the Cartesian coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="sphericalCS" type="gml:SphericalCSPropertyType">
-		<annotation>
-			<documentation>gml:sphericalCS is an association role to the spherical coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="geodeticDatum" type="gml:GeodeticDatumPropertyType">
-		<annotation>
-			<documentation>gml:geodeticDatum is an association role to the geodetic datum used by this CRS.
-</documentation>
-		</annotation>
-	</element>
-	<complexType name="GeodeticCRSPropertyType">
-		<annotation>
-			<documentation>gml:GeodeticCRSPropertyType is a property type for association roles to a geodetic coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:GeodeticCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="VerticalCRS" type="gml:VerticalCRSType" substitutionGroup="gml:AbstractSingleCRS">
-		<annotation>
-			<documentation>gml:VerticalCRS is a 1D coordinate reference system used for recording heights or depths. Vertical CRSs make use of the direction of gravity to define the concept of height or depth, but the relationship with gravity may not be straightforward. By implication, ellipsoidal heights (h) cannot be captured in a vertical coordinate reference system. Ellipsoidal heights cannot exist independently, but only as an inseparable part of a 3D coordinate tuple defined in a geographic 3D coordinate reference system.</documentation>
-		</annotation>
-	</element>
-	<complexType name="VerticalCRSType">
-		<complexContent>
-			<extension base="gml:AbstractCRSType">
-				<sequence>
-					<element ref="gml:verticalCS"/>
-					<element ref="gml:verticalDatum"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="verticalCS" type="gml:VerticalCSPropertyType">
-		<annotation>
-			<documentation>gml:verticalCS is an association role to the vertical coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="verticalDatum" type="gml:VerticalDatumPropertyType">
-		<annotation>
-			<documentation>gml:verticalDatum is an association role to the vertical datum used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<complexType name="VerticalCRSPropertyType">
-		<annotation>
-			<documentation>gml:VerticalCRSPropertyType is a property type for association roles to a vertical coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:VerticalCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="ProjectedCRS" type="gml:ProjectedCRSType" substitutionGroup="gml:AbstractGeneralDerivedCRS">
-		<annotation>
-			<documentation>gml:ProjectedCRS is a 2D coordinate reference system used to approximate the shape of the earth on a planar surface, but in such a way that the distortion that is inherent to the approximation is carefully controlled and known. Distortion correction is commonly applied to calculated bearings and distances to produce values that are a close match to actual field values.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ProjectedCRSType">
-		<complexContent>
-			<extension base="gml:AbstractGeneralDerivedCRSType">
-				<sequence>
-					<choice>
-						<element ref="gml:baseGeodeticCRS"/>
-						<element ref="gml:baseGeographicCRS"/>
-					</choice>
-					<element ref="gml:cartesianCS"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="baseGeodeticCRS" type="gml:GeodeticCRSPropertyType">
-		<annotation>
-			<documentation>gml:baseGeodeticCRS is an association role to the geodetic coordinate reference system used by this projected CRS.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ProjectedCRSPropertyType">
-		<annotation>
-			<documentation>gml:ProjectedCRSPropertyType is a property type for association roles to a projected coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:ProjectedCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="DerivedCRS" type="gml:DerivedCRSType" substitutionGroup="gml:AbstractGeneralDerivedCRS">
-		<annotation>
-			<documentation>gml:DerivedCRS is a single coordinate reference system that is defined by its coordinate conversion from another single coordinate reference system known as the base CRS. The base CRS can be a projected coordinate reference system, if this DerivedCRS is used for a georectified grid coverage as described in ISO 19123, Clause 8.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DerivedCRSType">
-		<complexContent>
-			<extension base="gml:AbstractGeneralDerivedCRSType">
-				<sequence>
-					<element ref="gml:baseCRS"/>
-					<element ref="gml:derivedCRSType"/>
-					<element ref="gml:coordinateSystem"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="baseCRS" type="gml:SingleCRSPropertyType">
-		<annotation>
-			<documentation>gml:baseCRS is an association role to the coordinate reference system used by this derived CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="derivedCRSType" type="gml:CodeWithAuthorityType">
-		<annotation>
-			<documentation>The gml:derivedCRSType property describes the type of a derived coordinate reference system. The required codeSpace attribute shall reference a source of information specifying the values and meanings of all the allowed string values for this property.</documentation>
-		</annotation>
-	</element>
-	<element name="coordinateSystem" type="gml:CoordinateSystemPropertyType">
-		<annotation>
-			<documentation>An association role to the coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DerivedCRSPropertyType">
-		<annotation>
-			<documentation>gml:DerivedCRSPropertyType is a property type for association roles to a non-projected derived coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:DerivedCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="EngineeringCRS" type="gml:EngineeringCRSType" substitutionGroup="gml:AbstractSingleCRS">
-		<annotation>
-			<documentation>gml:EngineeringCRS is a contextually local coordinate reference system which can be divided into two broad categories:
--	earth-fixed systems applied to engineering activities on or near the surface of the earth;
--	CRSs on moving platforms such as road vehicles, vessels, aircraft, or spacecraft, see ISO 19111 8.3.</documentation>
-		</annotation>
-	</element>
-	<complexType name="EngineeringCRSType">
-		<complexContent>
-			<extension base="gml:AbstractCRSType">
-				<sequence>
-					<choice>
-						<element ref="gml:affineCS"/>
-						<element ref="gml:cartesianCS"/>
-						<element ref="gml:cylindricalCS"/>
-						<element ref="gml:linearCS"/>
-						<element ref="gml:polarCS"/>
-						<element ref="gml:sphericalCS"/>
-						<element ref="gml:userDefinedCS"/>
-						<element ref="gml:coordinateSystem">
-							<annotation>
-								<appinfo>deprecated</appinfo>
-							</annotation>
-						</element>
-					</choice>
-					<element ref="gml:engineeringDatum"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="cylindricalCS" type="gml:CylindricalCSPropertyType">
-		<annotation>
-			<documentation>gml:cylindricalCS is an association role to the cylindrical coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="linearCS" type="gml:LinearCSPropertyType">
-		<annotation>
-			<documentation>gml:linearCS is an association role to the linear coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="polarCS" type="gml:PolarCSPropertyType">
-		<annotation>
-			<documentation>gml:polarCS is an association role to the polar coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="userDefinedCS" type="gml:UserDefinedCSPropertyType">
-		<annotation>
-			<documentation>gml:userDefinedCS is an association role to the user defined coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="engineeringDatum" type="gml:EngineeringDatumPropertyType">
-		<annotation>
-			<documentation>gml:engineeringDatum is an association role to the engineering datum used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<complexType name="EngineeringCRSPropertyType">
-		<annotation>
-			<documentation>gml:EngineeringCRSPropertyType is a property type for association roles to an engineering coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:EngineeringCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="ImageCRS" type="gml:ImageCRSType" substitutionGroup="gml:AbstractSingleCRS">
-		<annotation>
-			<documentation>gml:ImageCRS is an engineering coordinate reference system applied to locations in images. Image coordinate reference systems are treated as a separate sub-type because the definition of the associated image datum contains two attributes not relevant to other engineering datums.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ImageCRSType">
-		<complexContent>
-			<extension base="gml:AbstractCRSType">
-				<sequence>
-					<choice>
-						<element ref="gml:cartesianCS"/>
-						<element ref="gml:affineCS"/>
-						<element ref="gml:usesObliqueCartesianCS"/>
-					</choice>
-					<element ref="gml:imageDatum"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="affineCS" type="gml:AffineCSPropertyType">
-		<annotation>
-			<documentation>gml:affineCS is an association role to the affine coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="imageDatum" type="gml:ImageDatumPropertyType">
-		<annotation>
-			<documentation>gml:imageDatum is an association role to the image datum used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ImageCRSPropertyType">
-		<annotation>
-			<documentation>gml:ImageCRSPropertyType is a property type for association roles to an image coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:ImageCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="TemporalCRS" type="gml:TemporalCRSType" substitutionGroup="gml:AbstractSingleCRS">
-		<annotation>
-			<documentation>gml:TemporalCRS is a 1D coordinate reference system used for the recording of time.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TemporalCRSType">
-		<complexContent>
-			<extension base="gml:AbstractCRSType">
-				<sequence>
-					<choice>
-						<element ref="gml:timeCS"/>
-						<element ref="gml:usesTemporalCS"/>
-					</choice>
-					<element ref="gml:temporalDatum"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="timeCS" type="gml:TimeCSPropertyType">
-		<annotation>
-			<documentation>gml:timeCS is an association role to the time coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="temporalDatum" type="gml:TemporalDatumPropertyType">
-		<annotation>
-			<documentation>gml:temporalDatum is an association role to the temporal datum used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TemporalCRSPropertyType">
-		<annotation>
-			<documentation>gml:TemporalCRSPropertyType is a property type for association roles to a temporal coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TemporalCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/coordinateSystems.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/coordinateSystems.xsd
deleted file mode 100644
index 720357e95..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/coordinateSystems.xsd
+++ /dev/null
@@ -1,296 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" xml:lang="en"  version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:coordinateSystems:3.2.1">coordinateSystems.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 13.4.
-The coordinate systems schema components can be divded into  three logical parts, which define elements and types for XML encoding of the definitions of:
--	Coordinate system axes
--	Abstract coordinate system
--	Multiple concrete types of spatial-temporal coordinate systems
-These schema components encode the Coordinate System packages of the UML Models of ISO 19111 Clause 9 and ISO/DIS 19136 D.3.10.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="referenceSystems.xsd"/>
-	<element name="CoordinateSystemAxis" type="gml:CoordinateSystemAxisType" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>gml:CoordinateSystemAxis is a definition of a coordinate system axis.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CoordinateSystemAxisType">
-		<complexContent>
-			<extension base="gml:IdentifiedObjectType">
-				<sequence>
-					<element ref="gml:axisAbbrev"/>
-					<element ref="gml:axisDirection"/>
-					<element ref="gml:minimumValue" minOccurs="0"/>
-					<element ref="gml:maximumValue" minOccurs="0"/>
-					<element ref="gml:rangeMeaning" minOccurs="0"/>
-				</sequence>
-				<attribute name="uom" type="gml:UomIdentifier" use="required">
-					<annotation>
-						<documentation>The uom attribute provides an identifier of the unit of measure used for this coordinate system axis. The value of this coordinate in a coordinate tuple shall be recorded using this unit of measure, whenever those coordinates use a coordinate reference system that uses a coordinate system that uses this axis.</documentation>
-					</annotation>
-				</attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="axisAbbrev" type="gml:CodeType">
-		<annotation>
-			<documentation>gml:axisAbbrev is the abbreviation used for this coordinate system axis; this abbreviation is also used to identify the coordinates in the coordinate tuple. The codeSpace attribute may reference a source of more information on a set of standardized abbreviations, or on this abbreviation.</documentation>
-		</annotation>
-	</element>
-	<element name="axisDirection" type="gml:CodeWithAuthorityType">
-		<annotation>
-			<documentation>gml:axisDirection is the direction of this coordinate system axis (or in the case of Cartesian projected coordinates, the direction of this coordinate system axis at the origin).
-Within any set of coordinate system axes, only one of each pair of terms may be used. For earth-fixed CRSs, this direction is often approximate and intended to provide a human interpretable meaning to the axis. When a geodetic datum is used, the precise directions of the axes may therefore vary slightly from this approximate direction.
-The codeSpace attribute shall reference a source of information specifying the values and meanings of all the allowed string values for this property.</documentation>
-		</annotation>
-	</element>
-	<element name="minimumValue" type="double">
-		<annotation>
-			<documentation>The gml:minimumValue and gml:maximumValue properties allow the specification of minimum and maximum value normally allowed for this axis, in the unit of measure for the axis. For a continuous angular axis such as longitude, the values wrap-around at this value. Also, values beyond this minimum/maximum can be used for specified purposes, such as in a bounding box. A value of minus infinity shall be allowed for the gml:minimumValue element, a value of plus infiniy for the gml:maximumValue element. If these elements are omitted, the value is unspecified.</documentation>
-		</annotation>
-	</element>
-	<element name="maximumValue" type="double">
-		<annotation>
-			<documentation>The gml:minimumValue and gml:maximumValue properties allow the specification of minimum and maximum value normally allowed for this axis, in the unit of measure for the axis. For a continuous angular axis such as longitude, the values wrap-around at this value. Also, values beyond this minimum/maximum can be used for specified purposes, such as in a bounding box. A value of minus infinity shall be allowed for the gml:minimumValue element, a value of plus infiniy for the gml:maximumValue element. If these elements are omitted, the value is unspecified.</documentation>
-		</annotation>
-	</element>
-	<element name="rangeMeaning" type="gml:CodeWithAuthorityType">
-		<annotation>
-			<documentation>gml:rangeMeaning describes the meaning of axis value range specified by gml:minimumValue and gml:maximumValue. This element shall be omitted when both gml:minimumValue and gml:maximumValue are omitted. This element should be included when gml:minimumValue and/or gml:maximumValue are included. If this element is omitted when the gml:minimumValue and/or gml:maximumValue are included, the meaning is unspecified. The codeSpace attribute shall reference a source of information specifying the values and meanings of all the allowed string values for this property.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CoordinateSystemAxisPropertyType">
-		<annotation>
-			<documentation>gml:CoordinateSystemAxisPropertyType is a property type for association roles to a coordinate system axis, either referencing or containing the definition of that axis.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:CoordinateSystemAxis"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="AbstractCoordinateSystem" type="gml:AbstractCoordinateSystemType" abstract="true" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>gml:AbstractCoordinateSystem is a coordinate system (CS) is the non-repeating sequence of coordinate system axes that spans a given coordinate space. A CS is derived from a set of mathematical rules for specifying how coordinates in a given space are to be assigned to points. The coordinate values in a coordinate tuple shall be recorded in the order in which the coordinate system axes associations are recorded. This abstract complex type shall not be used, extended, or restricted, in an Application Schema, to define a concrete subtype with a meaning equivalent to a concrete subtype specified in this document.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractCoordinateSystemType" abstract="true">
-		<complexContent>
-			<extension base="gml:IdentifiedObjectType">
-				<sequence>
-					<element ref="gml:axis" maxOccurs="unbounded"/>
-				</sequence>
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="axis" type="gml:CoordinateSystemAxisPropertyType">
-		<annotation>
-			<documentation>The gml:axis property is an association role (ordered sequence) to the coordinate system axes included in this coordinate system. The coordinate values in a coordinate tuple shall be recorded in the order in which the coordinate system axes associations are recorded, whenever those coordinates use a coordinate reference system that uses this coordinate system. The gml:AggregationAttributeGroup should be used to specify that the axis objects are ordered.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CoordinateSystemPropertyType">
-		<annotation>
-			<documentation>gml:CoordinateSystemPropertyType is a property type for association roles to a coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractCoordinateSystem"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="EllipsoidalCS" type="gml:EllipsoidalCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<documentation>gml:EllipsoidalCS is a two- or three-dimensional coordinate system in which position is specified by geodetic latitude, geodetic longitude, and (in the three-dimensional case) ellipsoidal height. An EllipsoidalCS shall have two or three gml:axis property elements; the number of associations shall equal the dimension of the CS.</documentation>
-		</annotation>
-	</element>
-	<complexType name="EllipsoidalCSType">
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="EllipsoidalCSPropertyType">
-		<annotation>
-			<documentation>gml:EllipsoidalCSPropertyType is a property type for association roles to an ellipsoidal coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:EllipsoidalCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="CartesianCS" type="gml:CartesianCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<documentation>gml:CartesianCS is a 1-, 2-, or 3-dimensional coordinate system. In the 1-dimensional case, it contains a single straight coordinate axis. In the 2- and 3-dimensional cases gives the position of points relative to orthogonal straight axes. In the multi-dimensional case, all axes shall have the same length unit of measure. A CartesianCS shall have one, two, or three gml:axis property elements.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CartesianCSType">
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="CartesianCSPropertyType">
-		<annotation>
-			<documentation>gml:CartesianCSPropertyType is a property type for association roles to a Cartesian coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:CartesianCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="VerticalCS" type="gml:VerticalCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<documentation>gml:VerticalCS is a one-dimensional coordinate system used to record the heights or depths of points. Such a coordinate system is usually dependent on the Earth's gravity field, perhaps loosely as when atmospheric pressure is the basis for the vertical coordinate system axis. A VerticalCS shall have one gml:axis property element.</documentation>
-		</annotation>
-	</element>
-	<complexType name="VerticalCSType">
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="VerticalCSPropertyType">
-		<annotation>
-			<documentation>gml:VerticalCSPropertyType is a property type for association roles to a vertical coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:VerticalCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="TimeCS" type="gml:TimeCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<documentation>gml:TimeCS is a one-dimensional coordinate system containing a time axis, used to describe the temporal position of a point in the specified time units from a specified time origin. A TimeCS shall have one gml:axis property element.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeCSType">
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="TimeCSPropertyType">
-		<annotation>
-			<documentation>gml:TimeCSPropertyType is a property type for association roles to a time coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TimeCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="LinearCS" type="gml:LinearCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<documentation>gml:LinearCS is a one-dimensional coordinate system that consists of the points that lie on the single axis described. The associated coordinate is the distance – with or without offset – from the specified datum to the point along the axis. A LinearCS shall have one gml:axis property element.</documentation>
-		</annotation>
-	</element>
-	<complexType name="LinearCSType">
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="LinearCSPropertyType">
-		<annotation>
-			<documentation>gml:LinearCSPropertyType is a property type for association roles to a linear coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:LinearCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="UserDefinedCS" type="gml:UserDefinedCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<documentation>gml:UserDefinedCS is a two- or three-dimensional coordinate system that consists of any combination of coordinate axes not covered by any other coordinate system type. A UserDefinedCS shall have two or three gml:axis property elements; the number of property elements shall equal the dimension of the CS.</documentation>
-		</annotation>
-	</element>
-	<complexType name="UserDefinedCSType">
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="UserDefinedCSPropertyType">
-		<annotation>
-			<documentation>gml:UserDefinedCSPropertyType is a property type for association roles to a user-defined coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:UserDefinedCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="SphericalCS" type="gml:SphericalCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<documentation>gml:SphericalCS is a three-dimensional coordinate system with one distance measured from the origin and two angular coordinates. A SphericalCS shall have three gml:axis property elements.</documentation>
-		</annotation>
-	</element>
-	<complexType name="SphericalCSType">
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="SphericalCSPropertyType">
-		<annotation>
-			<documentation>gml:SphericalCSPropertyType is property type for association roles to a spherical coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:SphericalCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="PolarCS" type="gml:PolarCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<documentation>gml:PolarCS ia s two-dimensional coordinate system in which position is specified by the distance from the origin and the angle between the line from the origin to a point and a reference direction. A PolarCS shall have two gml:axis property elements.</documentation>
-		</annotation>
-	</element>
-	<complexType name="PolarCSType">
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="PolarCSPropertyType">
-		<annotation>
-			<documentation>gml:PolarCSPropertyType is a property type for association roles to a polar coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:PolarCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="CylindricalCS" type="gml:CylindricalCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<documentation>gml:CylindricalCS is a three-dimensional coordinate system consisting of a polar coordinate system extended by a straight coordinate axis perpendicular to the plane spanned by the polar coordinate system. A CylindricalCS shall have three gml:axis property elements.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CylindricalCSType">
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="CylindricalCSPropertyType">
-		<annotation>
-			<documentation>gml:CylindricalCSPropertyType is a property type for association roles to a cylindrical coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:CylindricalCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="AffineCS" type="gml:AffineCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<documentation>gml:AffineCS is a two- or three-dimensional coordinate system with straight axes that are not necessarily orthogonal. An AffineCS shall have two or three gml:axis property elements; the number of property elements shall equal the dimension of the CS.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AffineCSType">
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="AffineCSPropertyType">
-		<annotation>
-			<documentation>gml:AffineCSPropertyType is a property type for association roles to an affine coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AffineCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/coverage.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/coverage.xsd
deleted file mode 100644
index 0f9f339c1..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/coverage.xsd
+++ /dev/null
@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:coverage:3.2.1">coverage.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 20.3.
-A coverage incorporates a mapping from a spatiotemporal domain to a range set, the latter providing the set in which the attribute values live.  The range set may be an arbitrary set including discrete lists, integer or floating point ranges, and multi-dimensional vector spaces.
-A coverage can be viewed as the graph of the coverage function f:A à B, that is as the set of ordered pairs {(x, f(x)) | where x is in A}. This view is especially applicable to the GML encoding of a coverage.  In the case of a discrete coverage, the domain set A is partitioned into a collection of subsets (typically a disjoint collection) A = UAi and the function f is constant on each Ai. For a spatial domain, the Ai are geometry elements, hence the coverage can be viewed as a collection of (geometry,value) pairs, where the value is an element of the range set.  If the spatial domain A is a topological space then the coverage can be viewed as a collection of (topology,value) pairs, where the topology element in the pair is a topological n-chain (in GML terms this is a gml:TopoPoint, gml:TopoCurve, gml:TopoSurface or gml:TopoSolid). 
-A coverage is implemented as a GML feature. We can thus speak of a "temperature distribution feature", or a "remotely sensed image feature", or a "soil distribution feature".
-As is the case for any GML object, a coverage object may also be the value of a property of a feature.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="feature.xsd"/>
-	<include schemaLocation="valueObjects.xsd"/>
-	<include schemaLocation="grids.xsd"/>
-	<include schemaLocation="geometryAggregates.xsd"/>
-	<complexType name="AbstractCoverageType" abstract="true">
-		<annotation>
-			<documentation>The base type for coverages is gml:AbstractCoverageType. The basic elements of a coverage can be seen in this content model: the coverage contains gml:domainSet and gml:rangeSet properties. The gml:domainSet property describes the domain of the coverage and the gml:rangeSet property describes the range of the coverage.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractFeatureType">
-				<sequence>
-					<element ref="gml:domainSet"/>
-					<element ref="gml:rangeSet"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="AbstractCoverage" type="gml:AbstractCoverageType" abstract="true" substitutionGroup="gml:AbstractFeature">
-		<annotation>
-			<documentation>This element serves as the head of a substitution group which may contain any coverage whose type is derived from gml:AbstractCoverageType.  It may act as a variable in the definition of content models where it is required to permit any coverage to be valid.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DiscreteCoverageType">
-		<complexContent>
-			<extension base="gml:AbstractCoverageType">
-				<sequence>
-					<element ref="gml:coverageFunction" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="AbstractDiscreteCoverage" type="gml:DiscreteCoverageType" abstract="true" substitutionGroup="gml:AbstractCoverage">
-		<annotation>
-			<documentation>A discrete coverage consists of a domain set, range set and optionally a coverage function. The domain set consists of either spatial or temporal geometry objects, finite in number. The range set is comprised of a finite number of attribute values each of which is associated to every direct position within any single spatiotemporal object in the domain. In other words, the range values are constant on each spatiotemporal object in the domain. This coverage function maps each element from the coverage domain to an element in its range. The coverageFunction element describes the mapping function.
-This element serves as the head of a substitution group which may contain any discrete coverage whose type is derived from gml:DiscreteCoverageType.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractContinuousCoverageType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractCoverageType">
-				<sequence>
-					<element ref="gml:coverageFunction" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="AbstractContinuousCoverage" type="gml:AbstractContinuousCoverageType" abstract="true" substitutionGroup="gml:AbstractFeature">
-		<annotation>
-			<documentation>A continuous coverage as defined in ISO 19123 is a coverage that can return different values for the same feature attribute at different direct positions within a single spatiotemporal object in its spatiotemporal domain. The base type for continuous coverages is AbstractContinuousCoverageType.
-The coverageFunction element describes the mapping function. 
-The abstract element gml:AbstractContinuousCoverage serves as the head of a substitution group which may contain any continuous coverage whose type is derived from gml:AbstractContinuousCoverageType.</documentation>
-		</annotation>
-	</element>
-	<element name="domainSet" type="gml:DomainSetType">
-		<annotation>
-			<documentation>The gml:domainSet property element describes the spatio-temporal region of interest, within which the coverage is defined. Its content model is given by gml:DomainSetType.
-The value of the domain is thus a choice between a gml:AbstractGeometry and a gml:AbstractTimeObject.  In the instance these abstract elements will normally be substituted by a geometry complex or temporal complex, to represent spatial coverages and time-series, respectively.  
-The presence of the gml:AssociationAttributeGroup means that domainSet follows the usual GML property model and may use the xlink:href attribute to point to the domain, as an alternative to describing the domain inline. Ownership semantics may be provided using the gml:OwnershipAttributeGroup.
-</documentation>
-		</annotation>
-	</element>
-	<complexType name="DomainSetType">
-		<sequence minOccurs="0">
-			<choice>
-				<element ref="gml:AbstractGeometry"/>
-				<element ref="gml:AbstractTimeObject"/>
-			</choice>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="rangeSet" type="gml:RangeSetType">
-		<annotation>
-			<documentation>The gml:rangeSet property element contains the values of the coverage (sometimes called the attribute values).  Its content model is given by gml:RangeSetType.
-This content model supports a structural description of the range.  The semantic information describing the range set is embedded using a uniform method, as part of the explicit values, or as a template value accompanying the representation using gml:DataBlock and gml:File.
-The values from each component (or "band") in the range may be encoded within a gml:ValueArray element or a concrete member of the gml:AbstractScalarValueList substitution group . Use of these elements satisfies the value-type homogeneity requirement.</documentation>
-		</annotation>
-	</element>
-	<complexType name="RangeSetType">
-		<choice>
-			<element ref="gml:ValueArray" maxOccurs="unbounded"/>
-			<element ref="gml:AbstractScalarValueList" maxOccurs="unbounded"/>
-			<element ref="gml:DataBlock"/>
-			<element ref="gml:File"/>
-		</choice>
-	</complexType>
-	<element name="DataBlock" type="gml:DataBlockType" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>gml:DataBlock describes the Range as a block of text encoded values similar to a Common Separated Value (CSV) representation.
-The range set parameterization is described by the property gml:rangeParameters.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DataBlockType">
-		<sequence>
-			<element ref="gml:rangeParameters"/>
-			<choice>
-				<element ref="gml:tupleList"/>
-				<element ref="gml:doubleOrNilReasonTupleList"/>
-			</choice>
-		</sequence>
-	</complexType>
-	<element name="rangeParameters" type="gml:AssociationRoleType"/>
-	<element name="tupleList" type="gml:CoordinatesType">
-		<annotation>
-			<documentation>gml:CoordinatesType consists of a list of coordinate tuples, with each coordinate tuple separated by the ts or tuple separator (whitespace), and each coordinate in the tuple by the cs or coordinate separator (comma).
-The gml:tupleList encoding is effectively "band-interleaved".</documentation>
-		</annotation>
-	</element>
-	<element name="doubleOrNilReasonTupleList" type="gml:doubleOrNilReasonList">
-		<annotation>
-			<documentation>gml:doubleOrNilReasonList consists of a list of gml:doubleOrNilReason values, each separated by a whitespace. The gml:doubleOrNilReason values are grouped into tuples where the dimension of each tuple in the list is equal to the number of range parameters.</documentation>
-		</annotation>
-	</element>
-	<element name="File" type="gml:FileType" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>for efficiency reasons, GML also provides a means of encoding the range set in an arbitrary external encoding, such as a binary file.  This encoding may be "well-known" but this is not required. This mode uses the gml:File element.
-The values of the coverage (attribute values in the range set) are transmitted in a external file that is referenced from the XML structure described by gml:FileType.  The external file is referenced by the gml:fileReference property that is an anyURI (the gml:fileName property has been deprecated).  This means that the external file may be located remotely from the referencing GML instance. 
-The gml:compression property points to a definition of a compression algorithm through an anyURI.  This may be a retrievable, computable definition or simply a reference to an unambiguous name for the compression method.
-The gml:mimeType property points to a definition of the file mime type.
-The gml:fileStructure property is defined by a codelist. Note further that all values shall be enclosed in a single file. Multi-file structures for values are not supported in GML.
-The semantics of the range set is described as above using the gml:rangeParameters property.
-Note that if any compression algorithm is applied, the structure above applies only to the pre-compression or post-decompression structure of the file.
-Note that the fields within a record match the gml:valueComponents of the gml:CompositeValue in document order.</documentation>
-		</annotation>
-	</element>
-	<complexType name="FileType">
-		<sequence>
-			<element ref="gml:rangeParameters"/>
-			<choice>
-				<element name="fileName" type="anyURI">
-					<annotation>
-						<appinfo>deprecated</appinfo>
-					</annotation>
-				</element>
-				<element name="fileReference" type="anyURI"/>
-			</choice>
-			<element name="fileStructure" type="gml:CodeType"/>
-			<element name="mimeType" type="anyURI" minOccurs="0"/>
-			<element name="compression" type="anyURI" minOccurs="0"/>
-		</sequence>
-	</complexType>
-	<element name="coverageFunction" type="gml:CoverageFunctionType" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>The gml:coverageFunction property describes the mapping function from the domain to the range of the coverage.
-The value of the CoverageFunction is one of gml:CoverageMappingRule and gml:GridFunction.
-If the gml:coverageFunction property is omitted for a gridded coverage (including rectified gridded coverages) the gml:startPoint is assumed to be the value of the gml:low property in the gml:Grid geometry, and the gml:sequenceRule is assumed to be linear and the gml:axisOrder property is assumed to be "+1 +2".</documentation>
-		</annotation>
-	</element>
-	<complexType name="CoverageFunctionType">
-		<choice>
-			<element ref="gml:MappingRule"/>
-			<element ref="gml:CoverageMappingRule"/>
-			<element ref="gml:GridFunction"/>
-		</choice>
-	</complexType>
-	<element name="CoverageMappingRule" type="gml:MappingRuleType" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>gml:CoverageMappingRule provides a formal or informal description of the coverage function.
-The mapping rule may be defined as an in-line string (gml:ruleDefinition) or via a remote reference through xlink:href (gml:ruleReference).  
-If no rule name is specified, the default is 'Linear' with respect to members of the domain in document order.</documentation>
-		</annotation>
-	</element>
-	<complexType name="MappingRuleType" final="#all">
-		<choice>
-			<element name="ruleDefinition" type="string"/>
-			<element name="ruleReference" type="gml:ReferenceType"/>
-		</choice>
-	</complexType>
-	<element name="GridFunction" type="gml:GridFunctionType" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>gml:GridFunction provides an explicit mapping rule for grid geometries, i.e. the domain shall be a geometry of type grid.  It describes the mapping of grid posts (discrete point grid coverage) or grid cells (discrete surface coverage) to the values in the range set.
-The gml:startPoint is the index position of a point in the grid that is mapped to the first point in the range set (this is also the index position of the first grid post).  If the gml:startPoint property is omitted the gml:startPoint is assumed to be equal to the value of gml:low in the gml:Grid geometry. Subsequent points in the mapping are determined by the value of the gml:sequenceRule.</documentation>
-		</annotation>
-	</element>
-	<complexType name="GridFunctionType">
-		<sequence>
-			<element name="sequenceRule" type="gml:SequenceRuleType" minOccurs="0"/>
-			<element name="startPoint" type="gml:integerList" minOccurs="0"/>
-		</sequence>
-	</complexType>
-	<complexType name="SequenceRuleType">
-		<annotation>
-			<documentation>The gml:SequenceRuleType is derived from the gml:SequenceRuleEnumeration through the addition of an axisOrder attribute.  The gml:SequenceRuleEnumeration is an enumerated type. The rule names are defined in ISO 19123. If no rule name is specified the default is "Linear".</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:SequenceRuleEnumeration">
-				<attribute name="order" type="gml:IncrementOrder">
-					<annotation>
-						<appinfo>deprecated</appinfo>
-					</annotation>
-				</attribute>
-				<attribute name="axisOrder" type="gml:AxisDirectionList"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<simpleType name="SequenceRuleEnumeration">
-		<restriction base="string">
-			<enumeration value="Linear"/>
-			<enumeration value="Boustrophedonic"/>
-			<enumeration value="Cantor-diagonal"/>
-			<enumeration value="Spiral"/>
-			<enumeration value="Morton"/>
-			<enumeration value="Hilbert"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="AxisDirectionList">
-		<annotation>
-			<documentation>The different values in a gml:AxisDirectionList indicate the incrementation order to be used on all axes of the grid. Each axis shall be mentioned once and only once.</documentation>
-		</annotation>
-		<list itemType="gml:AxisDirection"/>
-	</simpleType>
-	<simpleType name="AxisDirection">
-		<annotation>
-			<documentation>The value of a gml:AxisDirection indicates the incrementation order to be used on an axis of the grid.</documentation>
-		</annotation>
-		<restriction base="string">
-			<pattern value="[\+\-][1-9][0-9]*"/>
-		</restriction>
-	</simpleType>
-	<element name="MultiPointCoverage" type="gml:DiscreteCoverageType" substitutionGroup="gml:AbstractDiscreteCoverage">
-		<annotation>
-			<documentation>In a gml:MultiPointCoverage the domain set is a gml:MultiPoint, that is a collection of arbitrarily distributed geometric points.
-The content model is identical with gml:DiscreteCoverageType, but that gml:domainSet shall have values gml:MultiPoint.
-In a gml:MultiPointCoverage the mapping from the domain to the range is straightforward.
--	For gml:DataBlock encodings the points of the gml:MultiPoint are mapped in document order to the tuples of the data block.
--	For gml:CompositeValue encodings the points of the gml:MultiPoint are mapped to the members of the composite value in document order.
--	For gml:File encodings the points of the gml:MultiPoint are mapped to the records of the file in sequential order.
-</documentation>
-		</annotation>
-	</element>
-	<element name="MultiCurveCoverage" type="gml:DiscreteCoverageType" substitutionGroup="gml:AbstractDiscreteCoverage">
-		<annotation>
-			<documentation>In a gml:MultiCurveCoverage the domain is partioned into a collection of curves comprising a gml:MultiCurve.  The coverage function then maps each curve in the collection to a value in the range set.
-The content model is identical with gml:DiscreteCoverageType, but that gml:domainSet shall have values gml:MultiCurve.
-In a gml:MultiCurveCoverage the mapping from the domain to the range is straightforward.
--	For gml:DataBlock encodings the curves of the gml:MultiCurve are mapped in document order to the tuples of the data block.
--	For gml:CompositeValue encodings the curves of the gml:MultiCurve are mapped to the members of the composite value in document order.
--	For gml:File encodings the curves of the gml:MultiCurve are mapped to the records of the file in sequential order.
-</documentation>
-		</annotation>
-	</element>
-	<element name="MultiSurfaceCoverage" type="gml:DiscreteCoverageType" substitutionGroup="gml:AbstractDiscreteCoverage">
-		<annotation>
-			<documentation>In a gml:MultiSurfaceCoverage the domain is partioned into a collection of surfaces comprising a gml:MultiSurface.  The coverage function than maps each surface in the collection to a value in the range set.
-The content model is identical with gml:DiscreteCoverageType, but that gml:domainSet shall have values gml:MultiSurface.
-In a gml:MultiSurfaceCoverage the mapping from the domain to the range is straightforward.
--	For gml:DataBlock encodings the surfaces of the gml:MultiSurface are mapped in document order to the tuples of the data block.
--	For gml:CompositeValue encodings the surfaces of the gml:MultiSurface are mapped to the members of the composite value in document order.
--	For gml:File encodings the surfaces of the gml:MultiSurface are mapped to the records of the file in sequential order.
-</documentation>
-		</annotation>
-	</element>
-	<element name="MultiSolidCoverage" type="gml:DiscreteCoverageType" substitutionGroup="gml:AbstractDiscreteCoverage">
-		<annotation>
-			<documentation>In a gml:MultiSolidCoverage the domain is partioned into a collection of solids comprising a gml:MultiSolid.  The coverage function than maps each solid in the collection to a value in the range set.
-The content model is identical with gml:DiscreteCoverageType, but that gml:domainSet shall have values gml:MultiSolid.
-In a gml:MultiSolidCoverage the mapping from the domain to the range is straightforward.
--	For gml:DataBlock encodings the solids of the gml:MultiSolid are mapped in document order to the tuples of the data block.
--	For gml:CompositeValue encodings the solids of the gml:MultiSolid are mapped to the members of the composite value in document order.
--	For gml:File encodings the solids of the gml:MultiSolid are mapped to the records of the file in sequential order.
-</documentation>
-		</annotation>
-	</element>
-	<element name="GridCoverage" type="gml:DiscreteCoverageType" substitutionGroup="gml:AbstractDiscreteCoverage">
-		<annotation>
-			<documentation>A gml:GriddedCoverage is a discrete point coverage in which the domain set is a geometric grid of points.
-Note that this is the same as the gml:MultiPointCoverage except that we have a gml:Grid to describe the domain.
-The simple gridded coverage is not geometrically referenced and hence no geometric positions are assignable to the points in the grid. Such geometric positioning is introduced in the gml:RectifiedGridCoverage.</documentation>
-		</annotation>
-	</element>
-	<element name="RectifiedGridCoverage" type="gml:DiscreteCoverageType" substitutionGroup="gml:AbstractDiscreteCoverage">
-		<annotation>
-			<documentation>The gml:RectifiedGridCoverage is a discrete point coverage based on a rectified grid. It is similar to the grid coverage except that the points of the grid are geometrically referenced. The rectified grid coverage has a domain that is a gml:RectifiedGrid geometry.</documentation>
-		</annotation>
-	</element>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/datums.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/datums.xsd
deleted file mode 100644
index 4190e5947..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/datums.xsd
+++ /dev/null
@@ -1,286 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 rel. 2 U (http://www.xmlspy.com) by Clemens Portele (interactive instruments) -->
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" xml:lang="en" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:datums:3.2.1">datums.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 13.5
-The datums schema components can be divided into three logical parts, which define elements and types for XML encoding of the definitions of:
--	Abstract datum
--	Geodetic datums, including ellipsoid and prime meridian
--	Multiple other concrete types of spatial or temporal datums
-These schema components encode the Datum packages of the UML Models of ISO 19111 Clause 10 and ISO/DIS 19136 D.3.10.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="referenceSystems.xsd"/>
-	<include schemaLocation="measures.xsd"/>
-	<element name="AbstractDatum" type="gml:AbstractDatumType" abstract="true" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>A gml:AbstractDatum specifies the relationship of a coordinate system to the earth, thus creating a coordinate reference system. A datum uses a parameter or set of parameters that determine the location of the origin of the coordinate reference system. Each datum subtype may be associated with only specific types of coordinate systems. This abstract complex type shall not be used, extended, or restricted, in a GML Application Schema, to define a concrete subtype with a meaning equivalent to a concrete subtype specified in this document.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractDatumType" abstract="true">
-		<complexContent>
-			<extension base="gml:IdentifiedObjectType">
-				<sequence>
-					<element ref="gml:domainOfValidity" minOccurs="0"/>
-					<element ref="gml:scope" maxOccurs="unbounded"/>
-					<element ref="gml:anchorDefinition" minOccurs="0"/>
-					<element ref="gml:realizationEpoch" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="anchorDefinition" type="gml:CodeType">
-		<annotation>
-			<documentation>gml:anchorDefinition is a description, possibly including coordinates, of the definition used to anchor the datum to the Earth. Also known as the "origin", especially for engineering and image datums. The codeSpace attribute may be used to reference a source of more detailed on this point or surface, or on a set of such descriptions.
--	For a geodetic datum, this point is also known as the fundamental point, which is traditionally the point where the relationship between geoid and ellipsoid is defined. In some cases, the "fundamental point" may consist of a number of points. In those cases, the parameters defining the geoid/ellipsoid relationship have been averaged for these points, and the averages adopted as the datum definition.
--	For an engineering datum, the anchor definition may be a physical point, or it may be a point with defined coordinates in another CRS.may
--	For an image datum, the anchor definition is usually either the centre of the image or the corner of the image.
--	For a temporal datum, this attribute is not defined. Instead of the anchor definition, a temporal datum carries a separate time origin of type DateTime.</documentation>
-		</annotation>
-	</element>
-	<element name="realizationEpoch" type="date">
-		<annotation>
-			<documentation>gml:realizationEpoch is the time after which this datum definition is valid. See ISO 19111 Table 32 for details.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DatumPropertyType">
-		<annotation>
-			<documentation>gml:DatumPropertyType is a property type for association roles to a datum, either referencing or containing the definition of that datum.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractDatum"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="GeodeticDatum" type="gml:GeodeticDatumType" substitutionGroup="gml:AbstractDatum">
-		<annotation>
-			<documentation>gml:GeodeticDatum is a geodetic datum defines the precise location and orientation in 3-dimensional space of a defined ellipsoid (or sphere), or of a Cartesian coordinate system centered in this ellipsoid (or sphere).</documentation>
-		</annotation>
-	</element>
-	<complexType name="GeodeticDatumType">
-		<complexContent>
-			<extension base="gml:AbstractDatumType">
-				<sequence>
-					<element ref="gml:primeMeridian"/>
-					<element ref="gml:ellipsoid"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="primeMeridian" type="gml:PrimeMeridianPropertyType">
-		<annotation>
-			<documentation>gml:primeMeridian is an association role to the prime meridian used by this geodetic datum.</documentation>
-		</annotation>
-	</element>
-	<element name="ellipsoid" type="gml:EllipsoidPropertyType">
-		<annotation>
-			<documentation>gml:ellipsoid is an association role to the ellipsoid used by this geodetic datum.</documentation>
-		</annotation>
-	</element>
-	<complexType name="GeodeticDatumPropertyType">
-		<annotation>
-			<documentation>gml:GeodeticDatumPropertyType is a property type for association roles to a geodetic datum, either referencing or containing the definition of that datum.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:GeodeticDatum"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="Ellipsoid" type="gml:EllipsoidType" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>A gml:Ellipsoid is a geometric figure that may be used to describe the approximate shape of the earth. In mathematical terms, it is a surface formed by the rotation of an ellipse about its minor axis.</documentation>
-		</annotation>
-	</element>
-	<complexType name="EllipsoidType">
-		<complexContent>
-			<extension base="gml:IdentifiedObjectType">
-				<sequence>
-					<element ref="gml:semiMajorAxis"/>
-					<element ref="gml:secondDefiningParameter"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="semiMajorAxis" type="gml:MeasureType">
-		<annotation>
-			<documentation>gml:semiMajorAxis specifies the length of the semi-major axis of the ellipsoid, with its units. Uses the MeasureType with the restriction that the unit of measure referenced by uom must be suitable for a length, such as metres or feet.</documentation>
-		</annotation>
-	</element>
-	<element name="secondDefiningParameter">
-		<annotation>
-			<documentation>gml:secondDefiningParameter is a property containing the definition of the second parameter that defines the shape of an ellipsoid. An ellipsoid requires two defining parameters: semi-major axis and inverse flattening or semi-major axis and semi-minor axis. When the reference body is a sphere rather than an ellipsoid, only a single defining parameter is required, namely the radius of the sphere; in that case, the semi-major axis "degenerates" into the radius of the sphere.
-The inverseFlattening element contains the inverse flattening value of the ellipsoid. This value is a scale factor (or ratio). It uses gml:LengthType with the restriction that the unit of measure referenced by the uom attribute must be suitable for a scale factor, such as percent, permil, or parts-per-million.
-The semiMinorAxis element contains the length of the semi-minor axis of the ellipsoid. When the isSphere element is included, the ellipsoid is degenerate and is actually a sphere. The sphere is completely defined by the semi-major axis, which is the radius of the sphere.</documentation>
-		</annotation>
-		<complexType>
-			<sequence>
-				<element ref="gml:SecondDefiningParameter"/>
-			</sequence>
-		</complexType>
-	</element>
-	<element name="SecondDefiningParameter">
-		<complexType>
-			<choice>
-				<element name="inverseFlattening" type="gml:MeasureType"/>
-				<element name="semiMinorAxis" type="gml:LengthType"/>
-				<element name="isSphere" type="boolean" default="true"/>
-			</choice>
-		</complexType>
-	</element>
-	<complexType name="EllipsoidPropertyType">
-		<annotation>
-			<documentation>gml:EllipsoidPropertyType is a property type for association roles to an ellipsoid, either referencing or containing the definition of that ellipsoid.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:Ellipsoid"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="PrimeMeridian" type="gml:PrimeMeridianType" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>A gml:PrimeMeridian defines the origin from which longitude values are determined. The default value for the prime meridian gml:identifier value is "Greenwich".</documentation>
-		</annotation>
-	</element>
-	<complexType name="PrimeMeridianType">
-		<complexContent>
-			<extension base="gml:IdentifiedObjectType">
-				<sequence>
-					<element ref="gml:greenwichLongitude"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="greenwichLongitude" type="gml:AngleType">
-		<annotation>
-			<documentation>gml:greenwichLongitude is the longitude of the prime meridian measured from the Greenwich meridian, positive eastward. If the value of the prime meridian "name" is "Greenwich" then the value of greenwichLongitude shall be 0 degrees.</documentation>
-		</annotation>
-	</element>
-	<complexType name="PrimeMeridianPropertyType">
-		<annotation>
-			<documentation>gml:PrimeMeridianPropertyType is a property type for association roles to a prime meridian, either referencing or containing the definition of that meridian.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:PrimeMeridian"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="EngineeringDatum" type="gml:EngineeringDatumType" substitutionGroup="gml:AbstractDatum">
-		<annotation>
-			<documentation>gml:EngineeringDatum defines the origin of an engineering coordinate reference system, and is used in a region around that origin. This origin may be fixed with respect to the earth (such as a defined point at a construction site), or be a defined point on a moving vehicle (such as on a ship or satellite).</documentation>
-		</annotation>
-	</element>
-	<complexType name="EngineeringDatumType">
-		<complexContent>
-			<extension base="gml:AbstractDatumType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="EngineeringDatumPropertyType">
-		<annotation>
-			<documentation>gml:EngineeringDatumPropertyType is a property type for association roles to an engineering datum, either referencing or containing the definition of that datum.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:EngineeringDatum"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="ImageDatum" type="gml:ImageDatumType" substitutionGroup="gml:AbstractDatum">
-		<annotation>
-			<documentation>gml:ImageDatum defines the origin of an image coordinate reference system, and is used in a local context only. For an image datum, the anchor definition is usually either the centre of the image or the corner of the image. For more information, see ISO 19111 B.3.5.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ImageDatumType">
-		<complexContent>
-			<extension base="gml:AbstractDatumType">
-				<sequence>
-					<element ref="gml:pixelInCell"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="pixelInCell" type="gml:CodeWithAuthorityType">
-		<annotation>
-			<documentation>gml:pixelInCell is a specification of the way an image grid is associated with the image data attributes. The required codeSpace attribute shall reference a source of information specifying the values and meanings of all the allowed string values for this property.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ImageDatumPropertyType">
-		<annotation>
-			<documentation>gml:ImageDatumPropertyType is a property type for association roles to an image datum, either referencing or containing the definition of that datum.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:ImageDatum"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="VerticalDatum" type="gml:VerticalDatumType" substitutionGroup="gml:AbstractDatum">
-		<annotation>
-			<documentation>gml:VerticalDatum is a textual description and/or a set of parameters identifying a particular reference level surface used as a zero-height surface, including its position with respect to the Earth for any of the height types recognized by this International Standard.</documentation>
-		</annotation>
-	</element>
-	<complexType name="VerticalDatumType">
-		<complexContent>
-			<extension base="gml:AbstractDatumType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="VerticalDatumPropertyType">
-		<annotation>
-			<documentation>gml:VerticalDatumPropertyType is property type for association roles to a vertical datum, either referencing or containing the definition of that datum.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:VerticalDatum"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="TemporalDatum" type="gml:TemporalDatumType" substitutionGroup="gml:AbstractDatum">
-		<annotation>
-			<documentation>A gml:TemporalDatum defines the origin of a Temporal Reference System. This type omits the "anchorDefinition" and "realizationEpoch" elements and adds the "origin" element with the dateTime type.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TemporalDatumType">
-		<complexContent>
-			<extension base="gml:TemporalDatumBaseType">
-				<sequence>
-					<element ref="gml:origin"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TemporalDatumBaseType" abstract="true">
-		<annotation>
-			<documentation>The TemporalDatumBaseType partially defines the origin of a temporal coordinate reference system. This type restricts the AbstractDatumType to remove the "anchorDefinition" and "realizationEpoch" elements.</documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:AbstractDatumType">
-				<sequence>
-					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:description" minOccurs="0"/>
-					<element ref="gml:descriptionReference" minOccurs="0"/>
-					<element ref="gml:identifier"/>
-					<element ref="gml:name" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:remarks" minOccurs="0"/>
-					<element ref="gml:domainOfValidity" minOccurs="0"/>
-					<element ref="gml:scope" maxOccurs="unbounded"/>
-				</sequence>
-				<attribute ref="gml:id" use="required"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<element name="origin" type="dateTime">
-		<annotation>
-			<documentation>gml:origin is the date and time origin of this temporal datum.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TemporalDatumPropertyType">
-		<annotation>
-			<documentation>gml:TemporalDatumPropertyType is a property type for association roles to a temporal datum, either referencing or containing the definition of that datum.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TemporalDatum"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/defaultStyle.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/defaultStyle.xsd
deleted file mode 100644
index 25e7cfc65..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/defaultStyle.xsd
+++ /dev/null
@@ -1,452 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:smil20="http://www.w3.org/2001/SMIL20/" elementFormDefault="qualified" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:gml:3.2.1">defaultStyle.xsd</appinfo>
-		<documentation>
-			GML is an OGC Standard.
-			Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-       includes and imports
-	============================================================== -->
-	<include schemaLocation="measures.xsd"/>
-	<import namespace="http://www.w3.org/2001/SMIL20/" schemaLocation="http://schemas.opengis.net/gml/3.1.1/smil/smil20.xsd"/>
-	<!-- ==============================================================
-      the Style property
-	============================================================== -->
-	<element name="defaultStyle" type="gml:DefaultStylePropertyType">
-		<annotation>
-			<documentation>Top-level property. Used in application schemas to "attach" the styling information to GML data. The link between the data and the style should be established through this property only.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="DefaultStylePropertyType">
-		<annotation>
-			<documentation>[complexType of] Top-level property. Used in application schemas to "attach" the styling information to GML data. The link between the data and the style should be established through this property only.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:AbstractStyle" minOccurs="0"/>
-		</sequence>
-		<attribute name="about" type="anyURI" use="optional"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ==============================================================
-       the Style
-	============================================================== -->
-	<element name="AbstractStyle" type="gml:AbstractStyleType" abstract="true" substitutionGroup="gml:AbstractGML">
-		<annotation>
-			<documentation>The value of the top-level property. It is an abstract element. Used as the head element of the substitution group for extensibility purposes.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="AbstractStyleType" abstract="true">
-		<annotation>
-			<documentation>[complexType of] The value of the top-level property. It is an abstract element. Used as the head element of the substitution group for extensibility purposes.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGMLType"/>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="Style" type="gml:StyleType" substitutionGroup="gml:AbstractStyle">
-		<annotation>
-			<documentation>Predefined concrete value of the top-level property. Encapsulates all other styling information.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="StyleType">
-		<annotation>
-			<documentation>[complexType of] Predefined concrete value of the top-level property. Encapsulates all other styling information.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractStyleType">
-				<sequence>
-					<element ref="gml:featureStyle" maxOccurs="unbounded"/>
-					<element ref="gml:graphStyle" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ==============================================================
-      Feature Style Property
-	============================================================== -->
-	<element name="featureStyle" type="gml:FeatureStylePropertyType">
-		<annotation>
-			<documentation/>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="FeatureStylePropertyType">
-		<annotation>
-			<documentation/>
-		</annotation>
-		<sequence>
-			<element ref="gml:FeatureStyle" minOccurs="0"/>
-		</sequence>
-		<attribute name="about" type="anyURI" use="optional"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ==============================================================
-      Feature Style
-	============================================================== -->
-	<element name="FeatureStyle" type="gml:FeatureStyleType" substitutionGroup="gml:AbstractGML">
-		<annotation>
-			<documentation>The style descriptor for features.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="FeatureStyleType">
-		<annotation>
-			<documentation>[complexType of] The style descriptor for features.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<sequence>
-					<element name="featureConstraint" type="string" minOccurs="0"/>
-					<element ref="gml:geometryStyle" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:topologyStyle" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:labelStyle" minOccurs="0"/>
-				</sequence>
-				<attribute name="featureType" type="string" use="optional"/>
-				<attribute name="baseType" type="string" use="optional"/>
-				<attribute name="queryGrammar" type="gml:QueryGrammarEnumeration"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<simpleType name="QueryGrammarEnumeration">
-		<annotation>
-			<documentation>Used to specify the grammar of the feature query mechanism.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="xpath"/>
-			<enumeration value="xquery"/>
-			<enumeration value="other"/>
-		</restriction>
-	</simpleType>
-	<!-- ==============================================================
-       Base style descriptor type (for geometry, topology, label, graph)
-	============================================================== -->
-	<complexType name="BaseStyleDescriptorType">
-		<annotation>
-			<documentation>Base complex type for geometry, topology, label and graph styles.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<sequence>
-					<element name="spatialResolution" type="gml:ScaleType" minOccurs="0"/>
-					<element name="styleVariation" type="gml:StyleVariationType" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="smil20:animate" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="smil20:animateMotion" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="smil20:animateColor" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="smil20:set" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ==============================================================
-       Geometry Style Property
-	============================================================== -->
-	<element name="geometryStyle" type="gml:GeometryStylePropertyType">
-		<annotation>
-			<documentation/>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="GeometryStylePropertyType">
-		<annotation>
-			<documentation/>
-		</annotation>
-		<sequence>
-			<element ref="gml:GeometryStyle" minOccurs="0"/>
-		</sequence>
-		<attribute name="about" type="anyURI" use="optional"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ==============================================================
-       Geometry Style
-	============================================================== -->
-	<element name="GeometryStyle" type="gml:GeometryStyleType" substitutionGroup="gml:AbstractGML">
-		<annotation>
-			<documentation>The style descriptor for geometries of a feature.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="GeometryStyleType">
-		<annotation>
-			<documentation>[complexType of] The style descriptor for geometries of a feature.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:BaseStyleDescriptorType">
-				<sequence>
-					<choice>
-						<element ref="gml:symbol"/>
-						<element name="style" type="string">
-							<annotation>
-								<appinfo>deprecated</appinfo>
-								<documentation>Deprecated in GML version 3.1.0. Use symbol with inline content instead.</documentation>
-							</annotation>
-						</element>
-					</choice>
-					<element ref="gml:labelStyle" minOccurs="0"/>
-				</sequence>
-				<attribute name="geometryProperty" type="string"/>
-				<attribute name="geometryType" type="string"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ==============================================================
-       Topology Style Property
-	============================================================== -->
-	<element name="topologyStyle" type="gml:TopologyStylePropertyType">
-		<annotation>
-			<documentation/>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="TopologyStylePropertyType">
-		<annotation>
-			<documentation/>
-		</annotation>
-		<sequence>
-			<element ref="gml:TopologyStyle" minOccurs="0"/>
-		</sequence>
-		<attribute name="about" type="anyURI" use="optional"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ==============================================================
-       Topology Style
-	============================================================== -->
-	<element name="TopologyStyle" type="gml:TopologyStyleType" substitutionGroup="gml:AbstractGML">
-		<annotation>
-			<documentation>The style descriptor for topologies of a feature. Describes individual topology elements styles.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="TopologyStyleType">
-		<annotation>
-			<documentation>[complexType of] The style descriptor for topologies of a feature. Describes individual topology elements styles.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:BaseStyleDescriptorType">
-				<sequence>
-					<choice>
-						<element ref="gml:symbol"/>
-						<element name="style" type="string">
-							<annotation>
-								<appinfo>deprecated</appinfo>
-								<documentation>Deprecated in GML version 3.1.0. Use symbol with inline content instead.</documentation>
-							</annotation>
-						</element>
-					</choice>
-					<element ref="gml:labelStyle" minOccurs="0"/>
-				</sequence>
-				<attribute name="topologyProperty" type="string"/>
-				<attribute name="topologyType" type="string"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ==============================================================
-       Label Style Property
-	============================================================== -->
-	<element name="labelStyle" type="gml:LabelStylePropertyType">
-		<annotation>
-			<documentation/>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="LabelStylePropertyType">
-		<annotation>
-			<documentation/>
-		</annotation>
-		<sequence>
-			<element ref="gml:LabelStyle" minOccurs="0"/>
-		</sequence>
-		<attribute name="about" type="anyURI" use="optional"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ==============================================================
-       Label Style
-	============================================================== -->
-	<element name="LabelStyle" type="gml:LabelStyleType" substitutionGroup="gml:AbstractGML">
-		<annotation>
-			<documentation>The style descriptor for labels of a feature, geometry or topology.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="LabelStyleType">
-		<annotation>
-			<documentation>[complexType of] The style descriptor for labels of a feature, geometry or topology.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:BaseStyleDescriptorType">
-				<sequence>
-					<element name="style" type="string"/>
-					<element name="label" type="gml:LabelType"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ==============================================================
-      Graph Style Property
-	============================================================== -->
-	<element name="graphStyle" type="gml:GraphStylePropertyType">
-		<annotation>
-			<documentation/>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="GraphStylePropertyType">
-		<annotation>
-			<documentation/>
-		</annotation>
-		<sequence>
-			<element ref="gml:GraphStyle" minOccurs="0"/>
-		</sequence>
-		<attribute name="about" type="anyURI" use="optional"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ==============================================================
-      Graph Style
-	============================================================== -->
-	<element name="GraphStyle" type="gml:GraphStyleType" substitutionGroup="gml:AbstractGML">
-		<annotation>
-			<documentation>The style descriptor for a graph consisting of a number of features. Describes graph-specific style attributes.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="GraphStyleType">
-		<annotation>
-			<documentation>[complexType of] The style descriptor for a graph consisting of a number of features. Describes graph-specific style attributes.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:BaseStyleDescriptorType">
-				<sequence>
-					<element name="planar" type="boolean" minOccurs="0"/>
-					<element name="directed" type="boolean" minOccurs="0"/>
-					<element name="grid" type="boolean" minOccurs="0"/>
-					<element name="minDistance" type="double" minOccurs="0"/>
-					<element name="minAngle" type="double" minOccurs="0"/>
-					<element name="graphType" type="gml:GraphTypeType" minOccurs="0"/>
-					<element name="drawingType" type="gml:DrawingTypeType" minOccurs="0"/>
-					<element name="lineType" type="gml:LineTypeType" minOccurs="0"/>
-					<element name="aestheticCriteria" type="gml:AesheticCriteriaType" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ==============================================================
-      Common elements
-	============================================================== -->
-	<element name="symbol" type="gml:SymbolType">
-		<annotation>
-			<documentation>The symbol property. Extends the gml:AssociationType to allow for remote referencing of symbols.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="SymbolType">
-		<annotation>
-			<documentation>[complexType of] The symbol property. Allows for remote referencing of symbols.</documentation>
-		</annotation>
-		<sequence>
-			<any processContents="skip" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<attribute name="symbolType" type="gml:SymbolTypeEnumeration" use="required"/>
-		<attribute ref="gml:transform" use="optional"/>
-		<attribute name="about" type="anyURI" use="optional"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =========================================================== -->
-	<simpleType name="SymbolTypeEnumeration">
-		<annotation>
-			<documentation>Used to specify the type of the symbol used.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="svg"/>
-			<enumeration value="xpath"/>
-			<enumeration value="other"/>
-		</restriction>
-	</simpleType>
-	<!-- =========================================================== -->
-	<complexType name="LabelType" mixed="true">
-		<annotation>
-			<documentation>Label is mixed -- composed of text and XPath expressions used to extract the useful information from the feature.</documentation>
-		</annotation>
-		<sequence>
-			<element name="LabelExpression" type="string" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<attribute ref="gml:transform" use="optional"/>
-	</complexType>
-	<!-- =========================================================== -->
-	<attribute name="transform" type="string">
-		<annotation>
-			<documentation>Defines the geometric transformation of entities. There is no particular grammar defined for this value.</documentation>
-		</annotation>
-	</attribute>
-	<!-- =========================================================== -->
-	<complexType name="StyleVariationType">
-		<annotation>
-			<documentation>Used to vary individual graphic parameters and attributes of the style, symbol or text.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="string">
-				<attribute name="styleProperty" type="string" use="required"/>
-				<attribute name="featurePropertyRange" type="string" use="optional"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<!-- ==============================================================
-       Graph parameters types
-	============================================================== -->
-	<simpleType name="GraphTypeType">
-		<annotation>
-			<documentation>Graph-specific styling property.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="TREE"/>
-			<enumeration value="BICONNECTED"/>
-		</restriction>
-	</simpleType>
-	<!-- =========================================================== -->
-	<simpleType name="DrawingTypeType">
-		<annotation>
-			<documentation>Graph-specific styling property.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="POLYLINE"/>
-			<enumeration value="ORTHOGONAL"/>
-		</restriction>
-	</simpleType>
-	<!-- =========================================================== -->
-	<simpleType name="LineTypeType">
-		<annotation>
-			<documentation>Graph-specific styling property.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="STRAIGHT"/>
-			<enumeration value="BENT"/>
-		</restriction>
-	</simpleType>
-	<!-- =========================================================== -->
-	<simpleType name="AesheticCriteriaType">
-		<annotation>
-			<documentation>Graph-specific styling property.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="MIN_CROSSINGS"/>
-			<enumeration value="MIN_AREA"/>
-			<enumeration value="MIN_BENDS"/>
-			<enumeration value="MAX_BENDS"/>
-			<enumeration value="UNIFORM_BENDS"/>
-			<enumeration value="MIN_SLOPES"/>
-			<enumeration value="MIN_EDGE_LENGTH"/>
-			<enumeration value="MAX_EDGE_LENGTH"/>
-			<enumeration value="UNIFORM_EDGE_LENGTH"/>
-			<enumeration value="MAX_ANGULAR_RESOLUTION"/>
-			<enumeration value="MIN_ASPECT_RATIO"/>
-			<enumeration value="MAX_SYMMETRIES"/>
-		</restriction>
-	</simpleType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/deprecatedTypes.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/deprecatedTypes.xsd
deleted file mode 100644
index e869e3f2c..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/deprecatedTypes.xsd
+++ /dev/null
@@ -1,1133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:deprecatedTypes:3.2.1">deprecatedTypes.xsd</appinfo>
-		<documentation>All global schema components that are part of the GML schema, but were deprecated. See Annex I.
-			
-			GML is an OGC Standard.
-			Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<element name="Null" type="gml:NilReasonType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="anchorPoint" type="gml:CodeType" substitutionGroup="gml:anchorDefinition">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="datumRef" type="gml:DatumPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesPrimeMeridian" type="gml:PrimeMeridianPropertyType" substitutionGroup="gml:primeMeridian">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesEllipsoid" type="gml:EllipsoidPropertyType" substitutionGroup="gml:ellipsoid">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="geodeticDatumRef" type="gml:GeodeticDatumPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="ellipsoidRef" type="gml:EllipsoidPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="primeMeridianRef" type="gml:PrimeMeridianPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="engineeringDatumRef" type="gml:EngineeringDatumPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="imageDatumRef" type="gml:ImageDatumPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="verticalDatumRef" type="gml:VerticalDatumPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="temporalDatumRef" type="gml:TemporalDatumPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="coordinateOperationRef" type="gml:CoordinateOperationPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="singleOperationRef" type="gml:SingleOperationPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="AbstractOperation" type="gml:AbstractCoordinateOperationType" abstract="true" substitutionGroup="gml:AbstractSingleOperation">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="OperationPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractOperation"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="operationRef" type="gml:OperationPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="generalConversionRef" type="gml:GeneralConversionPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="generalTransformationRef" type="gml:GeneralTransformationPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesSingleOperation" type="gml:CoordinateOperationPropertyType" substitutionGroup="gml:coordOperation">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="concatenatedOperationRef" type="gml:ConcatenatedOperationPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesOperation" type="gml:CoordinateOperationPropertyType" substitutionGroup="gml:coordOperation">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="passThroughOperationRef" type="gml:PassThroughOperationPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesMethod" type="gml:OperationMethodPropertyType" substitutionGroup="gml:method">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesValue" type="gml:AbstractGeneralParameterValuePropertyType" substitutionGroup="gml:parameterValue">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="conversionRef" type="gml:ConversionPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="transformationRef" type="gml:TransformationPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="dmsAngleValue" type="gml:DMSAngleType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="valueOfParameter" type="gml:OperationParameterPropertyType" substitutionGroup="gml:operationParameter">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="includesValue" type="gml:AbstractGeneralParameterValuePropertyType" substitutionGroup="gml:parameterValue">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="valuesOfGroup" type="gml:OperationParameterGroupPropertyType" substitutionGroup="gml:group">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="methodFormula" type="gml:CodeType" substitutionGroup="gml:formula">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesParameter" type="gml:AbstractGeneralOperationParameterPropertyType" substitutionGroup="gml:generalOperationParameter">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="operationMethodRef" type="gml:OperationMethodPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="abstractGeneralOperationParameterRef" type="gml:AbstractGeneralOperationParameterPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="operationParameterRef" type="gml:OperationParameterPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="includesParameter" type="gml:AbstractGeneralOperationParameterPropertyType" substitutionGroup="gml:parameter">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="operationParameterGroupRef" type="gml:OperationParameterPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="referenceSystemRef" type="gml:CRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="crsRef" type="gml:CRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="coordinateSystemAxisRef" type="gml:CoordinateSystemAxisPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesAxis" type="gml:CoordinateSystemAxisPropertyType" substitutionGroup="gml:axis">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="coordinateSystemRef" type="gml:CoordinateSystemPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="ellipsoidalCSRef" type="gml:EllipsoidalCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="cartesianCSRef" type="gml:CartesianCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="verticalCSRef" type="gml:VerticalCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="TemporalCS" type="gml:TemporalCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="TemporalCSType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="TemporalCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TemporalCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="temporalCSRef" type="gml:TemporalCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="linearCSRef" type="gml:LinearCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="userDefinedCSRef" type="gml:UserDefinedCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="sphericalCSRef" type="gml:SphericalCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="polarCSRef" type="gml:PolarCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="cylindricalCSRef" type="gml:CylindricalCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="ObliqueCartesianCS" type="gml:ObliqueCartesianCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="ObliqueCartesianCSType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="ObliqueCartesianCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:ObliqueCartesianCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="obliqueCartesianCSRef" type="gml:ObliqueCartesianCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="singleCRSRef" type="gml:SingleCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="definedByConversion" type="gml:GeneralConversionPropertyType" substitutionGroup="gml:conversion">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="includesSingleCRS" type="gml:SingleCRSPropertyType" substitutionGroup="gml:componentReferenceSystem">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="compoundCRSRef" type="gml:CompoundCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesEllipsoidalCS" type="gml:EllipsoidalCSPropertyType" substitutionGroup="gml:ellipsoidalCS">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesCartesianCS" type="gml:CartesianCSPropertyType" substitutionGroup="gml:cartesianCS">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesSphericalCS" type="gml:SphericalCSPropertyType" substitutionGroup="gml:sphericalCS">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesGeodeticDatum" type="gml:GeodeticDatumPropertyType" substitutionGroup="gml:geodeticDatum">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesVerticalCS" type="gml:VerticalCSPropertyType" substitutionGroup="gml:verticalCS">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesVerticalDatum" type="gml:VerticalDatumPropertyType" substitutionGroup="gml:verticalDatum">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="verticalCRSRef" type="gml:VerticalCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="baseGeographicCRS" type="gml:GeographicCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="projectedCRSRef" type="gml:ProjectedCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesCS" type="gml:CoordinateSystemPropertyType" substitutionGroup="gml:coordinateSystem">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="derivedCRSRef" type="gml:DerivedCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesEngineeringDatum" type="gml:EngineeringDatumPropertyType" substitutionGroup="gml:engineeringDatum">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="engineeringCRSRef" type="gml:EngineeringCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesAffineCS" type="gml:AffineCSPropertyType" substitutionGroup="gml:affineCS">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesImageDatum" type="gml:ImageDatumPropertyType" substitutionGroup="gml:imageDatum">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesObliqueCartesianCS" type="gml:ObliqueCartesianCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="imageCRSRef" type="gml:ImageCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesTimeCS" type="gml:TimeCSPropertyType" substitutionGroup="gml:timeCS">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesTemporalCS" type="gml:TemporalCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesTemporalDatum" type="gml:TemporalDatumPropertyType" substitutionGroup="gml:temporalDatum">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="temporalCRSRef" type="gml:TemporalCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="GeographicCRS" type="gml:GeographicCRSType" substitutionGroup="gml:AbstractSingleCRS">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="GeographicCRSType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCRSType">
-				<sequence>
-					<element ref="gml:usesEllipsoidalCS"/>
-					<element ref="gml:usesGeodeticDatum"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="GeographicCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:GeographicCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="geographicCRSRef" type="gml:GeographicCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="GeocentricCRS" type="gml:GeocentricCRSType" substitutionGroup="gml:AbstractSingleCRS">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="GeocentricCRSType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCRSType">
-				<sequence>
-					<choice>
-						<element ref="gml:usesCartesianCS"/>
-						<element ref="gml:usesSphericalCS"/>
-					</choice>
-					<element ref="gml:usesGeodeticDatum"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="GeocentricCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:GeocentricCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="geocentricCRSRef" type="gml:GeocentricCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<attribute name="uom" type="anyURI">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</attribute>
-	<simpleType name="SuccessionType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="substitution"/>
-			<enumeration value="division"/>
-			<enumeration value="fusion"/>
-			<enumeration value="initiation"/>
-		</restriction>
-	</simpleType>
-	<element name="dmsAngle" type="gml:DMSAngleType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="DMSAngleType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence>
-			<element ref="gml:degrees"/>
-			<choice minOccurs="0">
-				<element ref="gml:decimalMinutes"/>
-				<sequence>
-					<element ref="gml:minutes"/>
-					<element ref="gml:seconds" minOccurs="0"/>
-				</sequence>
-			</choice>
-		</sequence>
-	</complexType>
-	<element name="degrees" type="gml:DegreesType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="DegreesType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:DegreeValueType">
-				<attribute name="direction">
-					<simpleType>
-						<restriction base="string">
-							<enumeration value="N"/>
-							<enumeration value="E"/>
-							<enumeration value="S"/>
-							<enumeration value="W"/>
-							<enumeration value="+"/>
-							<enumeration value="-"/>
-						</restriction>
-					</simpleType>
-				</attribute>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<simpleType name="DegreeValueType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<restriction base="nonNegativeInteger">
-			<maxInclusive value="359"/>
-		</restriction>
-	</simpleType>
-	<element name="decimalMinutes" type="gml:DecimalMinutesType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<simpleType name="DecimalMinutesType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<restriction base="decimal">
-			<minInclusive value="0.00"/>
-			<maxExclusive value="60.00"/>
-		</restriction>
-	</simpleType>
-	<element name="minutes" type="gml:ArcMinutesType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<simpleType name="ArcMinutesType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<restriction base="nonNegativeInteger">
-			<maxInclusive value="59"/>
-		</restriction>
-	</simpleType>
-	<element name="seconds" type="gml:ArcSecondsType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<simpleType name="ArcSecondsType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<restriction base="decimal">
-			<minInclusive value="0.00"/>
-			<maxExclusive value="60.00"/>
-		</restriction>
-	</simpleType>
-	<complexType name="AngleChoiceType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<choice>
-			<element ref="gml:angle"/>
-			<element ref="gml:dmsAngle"/>
-		</choice>
-	</complexType>
-	<attribute name="remoteSchema" type="anyURI">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</attribute>
-	<element name="member" type="gml:AssociationRoleType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="ArrayAssociationType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence>
-			<element ref="gml:AbstractObject" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="members" type="gml:ArrayAssociationType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="StringOrRefType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<simpleContent>
-			<extension base="string">
-				<attributeGroup ref="gml:AssociationAttributeGroup"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<element name="metaDataProperty" type="gml:MetaDataPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="Bag" type="gml:BagType" substitutionGroup="gml:AbstractGML">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="BagType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<sequence>
-					<element ref="gml:member" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:members" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Array" type="gml:ArrayType" substitutionGroup="gml:AbstractGML">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="ArrayType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<sequence>
-					<element ref="gml:members" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="MetaDataPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractMetaData"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attribute name="about" type="anyURI"/>
-	</complexType>
-	<element name="AbstractMetaData" type="gml:AbstractMetaDataType" abstract="true" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="AbstractMetaDataType" abstract="true" mixed="true">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence/>
-		<attribute ref="gml:id"/>
-	</complexType>
-	<element name="GenericMetaData" type="gml:GenericMetaDataType" substitutionGroup="gml:AbstractMetaData">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="GenericMetaDataType" mixed="true">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent mixed="true">
-			<extension base="gml:AbstractMetaDataType">
-				<sequence>
-					<any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="coordinates" type="gml:CoordinatesType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="pointRep" type="gml:PointPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="location" type="gml:LocationPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="LocationPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence>
-			<choice>
-				<element ref="gml:AbstractGeometry"/>
-				<element ref="gml:LocationKeyWord"/>
-				<element ref="gml:LocationString"/>
-				<element ref="gml:Null"/>
-			</choice>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="LocationString" type="gml:StringOrRefType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="LocationKeyWord" type="gml:CodeType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="priorityLocation" type="gml:PriorityLocationPropertyType" substitutionGroup="gml:location">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="PriorityLocationPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:LocationPropertyType">
-				<attribute name="priority" type="string"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="featureMember" type="gml:FeaturePropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="featureProperty" type="gml:FeaturePropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="FeatureArrayPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence minOccurs="0" maxOccurs="unbounded">
-			<element ref="gml:AbstractFeature"/>
-		</sequence>
-	</complexType>
-	<element name="featureMembers" type="gml:FeatureArrayPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="BoundedFeatureType" abstract="true">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:AbstractFeatureType">
-				<sequence>
-					<group ref="gml:StandardObjectProperties"/>
-					<element ref="gml:boundedBy"/>
-					<element ref="gml:location" minOccurs="0"/>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<complexType name="AbstractFeatureCollectionType" abstract="true">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractFeatureType">
-				<sequence>
-					<element ref="gml:featureMember" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:featureMembers" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="AbstractFeatureCollection" type="gml:AbstractFeatureCollectionType" abstract="true" substitutionGroup="gml:AbstractFeature">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="FeatureCollection" type="gml:FeatureCollectionType" substitutionGroup="gml:AbstractFeature">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="FeatureCollectionType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractFeatureCollectionType"/>
-		</complexContent>
-	</complexType>
-	<element name="track" type="gml:HistoryPropertyType" substitutionGroup="gml:history">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="DefinitionCollection" type="gml:DictionaryType" substitutionGroup="gml:Definition">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="definitionMember" type="gml:DictionaryEntryType" substitutionGroup="gml:dictionaryEntry">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="indirectEntry" type="gml:IndirectEntryType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="IndirectEntryType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence>
-			<element ref="gml:DefinitionProxy"/>
-		</sequence>
-	</complexType>
-	<element name="DefinitionProxy" type="gml:DefinitionProxyType" substitutionGroup="gml:Definition">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="DefinitionProxyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:DefinitionType">
-				<sequence>
-					<element ref="gml:definitionRef"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="definitionRef" type="gml:ReferenceType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="MappingRule" type="gml:StringOrRefType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<simpleType name="IncrementOrder">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="+x+y"/>
-			<enumeration value="+y+x"/>
-			<enumeration value="+x-y"/>
-			<enumeration value="-x-y"/>
-		</restriction>
-	</simpleType>
-	<element name="centerOf" type="gml:PointPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="position" type="gml:PointPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="extentOf" type="gml:SurfacePropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="edgeOf" type="gml:CurvePropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="centerLineOf" type="gml:CurvePropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiLocation" type="gml:MultiPointPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiCenterOf" type="gml:MultiPointPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiPosition" type="gml:MultiPointPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiCenterLineOf" type="gml:MultiCurvePropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiEdgeOf" type="gml:MultiCurvePropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiCoverage" type="gml:MultiSurfacePropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiExtentOf" type="gml:MultiSurfacePropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="polygonPatches" type="gml:SurfacePatchArrayPropertyType" substitutionGroup="gml:patches">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="trianglePatches" type="gml:SurfacePatchArrayPropertyType" substitutionGroup="gml:patches">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiPointDomain" type="gml:DomainSetType" substitutionGroup="gml:domainSet">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiCurveDomain" type="gml:DomainSetType" substitutionGroup="gml:domainSet">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiSurfaceDomain" type="gml:DomainSetType" substitutionGroup="gml:domainSet">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiSolidDomain" type="gml:DomainSetType" substitutionGroup="gml:domainSet">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="gridDomain" type="gml:DomainSetType" substitutionGroup="gml:domainSet">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="rectifiedGridDomain" type="gml:DomainSetType" substitutionGroup="gml:domainSet">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="generalOperationParameter" type="gml:AbstractGeneralOperationParameterPropertyType" substitutionGroup="gml:parameter">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="MovingObjectStatus" type="gml:MovingObjectStatusType" substitutionGroup="gml:AbstractTimeSlice">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="MovingObjectStatusType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTimeSliceType">
-				<sequence>
-					<choice>
-						<element name="position" type="gml:GeometryPropertyType"/>
-						<element ref="gml:pos"/>
-						<element ref="gml:locationName"/>
-						<element ref="gml:locationReference"/>
-						<element ref="gml:location"/>
-					</choice>
-					<element name="speed" type="gml:MeasureType" minOccurs="0"/>
-					<element name="bearing" type="gml:DirectionPropertyType" minOccurs="0"/>
-					<element name="acceleration" type="gml:MeasureType" minOccurs="0"/>
-					<element name="elevation" type="gml:MeasureType" minOccurs="0"/>
-					<element ref="gml:status" minOccurs="0"/>
-					<element ref="gml:statusReference" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="status" type="gml:StringOrRefType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="statusReference" type="gml:ReferenceType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-  <element name="topoComplexProperty" type="gml:TopoComplexPropertyType">
-    <annotation>
-			<appinfo>deprecated</appinfo>
-    </annotation>
-  </element>
-	<element name="multiPointProperty" type="gml:MultiPointPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiCurveProperty" type="gml:MultiCurvePropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiSurfaceProperty" type="gml:MultiSurfacePropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiSolidProperty" type="gml:MultiSolidPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiGeometryProperty" type="gml:MultiGeometryPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="pointArrayProperty" type="gml:PointArrayPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="curveArrayProperty" type="gml:CurveArrayPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="surfaceArrayProperty" type="gml:SurfaceArrayPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="solidArrayProperty" type="gml:SolidArrayPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/dictionary.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/dictionary.xsd
deleted file mode 100644
index c12d9a237..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/dictionary.xsd
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:dictionary:v3.2.1">dictionary.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 Clause 16.
-Many applications require definitions of terms which are used within instance documents as the values of certain properties or as reference information to tie properties to standard information values in some way.  Units of measure and descriptions of measurable phenomena are two particular examples. 
-It will often be convenient to use definitions provided by external authorities. These may already be packaged for delivery in various ways, both online and offline. In order that they may be referred to from GML documents it is generally necessary that a URI be available for each definition. Where this is the case then it is usually preferable to refer to these directly. 
-Alternatively, it may be convenient or necessary to capture definitions in XML, either embedded within an instance document containing features or as a separate document. The definitions may be transcriptions from an external source, or may be new definitions for a local purpose. In order to support this case, some simple components are provided in GML in the form of 
--	a generic gml:Definition, which may serve as the basis for more specialized definitions
--	a generic gml:Dictionary, which allows a set of definitions or references to definitions to be collected 
-These components may be used directly, but also serve as the basis for more specialised definition elements in GML, in particular: coordinate operations, coordinate reference systems, datums, temporal reference systems, and units of measure.  
-Note that the GML definition and dictionary components implement a simple nested hierarchy of definitions with identifiers. The latter provide handles which may be used in the description of more complex relationships between terms. However, the GML dictionary components are not intended to provide direct support for complex taxonomies, ontologies or thesauri.  Specialised XML tools are available to satisfy the more sophisticated requirements.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gmlBase.xsd"/>
-	<element name="Definition" type="gml:DefinitionType" substitutionGroup="gml:AbstractGML">
-		<annotation>
-			<documentation>The basic gml:Definition element specifies a definition, which can be included in or referenced by a dictionary. 
-The content model for a generic definition is a derivation from gml:AbstractGMLType.  
-The gml:description property element shall hold the definition if this can be captured in a simple text string, or the gml:descriptionReference property element may carry a link to a description elsewhere.
-The gml:identifier element shall provide one identifier identifying this definition. The identifier shall be unique within the dictionaries using this definition. 
-The gml:name elements shall provide zero or more terms and synonyms for which this is the definition.
-The gml:remarks element shall be used to hold additional textual information that is not conceptually part of the definition but is useful in understanding the definition.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DefinitionBaseType">
-		<complexContent>
-			<restriction base="gml:AbstractGMLType">
-				<sequence>
-					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:description" minOccurs="0"/>
-					<element ref="gml:descriptionReference" minOccurs="0"/>
-					<element ref="gml:identifier"/>
-					<element ref="gml:name" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-				<attribute ref="gml:id" use="required"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<complexType name="DefinitionType">
-		<complexContent>
-			<extension base="gml:DefinitionBaseType">
-				<sequence>
-					<element ref="gml:remarks" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="remarks" type="string"/>
-	<element name="Dictionary" type="gml:DictionaryType" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>Sets of definitions may be collected into dictionaries or collections.
-A gml:Dictionary is a non-abstract collection of definitions.
-The gml:Dictionary content model adds a list of gml:dictionaryEntry properties that contain or reference gml:Definition objects.  A database handle (gml:id attribute) is required, in order that this collection may be referred to. The standard gml:identifier, gml:description, gml:descriptionReference and gml:name properties are available to reference or contain more information about this dictionary. The gml:description and gml:descriptionReference property elements may be used for a description of this dictionary. The derived gml:name element may be used for the name(s) of this dictionary. for remote definiton references gml:dictionaryEntry shall be used. If a Definition object contained within a Dictionary uses the descriptionReference property to refer to a remote definition, then this enables the inclusion of a remote definition in a local dictionary, giving a handle and identifier in the context of the local dictionary.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DictionaryType">
-		<complexContent>
-			<extension base="gml:DefinitionType">
-				<choice minOccurs="0" maxOccurs="unbounded">
-					<element ref="gml:dictionaryEntry"/>
-					<element ref="gml:indirectEntry"/>
-				</choice>
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="dictionaryEntry" type="gml:DictionaryEntryType">
-		<annotation>
-			<documentation>This property element contains or refers to the definitions which are members of a dictionary. 
-The content model follows the standard GML property pattern, so a gml:dictionaryEntry may either contain or refer to a single gml:Definition. Since gml:Dictionary is substitutable for gml:Definition, the content of an entry may itself be a lower level dictionary. 
-Note that if the value is provided by reference, this definition does not carry a handle (gml:id) in this context, so does not allow external references to this specific definition in this context.  When used in this way the referenced definition will usually be in a dictionary in the same XML document.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DictionaryEntryType">
-		<complexContent>
-			<extension base="gml:AbstractMemberType">
-				<sequence minOccurs="0">
-					<element ref="gml:Definition"/>
-				</sequence>
-				<attributeGroup ref="gml:AssociationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/direction.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/direction.xsd
deleted file mode 100644
index 23ad90d03..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/direction.xsd
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" attributeFormDefault="unqualified" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:direction:3.2.1">direction.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 Clause 18.
-The direction schema components provide the GML Application Schema developer with a standard property element to describe direction, and associated objects that may be used to express orientation, direction, heading, bearing or other directional aspects of geographic features.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="geometryBasic0d1d.xsd"/>
-	<element name="direction" type="gml:DirectionPropertyType">
-		<annotation>
-			<documentation>The property gml:direction is intended as a pre-defined property expressing a direction to be assigned to features defined in a GML application schema.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DirectionPropertyType">
-		<choice minOccurs="0">
-			<element name="DirectionVector" type="gml:DirectionVectorType"/>
-			<element name="DirectionDescription" type="gml:DirectionDescriptionType"/>
-			<element name="CompassPoint" type="gml:CompassPointEnumeration"/>
-			<element name="DirectionKeyword" type="gml:CodeType"/>
-			<element name="DirectionString" type="gml:StringOrRefType"/>
-		</choice>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<complexType name="DirectionVectorType">
-		<annotation>
-			<documentation>Direction vectors are specified by providing components of a vector.</documentation>
-		</annotation>
-		<choice>
-			<element ref="gml:vector"/>
-			<sequence>
-				<annotation>
-					<appinfo>deprecated</appinfo>
-				</annotation>
-				<element name="horizontalAngle" type="gml:AngleType"/>
-				<element name="verticalAngle" type="gml:AngleType"/>
-			</sequence>
-		</choice>
-	</complexType>
-	<complexType name="DirectionDescriptionType">
-		<annotation>
-			<documentation>direction descriptions are specified by a compass point code, a keyword, a textual description or a reference to a description.
-A gml:compassPoint is specified by a simple enumeration.  	
-In addition, thre elements to contain text-based descriptions of direction are provided.  
-If the direction is specified using a term from a list, gml:keyword should be used, and the list indicated using the value of the codeSpace attribute. 
-if the direction is decribed in prose, gml:direction or gml:reference should be used, allowing the value to be included inline or by reference.</documentation>
-		</annotation>
-		<choice>
-			<element name="compassPoint" type="gml:CompassPointEnumeration"/>
-			<element name="keyword" type="gml:CodeType"/>
-			<element name="description" type="string"/>
-			<element name="reference" type="gml:ReferenceType"/>
-		</choice>
-	</complexType>
-	<simpleType name="CompassPointEnumeration">
-		<annotation>
-			<documentation>These directions are necessarily approximate, giving direction with a precision of 22.5°. It is thus generally unnecessary to specify the reference frame, though this may be detailed in the definition of a GML application language.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="N"/>
-			<enumeration value="NNE"/>
-			<enumeration value="NE"/>
-			<enumeration value="ENE"/>
-			<enumeration value="E"/>
-			<enumeration value="ESE"/>
-			<enumeration value="SE"/>
-			<enumeration value="SSE"/>
-			<enumeration value="S"/>
-			<enumeration value="SSW"/>
-			<enumeration value="SW"/>
-			<enumeration value="WSW"/>
-			<enumeration value="W"/>
-			<enumeration value="WNW"/>
-			<enumeration value="NW"/>
-			<enumeration value="NNW"/>
-		</restriction>
-	</simpleType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/dynamicFeature.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/dynamicFeature.xsd
deleted file mode 100644
index e802bf8cd..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/dynamicFeature.xsd
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:dynamicFeature:3.2.1">dynamicFeature.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 15.6.
-A number of types and relationships are defined to represent the time-varying properties of geographic features. 
-In a comprehensive treatment of spatiotemporal modeling, Langran (see Bibliography) distinguished three principal temporal entities: states, events, and evidence; the schema specified in the following Subclauses incorporates elements for each.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="feature.xsd"/>
-	<include schemaLocation="direction.xsd"/>
-	<element name="dataSource" type="gml:StringOrRefType">
-		<annotation>
-			<documentation>Evidence is represented by a simple gml:dataSource or gml:dataSourceReference property that indicates the source of the temporal data. The remote link attributes of the gml:dataSource element have been deprecated along with its current type.</documentation>
-		</annotation>
-	</element>
-	<element name="dataSourceReference" type="gml:ReferenceType">
-		<annotation>
-			<documentation>Evidence is represented by a simple gml:dataSource or gml:dataSourceReference property that indicates the source of the temporal data.</documentation>
-		</annotation>
-	</element>
-	<group name="dynamicProperties">
-		<annotation>
-			<documentation>A convenience group. This allows an application schema developer to include dynamic properties in a content model in a standard fashion.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:validTime" minOccurs="0"/>
-			<element ref="gml:history" minOccurs="0"/>
-			<element ref="gml:dataSource" minOccurs="0"/>
-			<element ref="gml:dataSourceReference" minOccurs="0"/>
-		</sequence>
-	</group>
-	<element name="DynamicFeature" type="gml:DynamicFeatureType" substitutionGroup="gml:AbstractFeature">
-		<annotation>
-			<documentation>States are captured by time-stamped instances of a feature. The content model extends the standard gml:AbstractFeatureType with the gml:dynamicProperties model group.
-Each time-stamped instance represents a 'snapshot' of a feature. The dynamic feature classes will normally be extended to suit particular applications.  A dynamic feature bears either a time stamp or a history.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DynamicFeatureType">
-		<complexContent>
-			<extension base="gml:AbstractFeatureType">
-				<group ref="gml:dynamicProperties"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="DynamicFeatureCollection" type="gml:DynamicFeatureCollectionType" substitutionGroup="gml:DynamicFeature">
-		<annotation>
-			<documentation>A gml:DynamicFeatureCollection is a feature collection that has a gml:validTime property (i.e. is a snapshot of the feature collection) or which has a gml:history property that contains one or more gml:AbstractTimeSlices each of which contain values of the time varying properties of the feature collection.  Note that the gml:DynamicFeatureCollection may be one of the following:
-1.	A feature collection which consists of static feature members (members do not change in time) but which has properties of the collection object as a whole that do change in time .  
-2.	A feature collection which consists of dynamic feature members (the members are gml:DynamicFeatures) but which also has properties of the collection as a whole that vary in time.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DynamicFeatureCollectionType">
-		<complexContent>
-			<extension base="gml:DynamicFeatureType">
-				<sequence>
-					<element ref="gml:dynamicMembers"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="dynamicMembers" type="gml:DynamicFeatureMemberType"/>
-	<complexType name="DynamicFeatureMemberType">
-		<complexContent>
-			<extension base="gml:AbstractFeatureMemberType">
-				<sequence>
-					<element ref="gml:DynamicFeature" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-				<attributeGroup ref="gml:AssociationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="AbstractTimeSlice" type="gml:AbstractTimeSliceType" abstract="true" substitutionGroup="gml:AbstractGML">
-		<annotation>
-			<documentation>To describe an event — an action that occurs at an instant or over an interval of time — GML provides the gml:AbtractTimeSlice element. A timeslice encapsulates the time-varying properties of a dynamic feature -- it shall be extended to represent a time stamped projection of a specific feature. The gml:dataSource property describes how the temporal data was acquired.
-A gml:AbstractTimeSlice instance is a GML object that encapsulates updates of the dynamic—or volatile—properties that reflect some change event; it thus includes only those feature properties that have actually changed due to some process.
-gml:AbstractTimeSlice basically provides a facility for attribute-level time stamping, in contrast to the object-level time stamping of dynamic feature instances. 
-The time slice can thus be viewed as event or process-oriented, whereas a snapshot is more state or structure-oriented. A timeslice has richer causality, whereas a snapshot merely portrays the status of the whole. 
-</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractTimeSliceType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<sequence>
-					<element ref="gml:validTime"/>
-					<element ref="gml:dataSource" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="history" type="gml:HistoryPropertyType">
-		<annotation>
-			<documentation>A generic sequence of events constitute a gml:history of an object.
-The gml:history element contains a set of elements in the substitution group headed by the abstract element gml:AbstractTimeSlice, representing the time-varying properties of interest. The history property of a dynamic feature associates a feature instance with a sequence of time slices (i.e. change events) that encapsulate the evolution of the feature.</documentation>
-		</annotation>
-	</element>
-	<complexType name="HistoryPropertyType">
-		<sequence>
-			<element ref="gml:AbstractTimeSlice" maxOccurs="unbounded"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/feature.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/feature.xsd
deleted file mode 100644
index f67a215bf..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/feature.xsd
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:feature:3.2.1">feature.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 Clause 9.
-A GML feature is a (representation of a) identifiable real-world object in a selected domain of discourse. The feature schema provides a framework for the creation of GML features and feature collections.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="geometryAggregates.xsd"/>
-	<include schemaLocation="temporal.xsd"/>
-	<complexType name="AbstractFeatureType" abstract="true">
-		<annotation>
-			<documentation>The basic feature model is given by the gml:AbstractFeatureType.
-The content model for gml:AbstractFeatureType adds two specific properties suitable for geographic features to the content model defined in gml:AbstractGMLType. 
-The value of the gml:boundedBy property describes an envelope that encloses the entire feature instance, and is primarily useful for supporting rapid searching for features that occur in a particular location. 
-The value of the gml:location property describes the extent, position or relative location of the feature.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<sequence>
-					<element ref="gml:boundedBy" minOccurs="0"/>
-					<element ref="gml:location" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="AbstractFeature" type="gml:AbstractFeatureType" abstract="true" substitutionGroup="gml:AbstractGML">
-		<annotation>
-			<documentation>This abstract element serves as the head of a substitution group which may contain any elements whose content model is derived from gml:AbstractFeatureType.  This may be used as a variable in the construction of content models.  
-gml:AbstractFeature may be thought of as "anything that is a GML feature" and may be used to define variables or templates in which the value of a GML property is "any feature". This occurs in particular in a GML feature collection where the feature member properties contain one or multiple copies of gml:AbstractFeature respectively.</documentation>
-		</annotation>
-	</element>
-	<complexType name="FeaturePropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractFeature"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="boundedBy" type="gml:BoundingShapeType" nillable="true">
-		<annotation>
-			<documentation>This property describes the minimum bounding box or rectangle that encloses the entire feature.</documentation>
-		</annotation>
-	</element>
-	<complexType name="BoundingShapeType">
-		<sequence>
-			<choice>
-				<element ref="gml:Envelope"/>
-				<element ref="gml:Null"/>
-			</choice>
-		</sequence>
-		<attribute name="nilReason" type="gml:NilReasonType"/>
-	</complexType>
-	<element name="EnvelopeWithTimePeriod" type="gml:EnvelopeWithTimePeriodType" substitutionGroup="gml:Envelope">
-		<annotation>
-			<documentation>gml:EnvelopeWithTimePeriod is provided for envelopes that include a temporal extent. It adds two time position properties, gml:beginPosition and gml:endPosition, which describe the extent of a time-envelope.  
-Since gml:EnvelopeWithTimePeriod is assigned to the substitution group headed by gml:Envelope, it may be used whenever gml:Envelope is valid.</documentation>
-		</annotation>
-	</element>
-	<complexType name="EnvelopeWithTimePeriodType">
-		<complexContent>
-			<extension base="gml:EnvelopeType">
-				<sequence>
-					<element name="beginPosition" type="gml:TimePositionType"/>
-					<element name="endPosition" type="gml:TimePositionType"/>
-				</sequence>
-				<attribute name="frame" type="anyURI" default="#ISO-8601"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="locationName" type="gml:CodeType">
-		<annotation>
-			<documentation>The gml:locationName property element is a convenience property where the text value describes the location of the feature. If the location names are selected from a controlled list, then the list shall be identified in the codeSpace attribute.</documentation>
-		</annotation>
-	</element>
-	<element name="locationReference" type="gml:ReferenceType">
-		<annotation>
-			<documentation>The gml:locationReference property element is a convenience property where the text value referenced by the xlink:href attribute describes the location of the feature.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractFeatureMemberType" abstract="true">
-		<annotation>
-			<documentation>To create a collection of GML features, a property type shall be derived by extension from gml:AbstractFeatureMemberType.
-By default, this abstract property type does not imply any ownership of the features in the collection. The owns attribute of gml:OwnershipAttributeGroup may be used on a property element instance to assert ownership of a feature in the collection. A collection shall not own a feature already owned by another object.</documentation>
-		</annotation>
-		<sequence/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/geometryAggregates.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/geometryAggregates.xsd
deleted file mode 100644
index 1c3f111c9..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/geometryAggregates.xsd
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:geometryAggregates:3.2.1">geometryAggregates.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 12.3.
-Geometric aggregates (i.e. instances of a subtype of gml:AbstractGeometricAggregateType) are arbitrary aggregations of geometry elements. They are not assumed to have any additional internal structure and are used to "collect" pieces of geometry of a specified type. Application schemas may use aggregates for features that use multiple geometric objects in their representations.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="geometryPrimitives.xsd"/>
-	<complexType name="AbstractGeometricAggregateType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractGeometryType">
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="AbstractGeometricAggregate" type="gml:AbstractGeometricAggregateType" abstract="true" substitutionGroup="gml:AbstractGeometry">
-		<annotation>
-			<documentation>gml:AbstractGeometricAggregate is the abstract head of the substitution group for all geometric aggregates.</documentation>
-		</annotation>
-	</element>
-	<complexType name="MultiGeometryType">
-		<complexContent>
-			<extension base="gml:AbstractGeometricAggregateType">
-				<sequence>
-					<element ref="gml:geometryMember" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:geometryMembers" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="MultiGeometry" type="gml:MultiGeometryType" substitutionGroup="gml:AbstractGeometricAggregate">
-		<annotation>
-			<documentation>gml:MultiGeometry is a collection of one or more GML geometry objects of arbitrary type. 
-The members of the geometric aggregate may be specified either using the "standard" property (gml:geometryMember) or the array property (gml:geometryMembers). It is also valid to use both the "standard" and the array properties in the same collection.</documentation>
-		</annotation>
-	</element>
-	<element name="geometryMember" type="gml:GeometryPropertyType">
-		<annotation>
-			<documentation>This property element either references a geometry element via the XLink-attributes or contains the geometry element.</documentation>
-		</annotation>
-	</element>
-	<element name="geometryMembers" type="gml:GeometryArrayPropertyType">
-		<annotation>
-			<documentation>This property element contains a list of geometry elements. The order of the elements is significant and shall be preserved when processing the array.</documentation>
-		</annotation>
-	</element>
-	<complexType name="MultiGeometryPropertyType">
-		<annotation>
-			<documentation>A property that has a geometric aggregate as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractGeometricAggregate"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<complexType name="MultiPointType">
-		<complexContent>
-			<extension base="gml:AbstractGeometricAggregateType">
-				<sequence>
-					<element ref="gml:pointMember" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:pointMembers" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="MultiPoint" type="gml:MultiPointType" substitutionGroup="gml:AbstractGeometricAggregate">
-		<annotation>
-			<documentation>A gml:MultiPoint consists of one or more gml:Points.
-The members of the geometric aggregate may be specified either using the "standard" property (gml:pointMember) or the array property (gml:pointMembers). It is also valid to use both the "standard" and the array properties in the same collection.</documentation>
-		</annotation>
-	</element>
-	<element name="pointMember" type="gml:PointPropertyType">
-		<annotation>
-			<documentation>This property element either references a Point via the XLink-attributes or contains the Point element.</documentation>
-		</annotation>
-	</element>
-	<element name="pointMembers" type="gml:PointArrayPropertyType">
-		<annotation>
-			<documentation>This property element contains a list of points. The order of the elements is significant and shall be preserved when processing the array.</documentation>
-		</annotation>
-	</element>
-	<complexType name="MultiPointPropertyType">
-		<annotation>
-			<documentation>A property that has a collection of points as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:MultiPoint"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<complexType name="MultiCurveType">
-		<complexContent>
-			<extension base="gml:AbstractGeometricAggregateType">
-				<sequence>
-					<element ref="gml:curveMember" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:curveMembers" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="MultiCurve" type="gml:MultiCurveType" substitutionGroup="gml:AbstractGeometricAggregate">
-		<annotation>
-			<documentation>A gml:MultiCurve is defined by one or more gml:AbstractCurves.
-The members of the geometric aggregate may be specified either using the "standard" property (gml:curveMember) or the array property (gml:curveMembers). It is also valid to use both the "standard" and the array properties in the same collection.</documentation>
-		</annotation>
-	</element>
-	<element name="curveMembers" type="gml:CurveArrayPropertyType">
-		<annotation>
-			<documentation>This property element contains a list of curves. The order of the elements is significant and shall be preserved when processing the array.</documentation>
-		</annotation>
-	</element>
-	<complexType name="MultiCurvePropertyType">
-		<annotation>
-			<documentation>A property that has a collection of curves as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:MultiCurve"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<complexType name="MultiSurfaceType">
-		<complexContent>
-			<extension base="gml:AbstractGeometricAggregateType">
-				<sequence>
-					<element ref="gml:surfaceMember" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:surfaceMembers" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="MultiSurface" type="gml:MultiSurfaceType" substitutionGroup="gml:AbstractGeometricAggregate">
-		<annotation>
-			<documentation>A gml:MultiSurface is defined by one or more gml:AbstractSurfaces.
-The members of the geometric aggregate may be specified either using the "standard" property (gml:surfaceMember) or the array property (gml:surfaceMembers). It is also valid to use both the "standard" and the array properties in the same collection.</documentation>
-		</annotation>
-	</element>
-	<element name="surfaceMembers" type="gml:SurfaceArrayPropertyType">
-		<annotation>
-			<documentation>This property element contains a list of surfaces. The order of the elements is significant and shall be preserved when processing the array.</documentation>
-		</annotation>
-	</element>
-	<complexType name="MultiSurfacePropertyType">
-		<annotation>
-			<documentation>A property that has a collection of surfaces as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:MultiSurface"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<complexType name="MultiSolidType">
-		<complexContent>
-			<extension base="gml:AbstractGeometricAggregateType">
-				<sequence>
-					<element ref="gml:solidMember" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:solidMembers" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="MultiSolid" type="gml:MultiSolidType" substitutionGroup="gml:AbstractGeometricAggregate">
-		<annotation>
-			<documentation>A gml:MultiSolid is defined by one or more gml:AbstractSolids.
-The members of the geometric aggregate may be specified either using the "standard" property (gml:solidMember) or the array property (gml:solidMembers). It is also valid to use both the "standard" and the array properties in the same collection.</documentation>
-		</annotation>
-	</element>
-	<element name="solidMember" type="gml:SolidPropertyType">
-		<annotation>
-			<documentation>This property element either references a solid via the XLink-attributes or contains the solid element. A solid element is any element, which is substitutable for gml:AbstractSolid.</documentation>
-		</annotation>
-	</element>
-	<element name="solidMembers" type="gml:SolidArrayPropertyType">
-		<annotation>
-			<documentation>This property element contains a list of solids. The order of the elements is significant and shall be preserved when processing the array.</documentation>
-		</annotation>
-	</element>
-	<complexType name="MultiSolidPropertyType">
-		<annotation>
-			<documentation>A property that has a collection of solids as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:MultiSolid"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/geometryBasic0d1d.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/geometryBasic0d1d.xsd
deleted file mode 100644
index 4edad7515..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/geometryBasic0d1d.xsd
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" elementFormDefault="qualified" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:geometryBasic0d1d:3.2.1">geometryBasic0d1d.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 Clause 10.
-Any geometry element that inherits the semantics of AbstractGeometryType may be viewed as a set of direct positions. 
-All of the classes derived from AbstractGeometryType inherit an optional association to a coordinate reference system. All direct positions shall directly or indirectly be associated with a coordinate reference system. When geometry elements are aggregated in another geometry element (such as a MultiGeometry or GeometricComplex), which already has a coordinate reference system specified, then these elements are assumed to be in that same coordinate reference system unless otherwise specified.
-The geometry model distinguishes geometric primitives, aggregates and complexes. 
-Geometric primitives, i.e. instances of a subtype of AbstractGeometricPrimitiveType, will be open, that is, they will not contain their boundary points; curves will not contain their end points, surfaces will not contain their boundary curves, and solids will not contain their bounding surfaces.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="measures.xsd"/>
-	<complexType name="AbstractGeometryType" abstract="true">
-		<annotation>
-			<documentation>All geometry elements are derived directly or indirectly from this abstract supertype. A geometry element may have an identifying attribute (gml:id), one or more names (elements identifier and name) and a description (elements description and descriptionReference) . It may be associated with a spatial reference system (attribute group gml:SRSReferenceGroup).
-The following rules shall be adhered to:
--	Every geometry type shall derive from this abstract type.
--	Every geometry element (i.e. an element of a geometry type) shall be directly or indirectly in the substitution group of AbstractGeometry.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<attributeGroup ref="gml:SRSReferenceGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<attributeGroup name="SRSReferenceGroup">
-		<annotation>
-			<documentation>The attribute group SRSReferenceGroup is an optional reference to the CRS used by this geometry, with optional additional information to simplify the processing of the coordinates when a more complete definition of the CRS is not needed.
-In general the attribute srsName points to a CRS instance of gml:AbstractCoordinateReferenceSystem. For well-known references it is not required that the CRS description exists at the location the URI points to. 
-If no srsName attribute is given, the CRS shall be specified as part of the larger context this geometry element is part of.</documentation>
-		</annotation>
-		<attribute name="srsName" type="anyURI"/>
-		<attribute name="srsDimension" type="positiveInteger"/>
-		<attributeGroup ref="gml:SRSInformationGroup"/>
-	</attributeGroup>
-	<attributeGroup name="SRSInformationGroup">
-		<annotation>
-			<documentation>The attributes uomLabels and axisLabels, defined in the SRSInformationGroup attribute group, are optional additional and redundant information for a CRS to simplify the processing of the coordinate values when a more complete definition of the CRS is not needed. This information shall be the same as included in the complete definition of the CRS, referenced by the srsName attribute. When the srsName attribute is included, either both or neither of the axisLabels and uomLabels attributes shall be included. When the srsName attribute is omitted, both of these attributes shall be omitted.
-The attribute axisLabels is an ordered list of labels for all the axes of this CRS. The gml:axisAbbrev value should be used for these axis labels, after spaces and forbidden characters are removed. When the srsName attribute is included, this attribute is optional. When the srsName attribute is omitted, this attribute shall also be omitted.
-The attribute uomLabels is an ordered list of unit of measure (uom) labels for all the axes of this CRS. The value of the string in the gml:catalogSymbol should be used for this uom labels, after spaces and forbidden characters are removed. When the axisLabels attribute is included, this attribute shall also be included. When the axisLabels attribute is omitted, this attribute shall also be omitted.</documentation>
-		</annotation>
-		<attribute name="axisLabels" type="gml:NCNameList"/>
-		<attribute name="uomLabels" type="gml:NCNameList"/>
-	</attributeGroup>
-	<element name="AbstractGeometry" type="gml:AbstractGeometryType" abstract="true" substitutionGroup="gml:AbstractGML">
-		<annotation>
-			<documentation>The AbstractGeometry element is the abstract head of the substitution group for all geometry elements of GML. This includes pre-defined and user-defined geometry elements. Any geometry element shall be a direct or indirect extension/restriction of AbstractGeometryType and shall be directly or indirectly in the substitution group of AbstractGeometry.</documentation>
-		</annotation>
-	</element>
-	<complexType name="GeometryPropertyType">
-		<annotation>
-			<documentation>A geometric property may either be any geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same or another document). Note that either the reference or the contained element shall be given, but not both or none.
-If a feature has a property that takes a geometry element as its value, this is called a geometry property. A generic type for such a geometry property is GeometryPropertyType.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractGeometry"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<complexType name="GeometryArrayPropertyType">
-		<annotation>
-			<documentation>If a feature has a property which takes an array of geometry elements as its value, this is called a geometry array property. A generic type for such a geometry property is GeometryArrayPropertyType. 
-The elements are always contained inline in the array property, referencing geometry elements or arrays of geometry elements via XLinks is not supported.</documentation>
-		</annotation>
-		<sequence minOccurs="0" maxOccurs="unbounded">
-			<element ref="gml:AbstractGeometry"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<complexType name="DirectPositionType">
-		<annotation>
-			<documentation>Direct position instances hold the coordinates for a position within some coordinate reference system (CRS). Since direct positions, as data types, will often be included in larger objects (such as geometry elements) that have references to CRS, the srsName attribute will in general be missing, if this particular direct position is included in a larger element with such a reference to a CRS. In this case, the CRS is implicitly assumed to take on the value of the containing object's CRS.
-if no srsName attribute is given, the CRS shall be specified as part of the larger context this geometry element is part of, typically a geometric object like a point, curve, etc.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:doubleList">
-				<attributeGroup ref="gml:SRSReferenceGroup"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<element name="pos" type="gml:DirectPositionType"/>
-	<complexType name="DirectPositionListType">
-		<annotation>
-			<documentation>posList instances (and other instances with the content model specified by DirectPositionListType) hold the coordinates for a sequence of direct positions within the same coordinate reference system (CRS).
-if no srsName attribute is given, the CRS shall be specified as part of the larger context this geometry element is part of, typically a geometric object like a point, curve, etc. 
-The optional attribute count specifies the number of direct positions in the list. If the attribute count is present then the attribute srsDimension shall be present, too.
-The number of entries in the list is equal to the product of the dimensionality of the coordinate reference system (i.e. it is a derived value of the coordinate reference system definition) and the number of direct positions.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:doubleList">
-				<attributeGroup ref="gml:SRSReferenceGroup"/>
-				<attribute name="count" type="positiveInteger"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<element name="posList" type="gml:DirectPositionListType"/>
-	<group name="geometricPositionGroup">
-		<annotation>
-			<documentation>GML supports two different ways to specify a geometric position: either by a direct position (a data type) or a point (a geometric object).
-pos elements are positions that are "owned" by the geometric primitive encapsulating this geometric position.
-pointProperty elements contain a point that may be referenced from other geometry elements or reference another point defined elsewhere (reuse of existing points).</documentation>
-		</annotation>
-		<choice>
-			<element ref="gml:pos"/>
-			<element ref="gml:pointProperty"/>
-		</choice>
-	</group>
-	<group name="geometricPositionListGroup">
-		<annotation>
-			<documentation>GML supports two different ways to specify a list of geometric positions: either by a sequence of geometric positions (by reusing the group definition) or a sequence of direct positions (element posList). 
-The posList element allows for a compact way to specify the coordinates of the positions, if all positions are represented in the same coordinate reference system.</documentation>
-		</annotation>
-		<choice>
-			<element ref="gml:posList"/>
-			<group ref="gml:geometricPositionGroup" maxOccurs="unbounded"/>
-		</choice>
-	</group>
-	<complexType name="VectorType">
-		<annotation>
-			<documentation>For some applications the components of the position may be adjusted to yield a unit vector.</documentation>
-		</annotation>
-		<simpleContent>
-			<restriction base="gml:DirectPositionType"/>
-		</simpleContent>
-	</complexType>
-	<element name="vector" type="gml:VectorType"/>
-	<complexType name="EnvelopeType">
-		<choice>
-			<sequence>
-				<element name="lowerCorner" type="gml:DirectPositionType"/>
-				<element name="upperCorner" type="gml:DirectPositionType"/>
-			</sequence>
-			<element ref="gml:pos" minOccurs="2" maxOccurs="2">
-				<annotation>
-					<appinfo>deprecated</appinfo>
-				</annotation>
-			</element>
-			<element ref="gml:coordinates"/>
-		</choice>
-		<attributeGroup ref="gml:SRSReferenceGroup"/>
-	</complexType>
-	<element name="Envelope" type="gml:EnvelopeType" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>Envelope defines an extent using a pair of positions defining opposite corners in arbitrary dimensions. The first direct position is the "lower corner" (a coordinate position consisting of all the minimal ordinates for each dimension for all points within the envelope), the second one the "upper corner" (a coordinate position consisting of all the maximal ordinates for each dimension for all points within the envelope).
-The use of the properties "coordinates" and "pos" has been deprecated. The explicitly named properties "lowerCorner" and "upperCorner" shall be used instead.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractGeometricPrimitiveType" abstract="true">
-		<annotation>
-			<documentation>gml:AbstractGeometricPrimitiveType is the abstract root type of the geometric primitives. A geometric primitive is a geometric object that is not decomposed further into other primitives in the system. All primitives are oriented in the direction implied by the sequence of their coordinate tuples.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometryType"/>
-		</complexContent>
-	</complexType>
-	<element name="AbstractGeometricPrimitive" type="gml:AbstractGeometricPrimitiveType" abstract="true" substitutionGroup="gml:AbstractGeometry">
-		<annotation>
-			<documentation>The AbstractGeometricPrimitive element is the abstract head of the substitution group for all (pre- and user-defined) geometric primitives.</documentation>
-		</annotation>
-	</element>
-	<complexType name="GeometricPrimitivePropertyType">
-		<annotation>
-			<documentation>A property that has a geometric primitive as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractGeometricPrimitive"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<complexType name="PointType">
-		<complexContent>
-			<extension base="gml:AbstractGeometricPrimitiveType">
-				<sequence>
-					<choice>
-						<element ref="gml:pos"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Point" type="gml:PointType" substitutionGroup="gml:AbstractGeometricPrimitive">
-		<annotation>
-			<documentation>A Point is defined by a single coordinate tuple. The direct position of a point is specified by the pos element which is of type DirectPositionType.</documentation>
-		</annotation>
-	</element>
-	<complexType name="PointPropertyType">
-		<annotation>
-			<documentation>A property that has a point as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:Point"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="pointProperty" type="gml:PointPropertyType">
-		<annotation>
-			<documentation>This property element either references a point via the XLink-attributes or contains the point element. pointProperty is the predefined property which may be used by GML Application Schemas whenever a GML feature has a property with a value that is substitutable for Point.</documentation>
-		</annotation>
-	</element>
-	<complexType name="PointArrayPropertyType">
-		<annotation>
-			<documentation>gml:PointArrayPropertyType is a container for an array of points. The elements are always contained inline in the array property, referencing geometry elements or arrays of geometry elements via XLinks is not supported.</documentation>
-		</annotation>
-		<sequence minOccurs="0" maxOccurs="unbounded">
-			<element ref="gml:Point"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<complexType name="AbstractCurveType" abstract="true">
-		<annotation>
-			<documentation>gml:AbstractCurveType is an abstraction of a curve to support the different levels of complexity. The curve may always be viewed as a geometric primitive, i.e. is continuous.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometricPrimitiveType"/>
-		</complexContent>
-	</complexType>
-	<element name="AbstractCurve" type="gml:AbstractCurveType" abstract="true" substitutionGroup="gml:AbstractGeometricPrimitive">
-		<annotation>
-			<documentation>The AbstractCurve element is the abstract head of the substitution group for all (continuous) curve elements.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CurvePropertyType">
-		<annotation>
-			<documentation>A property that has a curve as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractCurve"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="curveProperty" type="gml:CurvePropertyType">
-		<annotation>
-			<documentation>This property element either references a curve via the XLink-attributes or contains the curve element. curveProperty is the predefined property which may be used by GML Application Schemas whenever a GML feature has a property with a value that is substitutable for AbstractCurve.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CurveArrayPropertyType">
-		<annotation>
-			<documentation>A container for an array of curves. The elements are always contained in the array property, referencing geometry elements or arrays of geometry elements via XLinks is not supported.</documentation>
-		</annotation>
-		<sequence minOccurs="0" maxOccurs="unbounded">
-			<element ref="gml:AbstractCurve"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<complexType name="LineStringType">
-		<complexContent>
-			<extension base="gml:AbstractCurveType">
-				<sequence>
-					<choice>
-						<choice minOccurs="2" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="LineString" type="gml:LineStringType" substitutionGroup="gml:AbstractCurve">
-		<annotation>
-			<documentation>A LineString is a special curve that consists of a single segment with linear interpolation. It is defined by two or more coordinate tuples, with linear interpolation between them. The number of direct positions in the list shall be at least two.</documentation>
-		</annotation>
-	</element>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/geometryBasic2d.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/geometryBasic2d.xsd
deleted file mode 100644
index d8f99d05d..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/geometryBasic2d.xsd
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:geometryBasic2d:3.2.1">geometryBasic2d.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 Clause 10.
-			
-			GML is an OGC Standard.
-			Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="geometryBasic0d1d.xsd"/>
-	<complexType name="AbstractSurfaceType" abstract="true">
-		<annotation>
-			<documentation>gml:AbstractSurfaceType is an abstraction of a surface to support the different levels of complexity. A surface is always a continuous region of a plane.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometricPrimitiveType"/>
-		</complexContent>
-	</complexType>
-	<element name="AbstractSurface" type="gml:AbstractSurfaceType" abstract="true" substitutionGroup="gml:AbstractGeometricPrimitive">
-		<annotation>
-			<documentation>The AbstractSurface element is the abstract head of the substitution group for all (continuous) surface elements.</documentation>
-		</annotation>
-	</element>
-	<complexType name="SurfacePropertyType">
-		<annotation>
-			<documentation>A property that has a surface as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractSurface"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="surfaceProperty" type="gml:SurfacePropertyType">
-		<annotation>
-			<documentation>This property element either references a surface via the XLink-attributes or contains the surface element. surfaceProperty is the predefined property which may be used by GML Application Schemas whenever a GML feature has a property with a value that is substitutable for AbstractSurface.</documentation>
-		</annotation>
-	</element>
-	<complexType name="SurfaceArrayPropertyType">
-		<annotation>
-			<documentation>gml:SurfaceArrayPropertyType is a container for an array of surfaces. The elements are always contained in the array property, referencing geometry elements or arrays of geometry elements via XLinks is not supported.</documentation>
-		</annotation>
-		<sequence minOccurs="0" maxOccurs="unbounded">
-			<element ref="gml:AbstractSurface"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<complexType name="PolygonType">
-		<complexContent>
-			<extension base="gml:AbstractSurfaceType">
-				<sequence>
-					<element ref="gml:exterior" minOccurs="0"/>
-					<element ref="gml:interior" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Polygon" type="gml:PolygonType" substitutionGroup="gml:AbstractSurface">
-		<annotation>
-			<documentation>A Polygon is a special surface that is defined by a single surface patch (see D.3.6). The boundary of this patch is coplanar and the polygon uses planar interpolation in its interior. 
-The elements exterior and interior describe the surface boundary of the polygon.</documentation>
-		</annotation>
-	</element>
-	<element name="exterior" type="gml:AbstractRingPropertyType">
-		<annotation>
-			<documentation>A boundary of a surface consists of a number of rings. In the normal 2D case, one of these rings is distinguished as being the exterior boundary. In a general manifold this is not always possible, in which case all boundaries shall be listed as interior boundaries, and the exterior will be empty.</documentation>
-		</annotation>
-	</element>
-	<element name="interior" type="gml:AbstractRingPropertyType">
-		<annotation>
-			<documentation>A boundary of a surface consists of a number of rings. The "interior" rings separate the surface / surface patch from the area enclosed by the rings.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractRingType" abstract="true">
-		<sequence/>
-	</complexType>
-	<element name="AbstractRing" type="gml:AbstractRingType" abstract="true" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>An abstraction of a ring to support surface boundaries of different complexity.
-The AbstractRing element is the abstract head of the substituition group for all closed boundaries of a surface patch.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractRingPropertyType">
-		<annotation>
-			<documentation>A property with the content model of gml:AbstractRingPropertyType encapsulates a ring to represent the surface boundary property of a surface.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:AbstractRing"/>
-		</sequence>
-	</complexType>
-	<complexType name="LinearRingType">
-		<complexContent>
-			<extension base="gml:AbstractRingType">
-				<sequence>
-					<choice>
-						<choice minOccurs="4" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="LinearRing" type="gml:LinearRingType" substitutionGroup="gml:AbstractRing">
-		<annotation>
-			<documentation>A LinearRing is defined by four or more coordinate tuples, with linear interpolation between them; the first and last coordinates shall be coincident. The number of direct positions in the list shall be at least four.</documentation>
-		</annotation>
-	</element>
-	<complexType name="LinearRingPropertyType">
-		<annotation>
-			<documentation>A property with the content model of gml:LinearRingPropertyType encapsulates a linear ring to represent a component of a surface boundary.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:LinearRing"/>
-		</sequence>
-	</complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/geometryComplexes.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/geometryComplexes.xsd
deleted file mode 100644
index 8b45ff886..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/geometryComplexes.xsd
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:geometryComplexes:3.2.1">geometryComplexes.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 12.2.
-Geometric complexes (i.e. instances of gml:GeometricComplexType) are closed collections of geometric primitives, i.e. they will contain their boundaries. 
-A geometric complex (gml:GeometricComplex) is defined by ISO 19107:2003, 6.6.1 as "a set of primitive geometric objects (in a common coordinate system) whose interiors are disjoint. Further, if a primitive is in a geometric complex, then there exists a set of primitives in that complex whose point-wise union is the boundary of this first primitive."
-A geometric composite (gml:CompositeCurve, gml:CompositeSurface and gml:CompositeSolid) represents a geometric complex with an underlying core geometry that is isomorphic to a primitive, i.e. it can be viewed as a primitive and as a complex. See ISO 19107:2003, 6.1 and 6.6.3 for more details on the nature of composite geometries.
-Geometric complexes and composites are intended to be used in application schemas where the sharing of geometry is important.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="geometryAggregates.xsd"/>
-	<complexType name="GeometricComplexType">
-		<complexContent>
-			<extension base="gml:AbstractGeometryType">
-				<sequence>
-					<element name="element" type="gml:GeometricPrimitivePropertyType" maxOccurs="unbounded"/>
-				</sequence>
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="GeometricComplex" type="gml:GeometricComplexType" substitutionGroup="gml:AbstractGeometry"/>
-	<complexType name="GeometricComplexPropertyType">
-		<annotation>
-			<documentation>A property that has a geometric complex as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<choice>
-				<element ref="gml:GeometricComplex"/>
-				<element ref="gml:CompositeCurve"/>
-				<element ref="gml:CompositeSurface"/>
-				<element ref="gml:CompositeSolid"/>
-			</choice>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<complexType name="CompositeCurveType">
-		<complexContent>
-			<extension base="gml:AbstractCurveType">
-				<sequence>
-					<element ref="gml:curveMember" maxOccurs="unbounded"/>
-				</sequence>
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="CompositeCurve" type="gml:CompositeCurveType" substitutionGroup="gml:AbstractCurve">
-		<annotation>
-			<documentation>A gml:CompositeCurve is represented by a sequence of (orientable) curves such that each curve in the sequence terminates at the start point of the subsequent curve in the list. 
-curveMember references or contains inline one curve in the composite curve. 
-The curves are contiguous, the collection of curves is ordered. Therefore, if provided, the aggregationType attribute shall have the value "sequence".</documentation>
-		</annotation>
-	</element>
-	<complexType name="CompositeSurfaceType">
-		<complexContent>
-			<extension base="gml:AbstractSurfaceType">
-				<sequence>
-					<element ref="gml:surfaceMember" maxOccurs="unbounded"/>
-				</sequence>
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="CompositeSurface" type="gml:CompositeSurfaceType" substitutionGroup="gml:AbstractSurface">
-		<annotation>
-			<documentation>A gml:CompositeSurface is represented by a set of orientable surfaces. It is geometry type with all the geometric properties of a (primitive) surface. Essentially, a composite surface is a collection of surfaces that join in pairs on common boundary curves and which, when considered as a whole, form a single surface.
-surfaceMember references or contains inline one surface in the composite surface. 
-The surfaces are contiguous.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CompositeSolidType">
-		<complexContent>
-			<extension base="gml:AbstractSolidType">
-				<sequence>
-					<element ref="gml:solidMember" maxOccurs="unbounded"/>
-				</sequence>
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="CompositeSolid" type="gml:CompositeSolidType" substitutionGroup="gml:AbstractSolid">
-		<annotation>
-			<documentation>gml:CompositeSolid implements ISO 19107 GM_CompositeSolid (see ISO 19107:2003, 6.6.7) as specified in D.2.3.6. 
-A gml:CompositeSolid is represented by a set of orientable surfaces. It is a geometry type with all the geometric properties of a (primitive) solid. Essentially, a composite solid is a collection of solids that join in pairs on common boundary surfaces and which, when considered as a whole, form a single solid. 
-solidMember references or contains one solid in the composite solid. The solids are contiguous.</documentation>
-		</annotation>
-	</element>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/geometryPrimitives.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/geometryPrimitives.xsd
deleted file mode 100644
index 081ccc165..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/geometryPrimitives.xsd
+++ /dev/null
@@ -1,845 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" elementFormDefault="qualified" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:geometryPrimitives:3.2.1">geometryPrimitives.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 Clause 11.
-Beside the "simple" geometric primitives specified in the previous Clause, this Clause specifies additional primitives to describe real world situations which require a more expressive geometry model.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="geometryBasic2d.xsd"/>
-	<complexType name="CurveType">
-		<complexContent>
-			<extension base="gml:AbstractCurveType">
-				<sequence>
-					<element ref="gml:segments"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Curve" type="gml:CurveType" substitutionGroup="gml:AbstractCurve">
-		<annotation>
-			<documentation>A curve is a 1-dimensional primitive. Curves are continuous, connected, and have a measurable length in terms of the coordinate system. 
-A curve is composed of one or more curve segments. Each curve segment within a curve may be defined using a different interpolation method. The curve segments are connected to one another, with the end point of each segment except the last being the start point of the next segment in the segment list.
-The orientation of the curve is positive.
-The element segments encapsulates the segments of the curve.</documentation>
-		</annotation>
-	</element>
-	<complexType name="OrientableCurveType">
-		<complexContent>
-			<extension base="gml:AbstractCurveType">
-				<sequence>
-					<element ref="gml:baseCurve"/>
-				</sequence>
-				<attribute name="orientation" type="gml:SignType" default="+"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="baseCurve" type="gml:CurvePropertyType">
-		<annotation>
-			<documentation>The property baseCurve references or contains the base curve, i.e. it either references the base curve via the XLink-attributes or contains the curve element. A curve element is any element which is substitutable for AbstractCurve. The base curve has positive orientation.</documentation>
-		</annotation>
-	</element>
-	<element name="OrientableCurve" type="gml:OrientableCurveType" substitutionGroup="gml:AbstractCurve">
-		<annotation>
-			<documentation>OrientableCurve consists of a curve and an orientation. If the orientation is "+", then the OrientableCurve is identical to the baseCurve. If the orientation is "-", then the OrientableCurve is related to another AbstractCurve with a parameterization that reverses the sense of the curve traversal.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractCurveSegmentType" abstract="true">
-		<attribute name="numDerivativesAtStart" type="integer" default="0"/>
-		<attribute name="numDerivativesAtEnd" type="integer" default="0"/>
-		<attribute name="numDerivativeInterior" type="integer" default="0"/>
-	</complexType>
-	<element name="AbstractCurveSegment" type="gml:AbstractCurveSegmentType" abstract="true" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>A curve segment defines a homogeneous segment of a curve.
-The attributes numDerivativesAtStart, numDerivativesAtEnd and numDerivativesInterior specify the type of continuity as specified in ISO 19107:2003, 6.4.9.3.
-The AbstractCurveSegment element is the abstract head of the substituition group for all curve segment elements, i.e. continuous segments of the same interpolation mechanism.
-All curve segments shall have an attribute interpolation with type gml:CurveInterpolationType specifying the curve interpolation mechanism used for this segment. This mechanism uses the control points and control parameters to determine the position of this curve segment.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CurveSegmentArrayPropertyType">
-		<annotation>
-			<documentation>gml:CurveSegmentArrayPropertyType is a container for an array of curve segments.</documentation>
-		</annotation>
-		<sequence minOccurs="0" maxOccurs="unbounded">
-			<element ref="gml:AbstractCurveSegment"/>
-		</sequence>
-	</complexType>
-	<element name="segments" type="gml:CurveSegmentArrayPropertyType">
-		<annotation>
-			<documentation>This property element contains a list of curve segments. The order of the elements is significant and shall be preserved when processing the array.</documentation>
-		</annotation>
-	</element>
-	<simpleType name="CurveInterpolationType">
-		<annotation>
-			<documentation>gml:CurveInterpolationType is a list of codes that may be used to identify the interpolation mechanisms specified by an application schema.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="linear"/>
-			<enumeration value="geodesic"/>
-			<enumeration value="circularArc3Points"/>
-			<enumeration value="circularArc2PointWithBulge"/>
-			<enumeration value="circularArcCenterPointWithRadius"/>
-			<enumeration value="elliptical"/>
-			<enumeration value="clothoid"/>
-			<enumeration value="conic"/>
-			<enumeration value="polynomialSpline"/>
-			<enumeration value="cubicSpline"/>
-			<enumeration value="rationalSpline"/>
-		</restriction>
-	</simpleType>
-	<complexType name="LineStringSegmentType">
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<choice>
-						<choice minOccurs="2" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-				</sequence>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="linear"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="LineStringSegment" type="gml:LineStringSegmentType" substitutionGroup="gml:AbstractCurveSegment">
-		<annotation>
-			<documentation>A LineStringSegment is a curve segment that is defined by two or more control points including the start and end point, with linear interpolation between them.
-The content model follows the general pattern for the encoding of curve segments.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ArcStringType">
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<choice>
-						<choice minOccurs="3" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-				</sequence>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="circularArc3Points"/>
-				<attribute name="numArc" type="integer"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="ArcString" type="gml:ArcStringType" substitutionGroup="gml:AbstractCurveSegment">
-		<annotation>
-			<documentation>An ArcString is a curve segment that uses three-point circular arc interpolation ("circularArc3Points"). The number of arcs in the arc string may be explicitly stated in the attribute numArc. The number of control points in the arc string shall be 2 * numArc + 1.
-The content model follows the general pattern for the encoding of curve segments.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ArcType">
-		<complexContent>
-			<restriction base="gml:ArcStringType">
-				<sequence>
-					<choice>
-						<choice minOccurs="3" maxOccurs="3">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-				</sequence>
-				<attribute name="numArc" type="integer" fixed="1"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<element name="Arc" type="gml:ArcType" substitutionGroup="gml:ArcString">
-		<annotation>
-			<documentation>An Arc is an arc string with only one arc unit, i.e. three control points including the start and end point. As arc is an arc string consisting of a single arc, the attribute "numArc" is fixed to "1".</documentation>
-		</annotation>
-	</element>
-	<complexType name="CircleType">
-		<complexContent>
-			<extension base="gml:ArcType"/>
-		</complexContent>
-	</complexType>
-	<element name="Circle" type="gml:CircleType" substitutionGroup="gml:Arc">
-		<annotation>
-			<documentation>A Circle is an arc whose ends coincide to form a simple closed loop. The three control points shall be distinct non-co-linear points for the circle to be unambiguously defined. The arc is simply extended past the third control point until the first control point is encountered.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ArcStringByBulgeType">
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<choice>
-						<choice minOccurs="2" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-					<element name="bulge" type="double" maxOccurs="unbounded"/>
-					<element name="normal" type="gml:VectorType" maxOccurs="unbounded"/>
-				</sequence>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="circularArc2PointWithBulge"/>
-				<attribute name="numArc" type="integer"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="ArcStringByBulge" type="gml:ArcStringByBulgeType" substitutionGroup="gml:AbstractCurveSegment">
-		<annotation>
-			<documentation>This variant of the arc computes the mid points of the arcs instead of storing the coordinates directly. The control point sequence consists of the start and end points of each arc plus the bulge (see ISO 19107:2003, 6.4.17.2). The normal is a vector normal (perpendicular) to the chord of the arc (see ISO 19107:2003, 6.4.17.4).
-The interpolation is fixed as "circularArc2PointWithBulge".
-The number of arcs in the arc string may be explicitly stated in the attribute numArc. The number of control points in the arc string shall be numArc + 1.
-The content model follows the general pattern for the encoding of curve segments.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ArcByBulgeType">
-		<complexContent>
-			<restriction base="gml:ArcStringByBulgeType">
-				<sequence>
-					<choice>
-						<choice minOccurs="2" maxOccurs="2">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-					<element name="bulge" type="double"/>
-					<element name="normal" type="gml:VectorType"/>
-				</sequence>
-				<attribute name="numArc" type="integer" fixed="1"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<element name="ArcByBulge" type="gml:ArcByBulgeType" substitutionGroup="gml:ArcStringByBulge">
-		<annotation>
-			<documentation>An ArcByBulge is an arc string with only one arc unit, i.e. two control points, one bulge and one normal vector.
-As arc is an arc string consisting of a single arc, the attribute "numArc" is fixed to "1".</documentation>
-		</annotation>
-	</element>
-	<complexType name="ArcByCenterPointType">
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<choice>
-						<choice>
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-					<element name="radius" type="gml:LengthType"/>
-					<element name="startAngle" type="gml:AngleType" minOccurs="0"/>
-					<element name="endAngle" type="gml:AngleType" minOccurs="0"/>
-				</sequence>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="circularArcCenterPointWithRadius"/>
-				<attribute name="numArc" type="integer" use="required" fixed="1"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="ArcByCenterPoint" type="gml:ArcByCenterPointType" substitutionGroup="gml:AbstractCurveSegment">
-		<annotation>
-			<documentation>This variant of the arc requires that the points on the arc shall be computed instead of storing the coordinates directly. The single control point is the center point of the arc plus the radius and the bearing at start and end. This representation can be used only in 2D.
-The element radius specifies the radius of the arc.
-The element startAngle specifies the bearing of the arc at the start.
-The element endAngle specifies the bearing of the arc at the end.
-The interpolation is fixed as "circularArcCenterPointWithRadius".
-Since this type describes always a single arc, the attribute "numArc" is fixed to "1".
-The content model follows the general pattern for the encoding of curve segments.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CircleByCenterPointType">
-		<complexContent>
-			<restriction base="gml:ArcByCenterPointType">
-				<sequence>
-					<choice>
-						<choice>
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-					<element name="radius" type="gml:LengthType"/>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<element name="CircleByCenterPoint" type="gml:CircleByCenterPointType" substitutionGroup="gml:ArcByCenterPoint">
-		<annotation>
-			<documentation>A gml:CircleByCenterPoint is an gml:ArcByCenterPoint with identical start and end angle to form a full circle. Again, this representation can be used only in 2D.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CubicSplineType">
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<choice>
-						<choice minOccurs="2" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-					<element name="vectorAtStart" type="gml:VectorType"/>
-					<element name="vectorAtEnd" type="gml:VectorType"/>
-				</sequence>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="cubicSpline"/>
-				<attribute name="degree" type="integer" fixed="3"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="CubicSpline" type="gml:CubicSplineType" substitutionGroup="gml:AbstractCurveSegment">
-		<annotation>
-			<documentation>The number of control points shall be at least three.
-vectorAtStart is the unit tangent vector at the start point of the spline. vectorAtEnd is the unit tangent vector at the end point of the spline. Only the direction of the vectors shall be used to determine the shape of the cubic spline, not their length.
-interpolation is fixed as "cubicSpline".
-degree shall be the degree of the polynomial used for the interpolation in this spline. Therefore the degree for a cubic spline is fixed to "3".
-The content model follows the general pattern for the encoding of curve segments.</documentation>
-		</annotation>
-	</element>
-	<complexType name="BSplineType">
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<choice>
-						<choice minOccurs="0" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-					<element name="degree" type="nonNegativeInteger"/>
-					<element name="knot" type="gml:KnotPropertyType" minOccurs="2" maxOccurs="unbounded"/>
-				</sequence>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" default="polynomialSpline"/>
-				<attribute name="isPolynomial" type="boolean"/>
-				<attribute name="knotType" type="gml:KnotTypesType"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="BSpline" type="gml:BSplineType" substitutionGroup="gml:AbstractCurveSegment">
-		<annotation>
-			<documentation>A B-Spline is a piecewise parametric polynomial or rational curve described in terms of control points and basis functions as specified in ISO 19107:2003, 6.4.30. Therefore, interpolation may be either "polynomialSpline" or "rationalSpline" depending on the interpolation type; default is "polynomialSpline".
-degree shall be the degree of the polynomial used for interpolation in this spline.
-knot shall be the sequence of distinct knots used to define the spline basis functions (see ISO 19107:2003, 6.4.26.2).
-The attribute isPolynomial shall be set to "true" if this is a polynomial spline (see ISO 19107:2003, 6.4.30.5).
-The attribute knotType shall provide the type of knot distribution used in defining this spline (see ISO 19107:2003, 6.4.30.4).
-The content model follows the general pattern for the encoding of curve segments.</documentation>
-		</annotation>
-	</element>
-	<complexType name="KnotType">
-		<sequence>
-			<element name="value" type="double"/>
-			<element name="multiplicity" type="nonNegativeInteger"/>
-			<element name="weight" type="double"/>
-		</sequence>
-	</complexType>
-	<complexType name="KnotPropertyType">
-		<annotation>
-			<documentation>gml:KnotPropertyType encapsulates a knot to use it in a geometric type.</documentation>
-		</annotation>
-		<sequence>
-			<element name="Knot" type="gml:KnotType">
-				<annotation>
-					<documentation>A knot is a breakpoint on a piecewise spline curve.
-value is the value of the parameter at the knot of the spline (see ISO 19107:2003, 6.4.24.2).
-multiplicity is the multiplicity of this knot used in the definition of the spline (with the same weight).
-weight is the value of the averaging weight used for this knot of the spline.</documentation>
-				</annotation>
-			</element>
-		</sequence>
-	</complexType>
-	<simpleType name="KnotTypesType">
-		<annotation>
-			<documentation>This enumeration type specifies values for the knots' type (see ISO 19107:2003, 6.4.25).</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="uniform"/>
-			<enumeration value="quasiUniform"/>
-			<enumeration value="piecewiseBezier"/>
-		</restriction>
-	</simpleType>
-	<complexType name="BezierType">
-		<complexContent>
-			<restriction base="gml:BSplineType">
-				<sequence>
-					<choice>
-						<choice minOccurs="0" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-					<element name="degree" type="nonNegativeInteger"/>
-					<element name="knot" type="gml:KnotPropertyType" minOccurs="2" maxOccurs="2"/>
-				</sequence>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="polynomialSpline"/>
-				<attribute name="isPolynomial" type="boolean" fixed="true"/>
-				<attribute name="knotType" type="gml:KnotTypesType" use="prohibited"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<element name="Bezier" type="gml:BezierType" substitutionGroup="gml:BSpline">
-		<annotation>
-			<documentation>Bezier curves are polynomial splines that use Bezier or Bernstein polynomials for interpolation purposes. It is a special case of the B-Spline curve with two knots.
-degree shall be the degree of the polynomial used for interpolation in this spline.
-knot shall be the sequence of distinct knots used to define the spline basis functions.
-interpolation is fixed as "polynomialSpline".
-isPolynomial is fixed as "true".
-knotType is not relevant for Bezier curve segments.
-</documentation>
-		</annotation>
-	</element>
-	<complexType name="OffsetCurveType">
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<element name="offsetBase" type="gml:CurvePropertyType"/>
-					<element name="distance" type="gml:LengthType"/>
-					<element name="refDirection" type="gml:VectorType" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="OffsetCurve" type="gml:OffsetCurveType" substitutionGroup="gml:AbstractCurveSegment">
-		<annotation>
-			<documentation>An offset curve is a curve at a constant distance from the basis curve. offsetBase is the base curve from which this curve is defined as an offset. distance and refDirection have the same meaning as specified in ISO 19107:2003, 6.4.23.
-The content model follows the general pattern for the encoding of curve segments.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AffinePlacementType">
-		<sequence>
-			<element name="location" type="gml:DirectPositionType"/>
-			<element name="refDirection" type="gml:VectorType" maxOccurs="unbounded"/>
-			<element name="inDimension" type="positiveInteger"/>
-			<element name="outDimension" type="positiveInteger"/>
-		</sequence>
-	</complexType>
-	<element name="AffinePlacement" type="gml:AffinePlacementType" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>location, refDirection, inDimension and outDimension have the same meaning as specified in ISO 19107:2003, 6.4.21.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ClothoidType">
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<element name="refLocation">
-						<complexType>
-							<sequence>
-								<element ref="gml:AffinePlacement"/>
-							</sequence>
-						</complexType>
-					</element>
-					<element name="scaleFactor" type="decimal"/>
-					<element name="startParameter" type="double"/>
-					<element name="endParameter" type="double"/>
-				</sequence>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="clothoid"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Clothoid" type="gml:ClothoidType" substitutionGroup="gml:AbstractCurveSegment">
-		<annotation>
-			<documentation>A clothoid, or Cornu's spiral, is plane curve whose curvature is a fixed function of its length.
-refLocation, startParameter, endParameter and scaleFactor have the same meaning as specified in ISO 19107:2003, 6.4.22.
-interpolation is fixed as "clothoid".
-The content model follows the general pattern for the encoding of curve segments.</documentation>
-		</annotation>
-	</element>
-	<complexType name="GeodesicStringType">
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<choice>
-					<element ref="gml:posList"/>
-					<group ref="gml:geometricPositionGroup" minOccurs="2" maxOccurs="unbounded"/>
-				</choice>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="geodesic"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="GeodesicString" type="gml:GeodesicStringType" substitutionGroup="gml:AbstractCurveSegment">
-		<annotation>
-			<documentation>A sequence of geodesic segments. 
-The number of control points shall be at least two.
-interpolation is fixed as "geodesic".
-The content model follows the general pattern for the encoding of curve segments.</documentation>
-		</annotation>
-	</element>
-	<complexType name="GeodesicType">
-		<complexContent>
-			<extension base="gml:GeodesicStringType"/>
-		</complexContent>
-	</complexType>
-	<element name="Geodesic" type="gml:GeodesicType" substitutionGroup="gml:GeodesicString"/>
-	<complexType name="SurfaceType">
-		<complexContent>
-			<extension base="gml:AbstractSurfaceType">
-				<sequence>
-					<element ref="gml:patches"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Surface" type="gml:SurfaceType" substitutionGroup="gml:AbstractSurface">
-		<annotation>
-			<documentation>A Surface is a 2-dimensional primitive and is composed of one or more surface patches as specified in ISO 19107:2003, 6.3.17.1. The surface patches are connected to one another.
-patches encapsulates the patches of the surface.</documentation>
-		</annotation>
-	</element>
-	<complexType name="OrientableSurfaceType">
-		<complexContent>
-			<extension base="gml:AbstractSurfaceType">
-				<sequence>
-					<element ref="gml:baseSurface"/>
-				</sequence>
-				<attribute name="orientation" type="gml:SignType" default="+"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="baseSurface" type="gml:SurfacePropertyType">
-		<annotation>
-			<documentation>The property baseSurface references or contains the base surface. The property baseSurface either references the base surface via the XLink-attributes or contains the surface element. A surface element is any element which is substitutable for gml:AbstractSurface. The base surface has positive orientation.</documentation>
-		</annotation>
-	</element>
-	<element name="OrientableSurface" type="gml:OrientableSurfaceType" substitutionGroup="gml:AbstractSurface">
-		<annotation>
-			<documentation>OrientableSurface consists of a surface and an orientation. If the orientation is "+", then the OrientableSurface is identical to the baseSurface. If the orientation is "-", then the OrientableSurface is a reference to a gml:AbstractSurface with an up-normal that reverses the direction for this OrientableSurface, the sense of "the top of the surface".</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractSurfacePatchType" abstract="true"/>
-	<element name="AbstractSurfacePatch" type="gml:AbstractSurfacePatchType" abstract="true">
-		<annotation>
-			<documentation>A surface patch defines a homogenuous portion of a surface. 
-The AbstractSurfacePatch element is the abstract head of the substituition group for all surface patch elements describing a continuous portion of a surface.
-All surface patches shall have an attribute interpolation (declared in the types derived from gml:AbstractSurfacePatchType) specifying the interpolation mechanism used for the patch using gml:SurfaceInterpolationType.</documentation>
-		</annotation>
-	</element>
-	<complexType name="SurfacePatchArrayPropertyType">
-		<annotation>
-			<documentation>gml:SurfacePatchArrayPropertyType is a container for a sequence of surface patches.</documentation>
-		</annotation>
-		<sequence minOccurs="0" maxOccurs="unbounded">
-			<element ref="gml:AbstractSurfacePatch"/>
-		</sequence>
-	</complexType>
-	<element name="patches" type="gml:SurfacePatchArrayPropertyType">
-		<annotation>
-			<documentation>The patches property element contains the sequence of surface patches. The order of the elements is significant and shall be preserved when processing the array.</documentation>
-		</annotation>
-	</element>
-	<simpleType name="SurfaceInterpolationType">
-		<annotation>
-			<documentation>gml:SurfaceInterpolationType is a list of codes that may be used to identify the interpolation mechanisms specified by an application schema.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="none"/>
-			<enumeration value="planar"/>
-			<enumeration value="spherical"/>
-			<enumeration value="elliptical"/>
-			<enumeration value="conic"/>
-			<enumeration value="tin"/>
-			<enumeration value="parametricCurve"/>
-			<enumeration value="polynomialSpline"/>
-			<enumeration value="rationalSpline"/>
-			<enumeration value="triangulatedSpline"/>
-		</restriction>
-	</simpleType>
-	<complexType name="PolygonPatchType">
-		<complexContent>
-			<extension base="gml:AbstractSurfacePatchType">
-				<sequence>
-					<element ref="gml:exterior" minOccurs="0"/>
-					<element ref="gml:interior" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-				<attribute name="interpolation" type="gml:SurfaceInterpolationType" fixed="planar"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="PolygonPatch" type="gml:PolygonPatchType" substitutionGroup="gml:AbstractSurfacePatch">
-		<annotation>
-			<documentation>A gml:PolygonPatch is a surface patch that is defined by a set of boundary curves and an underlying surface to which these curves adhere. The curves shall be coplanar and the polygon uses planar interpolation in its interior. 
-interpolation is fixed to "planar", i.e. an interpolation shall return points on a single plane. The boundary of the patch shall be contained within that plane.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TriangleType">
-		<complexContent>
-			<extension base="gml:AbstractSurfacePatchType">
-				<sequence>
-					<element ref="gml:exterior"/>
-				</sequence>
-				<attribute name="interpolation" type="gml:SurfaceInterpolationType" fixed="planar"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Triangle" type="gml:TriangleType" substitutionGroup="gml:AbstractSurfacePatch">
-		<annotation>
-			<documentation>gml:Triangle represents a triangle as a surface patch with an outer boundary consisting of a linear ring. Note that this is a polygon (subtype) with no inner boundaries. The number of points in the linear ring shall be four.
-The ring (element exterior) shall be a gml:LinearRing and shall form a triangle, the first and the last position shall be coincident.
-interpolation is fixed to "planar", i.e. an interpolation shall return points on a single plane. The boundary of the patch shall be contained within that plane.</documentation>
-		</annotation>
-	</element>
-	<complexType name="RectangleType">
-		<complexContent>
-			<extension base="gml:AbstractSurfacePatchType">
-				<sequence>
-					<element ref="gml:exterior"/>
-				</sequence>
-				<attribute name="interpolation" type="gml:SurfaceInterpolationType" fixed="planar"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Rectangle" type="gml:RectangleType" substitutionGroup="gml:AbstractSurfacePatch">
-		<annotation>
-			<documentation>gml:Rectangle represents a rectangle as a surface patch with an outer boundary consisting of a linear ring. Note that this is a polygon (subtype) with no inner boundaries. The number of points in the linear ring shall be five.
-The ring (element exterior) shall be a gml:LinearRing and shall form a rectangle; the first and the last position shall be coincident.
-interpolation is fixed to "planar", i.e. an interpolation shall return points on a single plane. The boundary of the patch shall be contained within that plane.</documentation>
-		</annotation>
-	</element>
-	<complexType name="RingType">
-		<complexContent>
-			<extension base="gml:AbstractRingType">
-				<sequence>
-					<element ref="gml:curveMember" maxOccurs="unbounded"/>
-				</sequence>
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Ring" type="gml:RingType" substitutionGroup="gml:AbstractRing">
-		<annotation>
-			<documentation>A ring is used to represent a single connected component of a surface boundary as specified in ISO 19107:2003, 6.3.6.
-Every gml:curveMember references or contains one curve, i.e. any element which is substitutable for gml:AbstractCurve. In the context of a ring, the curves describe the boundary of the surface. The sequence of curves shall be contiguous and connected in a cycle.
-If provided, the aggregationType attribute shall have the value "sequence".</documentation>
-		</annotation>
-	</element>
-	<element name="curveMember" type="gml:CurvePropertyType"/>
-	<complexType name="RingPropertyType">
-		<annotation>
-			<documentation>A property with the content model of gml:RingPropertyType encapsulates a ring to represent a component of a surface boundary.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:Ring"/>
-		</sequence>
-	</complexType>
-	<group name="PointGrid">
-		<annotation>
-			<documentation>A gml:PointGrid group contains or references points or positions which are organised into sequences or grids. All rows shall have the same number of positions (columns).</documentation>
-		</annotation>
-		<sequence>
-			<element name="rows">
-				<complexType>
-					<sequence>
-						<element name="Row" maxOccurs="unbounded">
-							<complexType>
-								<group ref="gml:geometricPositionListGroup"/>
-							</complexType>
-						</element>
-					</sequence>
-				</complexType>
-			</element>
-		</sequence>
-	</group>
-	<complexType name="AbstractParametricCurveSurfaceType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractSurfacePatchType">
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="AbstractParametricCurveSurface" type="gml:AbstractParametricCurveSurfaceType" abstract="true" substitutionGroup="gml:AbstractSurfacePatch">
-		<annotation>
-			<documentation>The element provides a substitution group head for the surface patches based on parametric curves. All properties are specified in the derived subtypes. All derived subtypes shall conform to the constraints specified in ISO 19107:2003, 6.4.40.
-If provided, the aggregationType attribute shall have the value "set".</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractGriddedSurfaceType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractParametricCurveSurfaceType">
-				<sequence>
-					<group ref="gml:PointGrid"/>
-				</sequence>
-				<attribute name="rows" type="integer"/>
-				<attribute name="columns" type="integer"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="AbstractGriddedSurface" type="gml:AbstractGriddedSurfaceType" abstract="true" substitutionGroup="gml:AbstractParametricCurveSurface">
-		<annotation>
-			<documentation>if provided, rows gives the number of rows, columns the number of columns in the parameter grid. The parameter grid is represented by an instance of the gml:PointGrid group.
-The element provides a substitution group head for the surface patches based on a grid. All derived subtypes shall conform to the constraints specified in ISO 19107:2003, 6.4.41.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ConeType">
-		<complexContent>
-			<extension base="gml:AbstractGriddedSurfaceType">
-				<attribute name="horizontalCurveType" type="gml:CurveInterpolationType" fixed="circularArc3Points"/>
-				<attribute name="verticalCurveType" type="gml:CurveInterpolationType" fixed="linear"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Cone" type="gml:ConeType" substitutionGroup="gml:AbstractGriddedSurface"/>
-	<complexType name="CylinderType">
-		<complexContent>
-			<extension base="gml:AbstractGriddedSurfaceType">
-				<attribute name="horizontalCurveType" type="gml:CurveInterpolationType" fixed="circularArc3Points"/>
-				<attribute name="verticalCurveType" type="gml:CurveInterpolationType" fixed="linear"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Cylinder" type="gml:CylinderType" substitutionGroup="gml:AbstractGriddedSurface"/>
-	<complexType name="SphereType">
-		<complexContent>
-			<extension base="gml:AbstractGriddedSurfaceType">
-				<attribute name="horizontalCurveType" type="gml:CurveInterpolationType" fixed="circularArc3Points"/>
-				<attribute name="verticalCurveType" type="gml:CurveInterpolationType" fixed="circularArc3Points"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Sphere" type="gml:SphereType" substitutionGroup="gml:AbstractGriddedSurface"/>
-	<element name="PolyhedralSurface" type="gml:SurfaceType" substitutionGroup="gml:Surface">
-		<annotation>
-			<documentation>A polyhedral surface is a surface composed of polygon patches connected along their common boundary curves. This differs from the surface type only in the restriction on the types of surface patches acceptable.
-polygonPatches encapsulates the polygon patches of the polyhedral surface.</documentation>
-		</annotation>
-	</element>
-	<element name="TriangulatedSurface" type="gml:SurfaceType" substitutionGroup="gml:Surface">
-		<annotation>
-			<documentation>A triangulated surface is a polyhedral surface that is composed only of triangles. There is no restriction on how the triangulation is derived.
-trianglePatches encapsulates the triangles of the triangulated surface.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TinType">
-		<complexContent>
-			<extension base="gml:SurfaceType">
-				<sequence>
-					<element name="stopLines" type="gml:LineStringSegmentArrayPropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<element name="breakLines" type="gml:LineStringSegmentArrayPropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<element name="maxLength" type="gml:LengthType"/>
-					<element name="controlPoint">
-						<complexType>
-							<choice>
-								<element ref="gml:posList"/>
-								<group ref="gml:geometricPositionGroup" minOccurs="3" maxOccurs="unbounded"/>
-							</choice>
-						</complexType>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Tin" type="gml:TinType" substitutionGroup="gml:TriangulatedSurface">
-		<annotation>
-			<documentation>A tin is a triangulated surface that uses the Delauny algorithm or a similar algorithm complemented with consideration of stoplines (stopLines), breaklines (breakLines), and maximum length of triangle sides (maxLength). controlPoint shall contain a set of the positions (three or more) used as posts for this TIN (corners of the triangles in the TIN). See ISO 19107:2003, 6.4.39 for details.</documentation>
-		</annotation>
-	</element>
-	<complexType name="LineStringSegmentArrayPropertyType">
-		<annotation>
-			<documentation>gml:LineStringSegmentArrayPropertyType provides a container for line strings.</documentation>
-		</annotation>
-		<sequence minOccurs="0" maxOccurs="unbounded">
-			<element ref="gml:LineStringSegment"/>
-		</sequence>
-	</complexType>
-	<complexType name="AbstractSolidType">
-		<annotation>
-			<documentation>gml:AbstractSolidType is an abstraction of a solid to support the different levels of complexity. The solid may always be viewed as a geometric primitive, i.e. is contiguous.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometricPrimitiveType"/>
-		</complexContent>
-	</complexType>
-	<element name="AbstractSolid" type="gml:AbstractSolidType" abstract="true" substitutionGroup="gml:AbstractGeometricPrimitive">
-		<annotation>
-			<documentation>The AbstractSolid element is the abstract head of the substituition group for all (continuous) solid elements.</documentation>
-		</annotation>
-	</element>
-	<complexType name="SolidPropertyType">
-		<annotation>
-			<documentation>A property that has a solid as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractSolid"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="solidProperty" type="gml:SolidPropertyType">
-		<annotation>
-			<documentation>This property element either references a solid via the XLink-attributes or contains the solid element. solidProperty is the predefined property which may be used by GML Application Schemas whenever a GML feature has a property with a value that is substitutable for AbstractSolid.</documentation>
-		</annotation>
-	</element>
-	<complexType name="SolidArrayPropertyType">
-		<annotation>
-			<documentation>gml:SolidArrayPropertyType is a container for an array of solids. The elements are always contained in the array property, referencing geometry elements or arrays of geometry elements is not supported.</documentation>
-		</annotation>
-		<sequence minOccurs="0" maxOccurs="unbounded">
-			<element ref="gml:AbstractSolid"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<complexType name="SolidType">
-		<complexContent>
-			<extension base="gml:AbstractSolidType">
-				<sequence>
-					<element name="exterior" type="gml:ShellPropertyType" minOccurs="0"/>
-					<element name="interior" type="gml:ShellPropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Solid" type="gml:SolidType" substitutionGroup="gml:AbstractSolid">
-		<annotation>
-			<documentation>A solid is the basis for 3-dimensional geometry. The extent of a solid is defined by the boundary surfaces as specified in ISO 19107:2003, 6.3.18. exterior specifies the outer boundary, interior the inner boundary of the solid.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ShellType">
-		<sequence>
-			<element ref="gml:surfaceMember" maxOccurs="unbounded"/>
-		</sequence>
-		<attributeGroup ref="gml:AggregationAttributeGroup"/>
-	</complexType>
-	<element name="Shell" type="gml:ShellType" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>A shell is used to represent a single connected component of a solid boundary as specified in ISO 19107:2003, 6.3.8.
-Every gml:surfaceMember references or contains one surface, i.e. any element which is substitutable for gml:AbstractSurface. In the context of a shell, the surfaces describe the boundary of the solid. 
-If provided, the aggregationType attribute shall have the value "set".
-</documentation>
-		</annotation>
-	</element>
-	<element name="surfaceMember" type="gml:SurfacePropertyType">
-		<annotation>
-			<documentation>This property element either references a surface via the XLink-attributes or contains the surface element. A surface element is any element, which is substitutable for gml:AbstractSurface.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ShellPropertyType">
-		<annotation>
-			<documentation>A property with the content model of gml:ShellPropertyType encapsulates a shell to represent a component of a solid boundary.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:Shell"/>
-		</sequence>
-	</complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/gml.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/gml.xsd
deleted file mode 100644
index b302f7da1..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/gml.xsd
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:gml:3.2.1">gml.xsd</appinfo>
-		<documentation>
-			GML is an OGC Standard.
-			Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ====================================================================== -->
-	<include schemaLocation="dynamicFeature.xsd"/>
-	<include schemaLocation="topology.xsd"/>
-	<include schemaLocation="coverage.xsd"/>
-	<include schemaLocation="coordinateReferenceSystems.xsd"/>
-	<include schemaLocation="observation.xsd"/>
-	<include schemaLocation="temporalReferenceSystems.xsd"/>
-	<include schemaLocation="deprecatedTypes.xsd"/>
-	<!-- ====================================================================== -->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/gmlBase.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/gmlBase.xsd
deleted file mode 100644
index 837ebb0ea..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/gmlBase.xsd
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:gmlBase:3.2.1">gmlBase.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 7.2.
-The gmlBase schema components establish the GML model and syntax, in particular
--	a root XML type from which XML types for all GML objects should be derived,
--	a pattern and components for GML properties,
--	patterns for collections and arrays, and components for generic collections and arrays,
--	components for associating metadata with GML objects,
--	components for constructing definitions and dictionaries.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="basicTypes.xsd"/>
-	<import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://schemas.opengis.net/xlink/1.0.0/xlinks.xsd"/>
-	<element name="AbstractObject" abstract="true">
-		<annotation>
-			<documentation>This element has no type defined, and is therefore implicitly (according to the rules of W3C XML Schema) an XML Schema anyType. It is used as the head of an XML Schema substitution group which unifies complex content and certain simple content elements used for datatypes in GML, including the gml:AbstractGML substitution group.</documentation>
-		</annotation>
-	</element>
-	<element name="AbstractGML" type="gml:AbstractGMLType" abstract="true" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>The abstract element gml:AbstractGML is "any GML object having identity".   It acts as the head of an XML Schema substitution group, which may include any element which is a GML feature, or other object, with identity.  This is used as a variable in content models in GML core and application schemas.  It is effectively an abstract superclass for all GML objects.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractGMLType" abstract="true">
-		<sequence>
-			<group ref="gml:StandardObjectProperties"/>
-		</sequence>
-		<attribute ref="gml:id" use="required"/>
-	</complexType>
-	<group name="StandardObjectProperties">
-		<sequence>
-			<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-			<element ref="gml:description" minOccurs="0"/>
-			<element ref="gml:descriptionReference" minOccurs="0"/>
-			<element ref="gml:identifier" minOccurs="0"/>
-			<element ref="gml:name" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-	</group>
-	<attributeGroup name="AssociationAttributeGroup">
-		<annotation>
-			<documentation>XLink components are the standard method to support hypertext referencing in XML. An XML Schema attribute group, gml:AssociationAttributeGroup, is provided to support the use of Xlinks as the method for indicating the value of a property by reference in a uniform manner in GML.</documentation>
-		</annotation>
-		<attributeGroup ref="xlink:simpleLink"/>
-		<attribute name="nilReason" type="gml:NilReasonType"/>
-		<attribute ref="gml:remoteSchema">
-			<annotation>
-				<appinfo>deprecated</appinfo>
-			</annotation>
-		</attribute>
-	</attributeGroup>
-	<element name="abstractAssociationRole" type="gml:AssociationRoleType" abstract="true">
-		<annotation>
-			<documentation>Applying this pattern shall restrict the multiplicity of objects in a property element using this content model to exactly one. An instance of this type shall contain an element representing an object, or serve as a pointer to a remote object.
-Applying the pattern to define an application schema specific property type allows to restrict
--	the inline object to specified object types, 
--	the encoding to "by-reference only" (see 7.2.3.7),
--	the encoding to "inline only" (see 7.2.3.8).</documentation>
-		</annotation>
-	</element>
-	<complexType name="AssociationRoleType">
-		<sequence minOccurs="0">
-			<any namespace="##any"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<attributeGroup name="OwnershipAttributeGroup">
-		<annotation>
-			<documentation>Encoding a GML property inline vs. by-reference shall not imply anything about the "ownership" of the contained or referenced GML Object, i.e. the encoding style shall not imply any "deep-copy" or "deep-delete" semantics. To express ownership over the contained or referenced GML Object, the gml:OwnershipAttributeGroup attribute group may be added to object-valued property elements. If the attribute group is not part of the content model of such a property element, then the value may not be "owned".
-When the value of the owns attribute is "true", the existence of inline or referenced object(s) depends upon the existence of the parent object.</documentation>
-		</annotation>
-		<attribute name="owns" type="boolean" default="false"/>
-	</attributeGroup>
-	<element name="abstractStrictAssociationRole" type="gml:AssociationRoleType" abstract="true">
-		<annotation>
-			<documentation>This element shows how an element 
-	declaration may include a Schematron constraint to limit the property to act 
-	in either inline or by-reference mode, but not both.</documentation>
-		</annotation>
-	</element>
-	<element name="abstractReference" type="gml:ReferenceType" abstract="true">
-		<annotation>
-			<documentation>gml:abstractReference may be used as the head of a subtitution group of more specific elements providing a value by-reference.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ReferenceType">
-		<annotation>
-			<documentation>gml:ReferenceType is intended to be used in application schemas directly, if a property element shall use a "by-reference only" encoding.</documentation>
-		</annotation>
-		<sequence/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="abstractInlineProperty" type="gml:InlinePropertyType" abstract="true">
-		<annotation>
-			<documentation>gml:abstractInlineProperty may be used as the head of a subtitution group of more specific elements providing a value inline.</documentation>
-		</annotation>
-	</element>
-	<complexType name="InlinePropertyType">
-		<sequence>
-			<any namespace="##any"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="reversePropertyName" type="string">
-		<annotation>
-			<documentation>If the value of an object property is another object and that object contains also a property for the association between the two objects, then this name of the reverse property may be encoded in a gml:reversePropertyName element in an appinfo annotation of the property element to document the constraint between the two properties. The value of the element shall contain the qualified name of the property element.</documentation>
-		</annotation>
-	</element>
-	<element name="description" type="gml:StringOrRefType">
-		<annotation>
-			<documentation>The value of this property is a text description of the object. gml:description uses gml:StringOrRefType as its content model, so it may contain a simple text string content, or carry a reference to an external description. The use of gml:description to reference an external description has been deprecated and replaced by the gml:descriptionReference property.</documentation>
-		</annotation>
-	</element>
-	<element name="descriptionReference" type="gml:ReferenceType">
-		<annotation>
-			<documentation>The value of this property is a remote text description of the object. The xlink:href attribute of the gml:descriptionReference property references the external description.</documentation>
-		</annotation>
-	</element>
-	<element name="name" type="gml:CodeType">
-		<annotation>
-			<documentation>The gml:name property provides a label or identifier for the object, commonly a descriptive name. An object may have several names, typically assigned by different authorities. gml:name uses the gml:CodeType content model.  The authority for a name is indicated by the value of its (optional) codeSpace attribute.  The name may or may not be unique, as determined by the rules of the organization responsible for the codeSpace.  In common usage there will be one name per authority, so a processing application may select the name from its preferred codeSpace.</documentation>
-		</annotation>
-	</element>
-	<element name="identifier" type="gml:CodeWithAuthorityType">
-		<annotation>
-			<documentation>Often, a special identifier is assigned to an object by the maintaining authority with the intention that it is used in references to the object For such cases, the codeSpace shall be provided. That identifier is usually unique either globally or within an application domain. gml:identifier is a pre-defined property for such identifiers.</documentation>
-		</annotation>
-	</element>
-	<attribute name="id" type="ID">
-		<annotation>
-			<documentation>The attribute gml:id supports provision of a handle for the XML element representing a GML Object. Its use is mandatory for all GML objects. It is of XML type ID, so is constrained to be unique in the XML document within which it occurs.</documentation>
-		</annotation>
-	</attribute>
-	<complexType name="AbstractMemberType" abstract="true">
-		<annotation>
-			<documentation>To create a collection of GML Objects that are not all features, a property type shall be derived by extension from gml:AbstractMemberType.
-This abstract property type is intended to be used only in object types where software shall be able to identify that an instance of such an object type is to be interpreted as a collection of objects.
-By default, this abstract property type does not imply any ownership of the objects in the collection. The owns attribute of gml:OwnershipAttributeGroup may be used on a property element instance to assert ownership of an object in the collection. A collection shall not own an object already owned by another object.
-</documentation>
-		</annotation>
-		<sequence/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<attributeGroup name="AggregationAttributeGroup">
-		<annotation>
-			<documentation>A GML Object Collection is any GML Object with a property element in its content model whose content model is derived by extension from gml:AbstractMemberType.
-In addition, the complex type describing the content model of the GML Object Collection may also include a reference to the attribute group gml:AggregationAttributeGroup to provide additional information about the semantics of the object collection.  This information may be used by applications to group GML objects, and optionally to order and index them.
-The allowed values for the aggregationType attribute are defined by gml:AggregationType. See 8.4 of ISO/IEC 11404:1996 for the meaning of the values in the enumeration.</documentation>
-		</annotation>
-		<attribute name="aggregationType" type="gml:AggregationType"/>
-	</attributeGroup>
-	<simpleType name="AggregationType" final="#all">
-		<restriction base="string">
-			<enumeration value="set"/>
-			<enumeration value="bag"/>
-			<enumeration value="sequence"/>
-			<enumeration value="array"/>
-			<enumeration value="record"/>
-			<enumeration value="table"/>
-		</restriction>
-	</simpleType>
-	<complexType name="AbstractMetadataPropertyType" abstract="true">
-		<annotation>
-			<documentation>To associate metadata described by any XML Schema with a GML object, a property element shall be defined whose content model is derived by extension from gml:AbstractMetadataPropertyType. 
-The value of such a property shall be metadata. The content model of such a property type, i.e. the metadata application schema shall be specified by the GML Application Schema.
-By default, this abstract property type does not imply any ownership of the metadata. The owns attribute of gml:OwnershipAttributeGroup may be used on a metadata property element instance to assert ownership of the metadata. 
-If metadata following the conceptual model of ISO 19115 is to be encoded in a GML document, the corresponding Implementation Specification specified in ISO/TS 19139 shall be used to encode the metadata information.
-</documentation>
-		</annotation>
-		<sequence/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="targetElement" type="string"/>
-	<element name="associationName" type="string"/>
-	<element name="defaultCodeSpace" type="anyURI"/>
-	<element name="gmlProfileSchema" type="anyURI"/>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/gml_3_2_1-ReadMe.txt b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/gml_3_2_1-ReadMe.txt
deleted file mode 100644
index 5a3fec3c3..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/gml_3_2_1-ReadMe.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-OpenGIS(r) GML schema version 3.2.1 / ISO 19136 - ReadMe.txt
-
-The root document of the GML schema is file "gml.xsd"
-
-The schema has been validated with Xerces-J, Xerces C++ and XSV.
-
-GML 3.2.1 (ISO 19136)
-
-  * Published GML 3.2.1 schemas from OGC 07-036
-  * validated with oXygen 8.2 (xerces-J 2.9.0) - Kevin Stegemoller
-  * validated with Xerces-J, Xerces-C++ and XSV - Clemens Portele
-
--- 2007-09-06
-
-Changes made to these GML 3.2.1 / ISO 19136 schemas:
-  * added ReadMe.txt
-  * changed gmd.xsd references to "../../iso/19139/20070417/gmd/gmd.xsd"
-  * changed xlink references to be relative to /xlink/1.0.0/xlinks.xsd
-    available from http://schemas.opengis.net/xlink/1.0.0/xlinks.xsd .
-  * removed xlinks schema and directory
-
-Changes made to these ISO 19139 schemas by OGC:
-  * added ReadMe.txt
-  * changed ISO_19136 path to /gml/3.2.1/
-  * changed xlink references to be relative to /xlink/1.0.0/xlinks.xsd
-    available from http://schemas.opengis.net/xlink/1.0.0/xlinks.xsd .
-  * removed xlinks schema and directory
-
-OGC GML 3.2.1 / ISO 19136 schemas files will be published at:
-- http://schemas.opengis.net/gml/3.2.1/
-- http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19136_Schemas/
-
-Files in the folder "ISO/19139/20070417" are also published at
-- http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/
-
--- 2007-08-17
-
-The Open Geospatial Consortium, Inc. official schema repository is at
-  http://schemas.opengis.net/ .
-Policies, Procedures, Terms, and Conditions of OGC(r) are available
-  http://www.opengeospatial.org/ogc/policies/ .
-Additional rights of use are described at
-  http://www.opengeospatial.org/legal/ . 
-
-Copyright (c) 2007 Open Geospatial Consortium, Inc. All Rights Reserved.
-
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/grids.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/grids.xsd
deleted file mode 100644
index b8b0bdf29..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/grids.xsd
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:grids:3.2.1">grids.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 20.2.
-An implicit description of geometry is one in which the items of the geometry do not explicitly appear in the encoding.  Instead, a compact notation records a set of parameters, and a set of objects may be generated using a rule with these parameters.  This Clause provides grid geometries that are used in the description of gridded coverages and other applications.
-In GML two grid structures are defined, namely gml:Grid and gml:RectifiedGrid.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="geometryBasic0d1d.xsd"/>
-	<element name="Grid" type="gml:GridType" substitutionGroup="gml:AbstractImplicitGeometry">
-		<annotation>
-			<documentation>The gml:Grid implicitly defines an unrectified grid, which is a network composed of two or more sets of curves in which the members of each set intersect the members of the other sets in an algorithmic way.  The region of interest within the grid is given in terms of its gml:limits, being the grid coordinates of  diagonally opposed corners of a rectangular region.  gml:axisLabels is provided with a list of labels of the axes of the grid (gml:axisName has been deprecated). gml:dimension specifies the dimension of the grid.  
-The gml:limits element contains a single gml:GridEnvelope. The gml:low and gml:high property elements of the envelope are each integerLists, which are coordinate tuples, the coordinates being measured as offsets from the origin of the grid along each axis, of the diagonally opposing corners of a "rectangular" region of interest.</documentation>
-		</annotation>
-	</element>
-	<element name="AbstractImplicitGeometry" type="gml:AbstractGeometryType" abstract="true" substitutionGroup="gml:AbstractGeometry"/>
-	<complexType name="GridType">
-		<complexContent>
-			<extension base="gml:AbstractGeometryType">
-				<sequence>
-					<element name="limits" type="gml:GridLimitsType"/>
-					<choice>
-						<element name="axisLabels" type="gml:NCNameList"/>
-						<element name="axisName" type="string" maxOccurs="unbounded"/>
-					</choice>
-				</sequence>
-				<attribute name="dimension" type="positiveInteger" use="required"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="GridLimitsType">
-		<sequence>
-			<element name="GridEnvelope" type="gml:GridEnvelopeType"/>
-		</sequence>
-	</complexType>
-	<complexType name="GridEnvelopeType">
-		<sequence>
-			<element name="low" type="gml:integerList"/>
-			<element name="high" type="gml:integerList"/>
-		</sequence>
-	</complexType>
-	<element name="RectifiedGrid" type="gml:RectifiedGridType" substitutionGroup="gml:Grid">
-		<annotation>
-			<documentation>A rectified grid is a grid for which there is an affine transformation between the grid coordinates and the coordinates of an external coordinate reference system. It is defined by specifying the position (in some geometric space) of the grid "origin" and of the vectors that specify the post locations.
-Note that the grid limits (post indexes) and axis name properties are inherited from gml:GridType and that gml:RectifiedGrid adds a gml:origin property (contains or references a gml:Point) and a set of gml:offsetVector properties.</documentation>
-		</annotation>
-	</element>
-	<complexType name="RectifiedGridType">
-		<complexContent>
-			<extension base="gml:GridType">
-				<sequence>
-					<element name="origin" type="gml:PointPropertyType"/>
-					<element name="offsetVector" type="gml:VectorType" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/measures.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/measures.xsd
deleted file mode 100644
index 696ccda48..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/measures.xsd
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" xml:lang="en" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:measures:3.2.1">measures.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 17.3.
-gml:MeasureType is defined in the basicTypes schema.  The measure types defined here correspond with a set of convenience measure types described in ISO/TS 19103.  The XML implementation is based on the XML Schema simple type "double" which supports both decimal and scientific notation, and includes an XML attribute "uom" which refers to the units of measure for the value.  Note that, there is no requirement to store values using any particular format, and applications receiving elements of this type may choose to coerce the data to any other type as convenient.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="units.xsd"/>
-	<element name="measure" type="gml:MeasureType">
-		<annotation>
-			<documentation>The value of a physical quantity, together with its unit.</documentation>
-		</annotation>
-	</element>
-	<complexType name="LengthType">
-		<annotation>
-			<documentation>This is a prototypical definition for a specific measure type defined as a vacuous extension (i.e. aliases) of gml:MeasureType. In this case, the content model supports the description of a length (or distance) quantity, with its units. The unit of measure referenced by uom shall be suitable for a length, such as metres or feet.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<complexType name="ScaleType">
-		<simpleContent>
-			<extension base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<complexType name="TimeType">
-		<simpleContent>
-			<extension base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<complexType name="GridLengthType">
-		<simpleContent>
-			<extension base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<complexType name="AreaType">
-		<simpleContent>
-			<extension base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<complexType name="VolumeType">
-		<simpleContent>
-			<extension base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<complexType name="SpeedType">
-		<simpleContent>
-			<extension base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<complexType name="AngleType">
-		<simpleContent>
-			<extension base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<element name="angle" type="gml:AngleType">
-		<annotation>
-			<documentation>The gml:angle property element is used to record the value of an angle quantity as a single number, with its units.</documentation>
-		</annotation>
-	</element>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/observation.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/observation.xsd
deleted file mode 100644
index 1d84d1fb0..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/observation.xsd
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:observation:3.2.1">observation.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 Clause 19.
-A GML observation models the act of observing, often with a camera, a person or some form of instrument.  An observation feature describes the "metadata" associated with an information capture event, together with a value for the result of the observation.  This covers a broad range of cases, from a tourist photo (not the photo but the act of taking the photo), to images acquired by space borne sensors or the measurement of a temperature 5 meters below the surfaces of a lake.
-The basic structures introduced in this schema are intended to serve as the foundation for more comprehensive schemas for scientific, technical and engineering measurement schemas.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="feature.xsd"/>
-	<include schemaLocation="direction.xsd"/>
-	<include schemaLocation="valueObjects.xsd"/>
-	<element name="Observation" type="gml:ObservationType" substitutionGroup="gml:AbstractFeature">
-		<annotation>
-			<documentation>The content model is a straightforward extension of gml:AbstractFeatureType; it automatically has the gml:identifier, gml:description, gml:descriptionReference, gml:name, and gml:boundedBy properties. 
-The gml:validTime element describes the time of the observation. Note that this may be a time instant or a time period.
-The gml:using property contains or references a description of a sensor, instrument or procedure used for the observation.
-The gml:target property contains or references the specimen, region or station which is the object of the observation. This property is particularly useful for remote observations, such as photographs, where a generic location property might apply to the location of the camera or the location of the field of view, and thus may be ambiguous.  
-The gml:subject element is provided as a convenient synonym for gml:target. This is the term commonly used in phtotography.  
-The gml:resultOf property indicates the result of the observation.  The value may be inline, or a reference to a value elsewhere.
-</documentation>
-		</annotation>
-	</element>
-	<complexType name="ObservationType">
-		<complexContent>
-			<extension base="gml:AbstractFeatureType">
-				<sequence>
-					<element ref="gml:validTime"/>
-					<element ref="gml:using" minOccurs="0"/>
-					<element ref="gml:target" minOccurs="0"/>
-					<element ref="gml:resultOf"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="using" type="gml:ProcedurePropertyType"/>
-	<complexType name="ProcedurePropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractFeature"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="target" type="gml:TargetPropertyType"/>
-	<element name="subject" type="gml:TargetPropertyType" substitutionGroup="gml:target"/>
-	<complexType name="TargetPropertyType">
-		<choice minOccurs="0">
-			<element ref="gml:AbstractFeature"/>
-			<element ref="gml:AbstractGeometry"/>
-		</choice>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="resultOf" type="gml:ResultType"/>
-	<complexType name="ResultType">
-		<sequence minOccurs="0">
-			<any namespace="##any"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="DirectedObservation" type="gml:DirectedObservationType" substitutionGroup="gml:Observation">
-		<annotation>
-			<documentation>A gml:DirectedObservation is the same as an observation except that it adds an additional gml:direction property. This is the direction in which the observation was acquired. Clearly this applies only to certain types of observations such as visual observations by people, or observations obtained from terrestrial cameras.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DirectedObservationType">
-		<complexContent>
-			<extension base="gml:ObservationType">
-				<sequence>
-					<element ref="gml:direction"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="DirectedObservationAtDistance" type="gml:DirectedObservationAtDistanceType" substitutionGroup="gml:DirectedObservation">
-		<annotation>
-			<documentation>gml:DirectedObservationAtDistance adds an additional distance property. This is the distance from the observer to the subject of the observation. Clearly this applies only to certain types of observations such as visual observations by people, or observations obtained from terrestrial cameras.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DirectedObservationAtDistanceType">
-		<complexContent>
-			<extension base="gml:DirectedObservationType">
-				<sequence>
-					<element name="distance" type="gml:MeasureType"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/referenceSystems.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/referenceSystems.xsd
deleted file mode 100644
index 93cfef338..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/referenceSystems.xsd
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" xml:lang="en" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:referenceSystems:3.2.1">referenceSystems.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 13.2.
-The reference systems schema components have two logical parts, which define elements and types for XML encoding of the definitions of:
--	Identified Object, inherited by the ten types of GML objects used for coordinate reference systems and coordinate operations
--	High-level part of the definitions of coordinate reference systems
-This schema encodes the Identified Object and Reference System packages of the UML Model for ISO 19111.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="dictionary.xsd"/>
-	<import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
-	<complexType name="IdentifiedObjectType" abstract="true">
-		<annotation>
-			<documentation>gml:IdentifiedObjectType provides identification properties of a CRS-related object. In gml:DefinitionType, the gml:identifier element shall be the primary name by which this object is identified, encoding the "name" attribute in the UML model.
-Zero or more of the gml:name elements can be an unordered set of "identifiers", encoding the "identifier" attribute in the UML model. Each of these gml:name elements can reference elsewhere the object's defining information or be an identifier by which this object can be referenced.
-Zero or more other gml:name elements can be an unordered set of "alias" alternative names by which this CRS related object is identified, encoding the "alias" attributes in the UML model. An object may have several aliases, typically used in different contexts. The context for an alias is indicated by the value of its (optional) codeSpace attribute.
-Any needed version information shall be included in the codeSpace attribute of a gml:identifier and gml:name elements. In this use, the gml:remarks element in the gml:DefinitionType shall contain comments on or information about this object, including data source information.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:DefinitionType"/>
-		</complexContent>
-	</complexType>
-	<element name="AbstractCRS" type="gml:AbstractCRSType" abstract="true" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>gml:AbstractCRS specifies a coordinate reference system which is usually single but may be compound. This abstract complex type shall not be used, extended, or restricted, in a GML Application Schema, to define a concrete subtype with a meaning equivalent to a concrete subtype specified in this document.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractCRSType" abstract="true">
-		<complexContent>
-			<extension base="gml:IdentifiedObjectType">
-				<sequence>
-					<element ref="gml:domainOfValidity" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:scope" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="domainOfValidity">
-		<annotation>
-			<documentation>The gml:domainOfValidity property implements an association role to an EX_Extent object as encoded in ISO/TS 19139, either referencing or containing the definition of that extent.</documentation>
-		</annotation>
-		<complexType>
-			<sequence minOccurs="0">
-				<element ref="gmd:EX_Extent"/>
-			</sequence>
-			<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</complexType>
-	</element>
-	<element name="scope" type="string">
-		<annotation>
-			<documentation>The gml:scope property provides a description of the usage, or limitations of usage, for which this CRS-related object is valid. If unknown, enter "not known".</documentation>
-		</annotation>
-	</element>
-	<complexType name="CRSPropertyType">
-		<annotation>
-			<documentation>gml:CRSPropertyType is a property type for association roles to a CRS abstract coordinate reference system, either referencing or containing the definition of that CRS.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/temporal.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/temporal.xsd
deleted file mode 100644
index 794956f7f..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/temporal.xsd
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:temporal:3.2.1">temporal.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 15.2.
-The GML temporal schemas include components for describing temporal geometry and topology, temporal reference systems, and the temporal characteristics of geographic data. The model underlying the representation constitutes a profile of the conceptual schema described in ISO 19108. The underlying spatiotemporal model strives to accommodate both feature-level and attribute-level time stamping; basic support for tracking moving objects is also included. 
-Time is measured on two types of scales: interval and ordinal.  An interval scale offers a basis for measuring duration, an ordinal scale provides information only about relative position in time.
-Two other ISO standards are relevant to describing temporal objects:  ISO 8601 describes encodings for time instants and time periods, as text strings with particular structure and punctuation; ISO 11404 provides a detailed description of time intervals as part of a general discussion of language independent datatypes.  
-The temporal schemas cover two interrelated topics and provide basic schema components for representing temporal instants and periods, temporal topology, and reference systems; more specialized schema components defines components used for dynamic features. Instances of temporal geometric types are used as values for the temporal properties of geographic features.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gmlBase.xsd"/>
-	<element name="AbstractTimeObject" type="gml:AbstractTimeObjectType" abstract="true" substitutionGroup="gml:AbstractGML">
-		<annotation>
-			<documentation>gml:AbstractTimeObject acts as the head of a substitution group for all temporal primitives and complexes.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractTimeObjectType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractGMLType"/>
-		</complexContent>
-	</complexType>
-	<element name="AbstractTimePrimitive" type="gml:AbstractTimePrimitiveType" abstract="true" substitutionGroup="gml:AbstractTimeObject">
-		<annotation>
-			<documentation>gml:AbstractTimePrimitive acts as the head of a substitution group for geometric and topological temporal primitives.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractTimePrimitiveType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractTimeObjectType">
-				<sequence>
-					<element name="relatedTime" type="gml:RelatedTimeType" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TimePrimitivePropertyType">
-		<annotation>
-			<documentation>gml:TimePrimitivePropertyType provides a standard content model for associations between an arbitrary member of the substitution group whose head is gml:AbstractTimePrimitive and another object.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractTimePrimitive"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="validTime" type="gml:TimePrimitivePropertyType">
-		<annotation>
-			<documentation>gml:validTime is a convenience property element.</documentation>
-		</annotation>
-	</element>
-	<complexType name="RelatedTimeType">
-		<annotation>
-			<documentation>gml:RelatedTimeType provides a content model for indicating the relative position of an arbitrary member of the substitution group whose head is gml:AbstractTimePrimitive. It extends the generic gml:TimePrimitivePropertyType with an XML attribute relativePosition, whose value is selected from the set of 13 temporal relationships identified by Allen (1983)</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:TimePrimitivePropertyType">
-				<attribute name="relativePosition">
-					<simpleType>
-						<restriction base="string">
-							<enumeration value="Before"/>
-							<enumeration value="After"/>
-							<enumeration value="Begins"/>
-							<enumeration value="Ends"/>
-							<enumeration value="During"/>
-							<enumeration value="Equals"/>
-							<enumeration value="Contains"/>
-							<enumeration value="Overlaps"/>
-							<enumeration value="Meets"/>
-							<enumeration value="OverlappedBy"/>
-							<enumeration value="MetBy"/>
-							<enumeration value="BegunBy"/>
-							<enumeration value="EndedBy"/>
-						</restriction>
-					</simpleType>
-				</attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="AbstractTimeComplex" type="gml:AbstractTimeComplexType" abstract="true" substitutionGroup="gml:AbstractTimeObject">
-		<annotation>
-			<documentation>gml:AbstractTimeComplex is an aggregation of temporal primitives and acts as the head of a substitution group for temporal complexes.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractTimeComplexType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractTimeObjectType"/>
-		</complexContent>
-	</complexType>
-	<element name="AbstractTimeGeometricPrimitive" type="gml:AbstractTimeGeometricPrimitiveType" abstract="true" substitutionGroup="gml:AbstractTimePrimitive">
-		<annotation>
-			<documentation>gml:TimeGeometricPrimitive acts as the head of a substitution group for geometric temporal primitives.
-A temporal geometry shall be associated with a temporal reference system through the frame attribute that provides a URI reference that identifies a description of the reference system. Following ISO 19108, the Gregorian calendar with UTC is the default reference system, but others may also be used. The GPS calendar is an alternative reference systems in common use.
-The two geometric primitives in the temporal dimension are the instant and the period. GML components are defined to support these as follows.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractTimeGeometricPrimitiveType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractTimePrimitiveType">
-				<attribute name="frame" type="anyURI" default="#ISO-8601"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="TimeInstant" type="gml:TimeInstantType" substitutionGroup="gml:AbstractTimeGeometricPrimitive">
-		<annotation>
-			<documentation>gml:TimeInstant acts as a zero-dimensional geometric primitive that represents an identifiable position in time.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeInstantType" final="#all">
-		<complexContent>
-			<extension base="gml:AbstractTimeGeometricPrimitiveType">
-				<sequence>
-					<element ref="gml:timePosition"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TimeInstantPropertyType">
-		<annotation>
-			<documentation>gml:TimeInstantPropertyType provides for associating a gml:TimeInstant with an object.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TimeInstant"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="TimePeriod" type="gml:TimePeriodType" substitutionGroup="gml:AbstractTimeGeometricPrimitive">
-		<annotation>
-			<documentation>gml:TimePeriod acts as a one-dimensional geometric primitive that represents an identifiable extent in time.
-The location in of a gml:TimePeriod is described by the temporal positions of the instants at which it begins and ends. The length of the period is equal to the temporal distance between the two bounding temporal positions. 
-Both beginning and end may be described in terms of their direct position using gml:TimePositionType which is an XML Schema simple content type, or by reference to an indentifiable time instant using gml:TimeInstantPropertyType.
-Alternatively a limit of a gml:TimePeriod may use the conventional GML property model to make a reference to a time instant described elsewhere, or a limit may be indicated as a direct position.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimePeriodType">
-		<complexContent>
-			<extension base="gml:AbstractTimeGeometricPrimitiveType">
-				<sequence>
-					<choice>
-						<element name="beginPosition" type="gml:TimePositionType"/>
-						<element name="begin" type="gml:TimeInstantPropertyType"/>
-					</choice>
-					<choice>
-						<element name="endPosition" type="gml:TimePositionType"/>
-						<element name="end" type="gml:TimeInstantPropertyType"/>
-					</choice>
-					<group ref="gml:timeLength" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TimePeriodPropertyType">
-		<annotation>
-			<documentation>gml:TimePeriodPropertyType provides for associating a gml:TimePeriod with an object.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TimePeriod"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<complexType name="TimePositionType" final="#all">
-		<annotation>
-			<documentation>The method for identifying a temporal position is specific to each temporal reference system.  gml:TimePositionType supports the description of temporal position according to the subtypes described in ISO 19108.
-Values based on calendars and clocks use lexical formats that are based on ISO 8601, as described in XML Schema Part 2:2001. A decimal value may be used with coordinate systems such as GPS time or UNIX time. A URI may be used to provide a reference to some era in an ordinal reference system . 
-In common with many of the components modelled as data types in the ISO 19100 series of International Standards, the corresponding GML component has simple content. However, the content model gml:TimePositionType is defined in several steps.
-Three XML attributes appear on gml:TimePositionType:
-A time value shall be associated with a temporal reference system through the frame attribute that provides a URI reference that identifies a description of the reference system. Following ISO 19108, the Gregorian calendar with UTC is the default reference system, but others may also be used. Components for describing temporal reference systems are described in 14.4, but it is not required that the reference system be described in this, as the reference may refer to anything that may be indentified with a URI.  
-For time values using a calendar containing more than one era, the (optional) calendarEraName attribute provides the name of the calendar era.  
-Inexact temporal positions may be expressed using the optional indeterminatePosition attribute.  This takes a value from an enumeration.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:TimePositionUnion">
-				<attribute name="frame" type="anyURI" default="#ISO-8601"/>
-				<attribute name="calendarEraName" type="string"/>
-				<attribute name="indeterminatePosition" type="gml:TimeIndeterminateValueType"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<simpleType name="TimeIndeterminateValueType">
-		<annotation>
-			<documentation>These values are interpreted as follows: 
--	"unknown" indicates that no specific value for temporal position is provided.
--	"now" indicates that the specified value shall be replaced with the current temporal position whenever the value is accessed.
--	"before" indicates that the actual temporal position is unknown, but it is known to be before the specified value.
--	"after" indicates that the actual temporal position is unknown, but it is known to be after the specified value.
-A value for indeterminatePosition may 
--	be used either alone, or 
--	qualify a specific value for temporal position.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="after"/>
-			<enumeration value="before"/>
-			<enumeration value="now"/>
-			<enumeration value="unknown"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="TimePositionUnion">
-		<annotation>
-			<documentation>The simple type gml:TimePositionUnion is a union of XML Schema simple types which instantiate the subtypes for temporal position described in ISO 19108.
- An ordinal era may be referenced via URI.  A decimal value may be used to indicate the distance from the scale origin .  time is used for a position that recurs daily (see ISO 19108:2002 5.4.4.2).
- Finally, calendar and clock forms that support the representation of time in systems based on years, months, days, hours, minutes and seconds, in a notation following ISO 8601, are assembled by gml:CalDate</documentation>
-		</annotation>
-		<union memberTypes="gml:CalDate time dateTime anyURI decimal"/>
-	</simpleType>
-	<simpleType name="CalDate">
-		<union memberTypes="date gYearMonth gYear"/>
-	</simpleType>
-	<element name="timePosition" type="gml:TimePositionType">
-		<annotation>
-			<documentation>This element is used directly as a property of gml:TimeInstant (see 15.2.2.3), and may also be used in application schemas.</documentation>
-		</annotation>
-	</element>
-	<group name="timeLength">
-		<annotation>
-			<documentation>The length of a time period.</documentation>
-		</annotation>
-		<choice>
-			<element ref="gml:duration"/>
-			<element ref="gml:timeInterval"/>
-		</choice>
-	</group>
-	<element name="duration" type="duration">
-		<annotation>
-			<documentation>gml:duration conforms to the ISO 8601 syntax for temporal length as implemented by the XML Schema duration type.</documentation>
-		</annotation>
-	</element>
-	<element name="timeInterval" type="gml:TimeIntervalLengthType">
-		<annotation>
-			<documentation> gml:timeInterval conforms to ISO 11404 which is based on floating point values for temporal length.
-ISO 11404 syntax specifies the use of a positiveInteger together with appropriate values for radix and factor. The resolution of the time interval is to one radix ^(-factor) of the specified time unit.
-The value of the unit is either selected from the units for time intervals from ISO 31-1:1992, or is another suitable unit.  The encoding is defined for GML in gml:TimeUnitType. The second component of this union type provides a method for indicating time units other than the six standard units given in the enumeration.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeIntervalLengthType" final="#all">
-		<simpleContent>
-			<extension base="decimal">
-				<attribute name="unit" type="gml:TimeUnitType" use="required"/>
-				<attribute name="radix" type="positiveInteger"/>
-				<attribute name="factor" type="integer"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<simpleType name="TimeUnitType">
-		<union>
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="year"/>
-					<enumeration value="month"/>
-					<enumeration value="day"/>
-					<enumeration value="hour"/>
-					<enumeration value="minute"/>
-					<enumeration value="second"/>
-				</restriction>
-			</simpleType>
-			<simpleType>
-				<restriction base="string">
-					<pattern value="other:\w{2,}"/>
-				</restriction>
-			</simpleType>
-		</union>
-	</simpleType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/temporalReferenceSystems.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/temporalReferenceSystems.xsd
deleted file mode 100644
index 8104b112d..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/temporalReferenceSystems.xsd
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:temporalReferenceSystems:3.2.1">temporalReferenceSystems.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 15.5.
-A value in the time domain is measured relative to a temporal reference system. Common types of reference systems include calendars, ordinal temporal reference systems, and temporal coordinate systems (time elapsed since some epoch).  The primary temporal reference system for use with geographic information is the Gregorian Calendar and 24 hour local or Coordinated Universal Time (UTC), but special applications may entail the use of alternative reference systems.  The Julian day numbering system is a temporal coordinate system that has an origin earlier than any known calendar, at noon on 1 January 4713 BC in the Julian proleptic calendar, and is useful in transformations between dates in different calendars.    
-In GML seven concrete elements are used to describe temporal reference systems: gml:TimeReferenceSystem, gml:TimeCoordinateSystem, gml:TimeCalendar, gml:TimeCalendarEra, gml:TimeClock, gml:TimeOrdinalReferenceSystem, and gml:TimeOrdinalEra.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="temporalTopology.xsd"/>
-	<include schemaLocation="dictionary.xsd"/>
-	<element name="TimeReferenceSystem" type="gml:TimeReferenceSystemType" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>A reference system is characterized in terms of its domain of validity: the spatial and temporal extent over which it is applicable. The basic GML element for temporal reference systems is gml:TimeReferenceSystem.  Its content model extends gml:DefinitionType with one additional property, gml:domainOfValidity.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeReferenceSystemType">
-		<complexContent>
-			<extension base="gml:DefinitionType">
-				<sequence>
-					<element name="domainOfValidity" type="string"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="TimeCoordinateSystem" type="gml:TimeCoordinateSystemType" substitutionGroup="gml:TimeReferenceSystem">
-		<annotation>
-			<documentation>A temporal coordinate system shall be based on a continuous interval scale defined in terms of a single time interval.
-The differences to ISO 19108 TM_CoordinateSystem are:
--	the origin is specified either using the property gml:originPosition whose value is a direct time position, or using the property gml:origin whose model is gml:TimeInstantPropertyType; this permits more flexibility in representation and also supports referring to a value fixed elsewhere;
--	the interval uses gml:TimeIntervalLengthType.
-</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeCoordinateSystemType">
-		<complexContent>
-			<extension base="gml:TimeReferenceSystemType">
-				<sequence>
-					<choice>
-						<element name="originPosition" type="gml:TimePositionType"/>
-						<element name="origin" type="gml:TimeInstantPropertyType"/>
-					</choice>
-					<element name="interval" type="gml:TimeIntervalLengthType"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="TimeCalendar" type="gml:TimeCalendarType" substitutionGroup="gml:TimeReferenceSystem">
-		<annotation>
-			<documentation>A calendar is a discrete temporal reference system that provides a basis for defining temporal position to a resolution of one day.
-gml:TimeCalendar adds one property to those inherited from gml:TimeReferenceSystem. A gml:referenceFrame provides a link to a gml:TimeCalendarEra that it uses. A  gml:TimeCalendar may reference more than one calendar era. 
-The referenceFrame element follows the standard GML property model, allowing the association to be instantiated either using an inline description using the gml:TimeCalendarEra element, or a link to a gml:TimeCalendarEra which is explicit elsewhere.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeCalendarType">
-		<complexContent>
-			<extension base="gml:TimeReferenceSystemType">
-				<sequence>
-					<element name="referenceFrame" type="gml:TimeCalendarEraPropertyType" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="TimeCalendarEra" type="gml:TimeCalendarEraType">
-		<annotation>
-			<documentation>gml:TimeCalendarEra inherits basic properties from gml:DefinitionType and has the following additional properties:
--	gml:referenceEvent is the name or description of a mythical or historic event which fixes the position of the base scale of the calendar era.  This is given as text or using a link to description held elsewhere.
--	gml:referenceDate specifies the date of the referenceEvent expressed as a date in the given calendar.  In most calendars, this date is the origin (i.e., the first day) of the scale, but this is not always true.
--	gml:julianReference specifies the Julian date that corresponds to the reference date.  The Julian day number is an integer value; the Julian date is a decimal value that allows greater resolution.  Transforming calendar dates to and from Julian dates provides a relatively simple basis for transforming dates from one calendar to another.
--	gml:epochOfUse is the period for which the calendar era was used as a basis for dating.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeCalendarEraType">
-		<complexContent>
-			<extension base="gml:DefinitionType">
-				<sequence>
-					<element name="referenceEvent" type="gml:StringOrRefType"/>
-					<element name="referenceDate" type="gml:CalDate"/>
-					<element name="julianReference" type="decimal"/>
-					<element name="epochOfUse" type="gml:TimePeriodPropertyType"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TimeCalendarPropertyType">
-		<annotation>
-			<documentation>gml:TimeCalendarPropertyType provides for associating a gml:TimeCalendar with an object.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TimeCalendar"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<complexType name="TimeCalendarEraPropertyType">
-		<annotation>
-			<documentation>gml:TimeCalendarEraPropertyType provides for associating a gml:TimeCalendarEra with an object.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TimeCalendarEra"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="TimeClock" type="gml:TimeClockType" substitutionGroup="gml:TimeReferenceSystem">
-		<annotation>
-			<documentation>A clock provides a basis for defining temporal position within a day. A clock shall be used with a calendar in order to provide a complete description of a temporal position within a specific day.
-gml:TimeClock adds the following properties to those inherited from gml:TimeReferenceSystemType:
--	gml:referenceEvent is the name or description of an event, such as solar noon or sunrise, which fixes the position of the base scale of the clock.
--	gml:referenceTime specifies the time of day associated with the reference event expressed as a time of day in the given clock. The reference time is usually the origin of the clock scale. 
--	gml:utcReference specifies the 24 hour local or UTC time that corresponds to the reference time.
--	gml:dateBasis contains or references the calendars that use this clock.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeClockType" final="#all">
-		<complexContent>
-			<extension base="gml:TimeReferenceSystemType">
-				<sequence>
-					<element name="referenceEvent" type="gml:StringOrRefType"/>
-					<element name="referenceTime" type="time"/>
-					<element name="utcReference" type="time"/>
-					<element name="dateBasis" type="gml:TimeCalendarPropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TimeClockPropertyType">
-		<annotation>
-			<documentation>gml:TimeClockPropertyType provides for associating a gml:TimeClock with an object.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TimeClock"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="TimeOrdinalReferenceSystem" type="gml:TimeOrdinalReferenceSystemType" substitutionGroup="gml:TimeReferenceSystem">
-		<annotation>
-			<documentation>In some applications of geographic information — such as geology and archaeology — relative position in time is known more precisely than absolute time or duration. The order of events in time can be well established, but the magnitude of the intervals between them cannot be accurately determined; in such cases, the use of an ordinal temporal reference system is appropriate. An ordinal temporal reference system is composed of a sequence of named coterminous eras, which may in turn be composed of sequences of member eras at a finer scale, giving the whole a hierarchical structure of eras of verying resolution. 
-An ordinal temporal reference system whose component eras are not further subdivided is effectively a temporal topological complex constrained to be a linear graph. An ordinal temporal reference system some or all of whose component eras are subdivided is effectively a temporal topological complex with the constraint that parallel branches may only be constructed in pairs where one is a single temporal ordinal era and the other is a sequence of temporal ordinal eras that are called "members" of the "group". This constraint means that within a single temporal ordinal reference system, the relative position of all temporal ordinal eras is unambiguous.  
-The positions of the beginning and end of a given era may calibrate the relative time scale.
-gml:TimeOrdinalReferenceSystem adds one or more gml:component properties to the generic temporal reference system model.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeOrdinalReferenceSystemType">
-		<complexContent>
-			<extension base="gml:TimeReferenceSystemType">
-				<sequence>
-					<element name="component" type="gml:TimeOrdinalEraPropertyType" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="TimeOrdinalEra" type="gml:TimeOrdinalEraType">
-		<annotation>
-			<documentation>Its content model follows the pattern of gml:TimeEdge, inheriting standard properties from gml:DefinitionType, and adding gml:start, gml:end and gml:extent properties, a set of gml:member properties which indicate ordered gml:TimeOrdinalEra elements, and a gml:group property which points to the parent era.
-The recursive inclusion of gml:TimeOrdinalEra elements allow the construction of an arbitrary depth hierarchical ordinal reference schema, such that an ordinal era at a given level of the hierarchy includes a sequence of shorter, coterminous ordinal eras.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeOrdinalEraType">
-		<complexContent>
-			<extension base="gml:DefinitionType">
-				<sequence>
-					<element name="relatedTime" type="gml:RelatedTimeType" minOccurs="0" maxOccurs="unbounded"/>
-					<element name="start" type="gml:TimeNodePropertyType" minOccurs="0"/>
-					<element name="end" type="gml:TimeNodePropertyType" minOccurs="0"/>
-					<element name="extent" type="gml:TimePeriodPropertyType" minOccurs="0"/>
-					<element name="member" type="gml:TimeOrdinalEraPropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<element name="group" type="gml:ReferenceType" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TimeOrdinalEraPropertyType">
-		<annotation>
-			<documentation>gml:TimeOrdinalEraPropertyType provides for associating a gml:TimeOrdinalEra with an object.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TimeOrdinalEra"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/temporalTopology.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/temporalTopology.xsd
deleted file mode 100644
index 76cb02ce8..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/temporalTopology.xsd
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:temporalTopology:3.2.1">temporalTopology.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 15.3.
-Temporal topology is described in terms of time complexes, nodes, and edges, and the connectivity between these. Temporal topology does not directly provide information about temporal position. It is used in the case of describing a lineage or a history (e.g. a family tree expressing evolution of species, an ecological cycle, a lineage of lands or buildings, or a history of separation and merger of administrative boundaries). The following Subclauses specifies the temporal topology as temporal characteristics of features in compliance with ISO 19108.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="temporal.xsd"/>
-	<element name="AbstractTimeTopologyPrimitive" type="gml:AbstractTimeTopologyPrimitiveType" abstract="true" substitutionGroup="gml:AbstractTimePrimitive">
-		<annotation>
-			<documentation>gml:TimeTopologyPrimitive acts as the head of a substitution group for topological temporal primitives.
-Temporal topology primitives shall imply the ordering information between features or feature properties. The temporal connection of features can be examined if they have temporal topology primitives as values of their properties. Usually, an instantaneous feature associates with a time node, and a static feature associates with a time edge.  A feature with both modes associates with the temporal topology primitive: a supertype of time nodes and time edges.
-A topological primitive is always connected to one or more other topological primitives, and is, therefore, always a member of a topological complex. In a GML instance, this will often be indicated by the primitives being described by elements that are descendents of an element describing a complex. However, in order to support the case where a temporal topological primitive is described in another context, the optional complex property is provided, which carries a reference to the parent temporal topological complex.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractTimeTopologyPrimitiveType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractTimePrimitiveType">
-				<sequence>
-					<element name="complex" type="gml:ReferenceType" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TimeTopologyPrimitivePropertyType">
-		<annotation>
-			<documentation>gml:TimeTopologyPrimitivePropertyType provides for associating a gml:AbstractTimeTopologyPrimitive with an object.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractTimeTopologyPrimitive"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="TimeTopologyComplex" type="gml:TimeTopologyComplexType" substitutionGroup="gml:AbstractTimeComplex">
-		<annotation>
-			<documentation>A temporal topology complex shall be the connected acyclic directed graph composed of temporal topological primitives, i.e. time nodes and time edges. Because a time edge may not exist without two time nodes on its boundaries, static features have time edges from a temporal topology complex as the values of their temporal properties, regardless of explicit declarations.
-A temporal topology complex expresses a linear or a non-linear graph. A temporal linear graph, composed of a sequence of time edges, provides a lineage described only by "substitution" of feature instances or feature element values. A time node as the start or the end of the graph connects with at least one time edge. A time node other than the start and the end shall connect to at least two time edges: one of starting from the node, and another ending at the node.
-A temporal topological complex is a set of connected temporal topological primitives. The member primtives are indicated, either by reference or by value, using the primitive property.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeTopologyComplexType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractTimeComplexType">
-				<sequence>
-					<element name="primitive" type="gml:TimeTopologyPrimitivePropertyType" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TimeTopologyComplexPropertyType">
-		<annotation>
-			<documentation>gml:TimeTopologyComplexPropertyType provides for associating a gml:TimeTopologyComplex with an object.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TimeTopologyComplex"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="TimeNode" type="gml:TimeNodeType" substitutionGroup="gml:AbstractTimeTopologyPrimitive">
-		<annotation>
-			<documentation>A time node is a zero-dimensional topological primitive that represents an identifiable node in time (it is equivalent to a point in space). A node may act as the termination or initiation of any number of time edges. A time node may be realised as a geometry, its position, whose value is a time instant.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeNodeType">
-		<complexContent>
-			<extension base="gml:AbstractTimeTopologyPrimitiveType">
-				<sequence>
-					<element name="previousEdge" type="gml:TimeEdgePropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<element name="nextEdge" type="gml:TimeEdgePropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<element name="position" type="gml:TimeInstantPropertyType" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TimeNodePropertyType">
-		<annotation>
-			<documentation>gml:TimeNodePropertyType provides for associating a gml:TimeNode with an object</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TimeNode"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="TimeEdge" type="gml:TimeEdgeType" substitutionGroup="gml:AbstractTimeTopologyPrimitive">
-		<annotation>
-			<documentation>A time edge is a one-dimensional topological primitive. It is an open interval that starts and ends at a node. The edge may be realised as a geometry whose value is a time period.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeEdgeType">
-		<complexContent>
-			<extension base="gml:AbstractTimeTopologyPrimitiveType">
-				<sequence>
-					<element name="start" type="gml:TimeNodePropertyType"/>
-					<element name="end" type="gml:TimeNodePropertyType"/>
-					<element name="extent" type="gml:TimePeriodPropertyType" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TimeEdgePropertyType">
-		<annotation>
-			<documentation>gml:TimeEdgePropertyType provides for associating a gml:TimeEdge with an object.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TimeEdge"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/topology.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/topology.xsd
deleted file mode 100644
index 11145b1ce..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/topology.xsd
+++ /dev/null
@@ -1,385 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:topology:3.2.1">topology.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 Clause 14.
-Topology is the branch of mathematics describing the properties of objects which are invariant under continuous deformation. For example, a circle is topologically equivalent to an ellipse because one can be transformed into the other by stretching. In geographic modelling, the foremost use of topology is in accelerating computational geometry. The constructs of topology allow characterisation of the spatial relationships between objects using simple combinatorial or algebraic algorithms. Topology, realised by the appropriate geometry, also allows a compact and unambiguous mechanism for expressing shared geometry among geographic features.
-There are four instantiable classes of primitive topology objects, one for each dimension up to 3D. In addition, topological complexes are supported, too. 
-There is strong symmetry in the (topological boundary and coboundary) relationships between topology primitives of adjacent dimensions. Topology primitives are bounded by directed primitives of one lower dimension. The coboundary of each topology primitive is formed from directed topology primitives of one higher dimension.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="geometryComplexes.xsd"/>
-  <complexType name="AbstractTopologyType" abstract="true">
-    <annotation>
-      <documentation>This abstract type supplies the root or base type for all topological elements including primitives and complexes. It inherits AbstractGMLType and hence can be identified using the gml:id attribute.</documentation>
-    </annotation>
-    <complexContent>
-      <extension base="gml:AbstractGMLType"/>
-    </complexContent>
-  </complexType>
-  <element name="AbstractTopology" type="gml:AbstractTopologyType" abstract="true" substitutionGroup="gml:AbstractGML"/>
-  <complexType name="AbstractTopoPrimitiveType" abstract="true">
-    <complexContent>
-      <extension base="gml:AbstractTopologyType"/>
-    </complexContent>
-  </complexType>
-  <element name="AbstractTopoPrimitive" type="gml:AbstractTopoPrimitiveType" abstract="true" substitutionGroup="gml:AbstractTopology">
-    <annotation>
-      <documentation>gml:AbstractTopoPrimitive acts as the base type for all topological primitives. Topology primitives are the atomic (smallest possible) units of a topology complex. 
-Each topology primitive may contain references to other topology primitives of codimension 2 or more (gml:isolated). Conversely, nodes may have faces as containers and nodes and edges may have solids as containers (gml:container).</documentation>
-    </annotation>
-  </element>
-  <complexType name="NodeOrEdgePropertyType">
-    <choice minOccurs="0">
-      <element ref="gml:Node"/>
-      <element ref="gml:Edge"/>
-    </choice>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <complexType name="NodePropertyType">
-    <choice minOccurs="0">
-      <element ref="gml:Node"/>
-    </choice>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <complexType name="FaceOrTopoSolidPropertyType">
-    <choice minOccurs="0">
-      <element ref="gml:Face"/>
-      <element ref="gml:TopoSolid"/>
-    </choice>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <complexType name="TopoSolidPropertyType">
-    <choice minOccurs="0">
-      <element ref="gml:TopoSolid"/>
-    </choice>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <complexType name="NodeType">
-    <complexContent>
-      <extension base="gml:AbstractTopoPrimitiveType">
-        <sequence>
-          <element name="container" type="gml:FaceOrTopoSolidPropertyType" minOccurs="0"/>
-          <element ref="gml:directedEdge" minOccurs="0" maxOccurs="unbounded">
-            <annotation>
-              <documentation>In the case of planar topology, a gml:Node must have a clockwise sequence of gml:directedEdge properties, to ensure a lossless topology representation as defined by Kuijpers, et. al. (see OGC 05-102 Topology IPR).</documentation>
-            </annotation>
-          </element>
-          <element ref="gml:pointProperty" minOccurs="0"/>
-        </sequence>
-        <attributeGroup ref="gml:AggregationAttributeGroup"/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <element name="Node" type="gml:NodeType" substitutionGroup="gml:AbstractTopoPrimitive">
-    <annotation>
-      <documentation>gml:Node represents the 0-dimensional primitive.
-The optional coboundary of a node (gml:directedEdge) is a sequence of directed edges which are incident on this node. Edges emanating from this node appear in the node coboundary with a negative orientation. 
-If provided, the aggregationType attribute shall have the value "sequence".
-A node may optionally be realised by a 0-dimensional geometric primitive (gml:pointProperty).</documentation>
-    </annotation>
-  </element>
-  <element name="directedNode" type="gml:DirectedNodePropertyType">
-    <annotation>
-      <documentation>A gml:directedNode property element describes the boundary of topology edges and is used in the support of topological point features via the gml:TopoPoint expression, see below. The orientation attribute of type gml:SignType expresses the sense in which the included node is used: start ("-") or end ("+") node.</documentation>
-    </annotation>
-  </element>
-  <complexType name="DirectedNodePropertyType">
-    <sequence minOccurs="0">
-      <element ref="gml:Node"/>
-    </sequence>
-    <attribute name="orientation" type="gml:SignType" default="+"/>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <complexType name="EdgeType">
-    <complexContent>
-      <extension base="gml:AbstractTopoPrimitiveType">
-        <sequence>
-          <element name="container" type="gml:TopoSolidPropertyType" minOccurs="0"/>
-          <element ref="gml:directedNode" minOccurs="2" maxOccurs="2"/>
-          <element ref="gml:directedFace" minOccurs="0" maxOccurs="unbounded"/>
-          <element ref="gml:curveProperty" minOccurs="0"/>
-        </sequence>
-        <attributeGroup ref="gml:AggregationAttributeGroup"/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <element name="Edge" type="gml:EdgeType" substitutionGroup="gml:AbstractTopoPrimitive">
-    <annotation>
-      <documentation>gml:Edge represents the 1-dimensional primitive.
-The topological boundary of an Edge (gml:directedNode) consists of a negatively directed start Node and a positively directed end Node.   
-The optional coboundary of an edge (gml:directedFace) is a circular sequence of directed faces which are incident on this edge in document order. In the 2D case, the orientation of the face on the left of the edge is "+"; the orientation of the face on the right on its right is "-". 
-If provided, the aggregationType attribute shall have the value "sequence".
-An edge may optionally be realised by a 1-dimensional geometric primitive (gml:curveProperty).</documentation>
-    </annotation>
-  </element>
-  <element name="directedEdge" type="gml:DirectedEdgePropertyType">
-    <annotation>
-      <documentation>A gml:directedEdge property element describes the boundary of topology faces, the coBoundary of topology nodes and is used in the support of topological line features via the gml:TopoCurve expression, see below. The orientation attribute of type gml:SignType expresses the sense in which the included edge is used, i.e. forward or reverse.</documentation>
-    </annotation>
-  </element>
-  <complexType name="DirectedEdgePropertyType">
-    <sequence minOccurs="0">
-      <element ref="gml:Edge"/>
-    </sequence>
-    <attribute name="orientation" type="gml:SignType" default="+"/>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <complexType name="FaceType">
-    <complexContent>
-      <extension base="gml:AbstractTopoPrimitiveType">
-        <sequence>
-          <element name="isolated" type="gml:NodePropertyType" minOccurs="0" maxOccurs="unbounded"/>
-          <element ref="gml:directedEdge" maxOccurs="unbounded"/>
-          <element ref="gml:directedTopoSolid" minOccurs="0" maxOccurs="2"/>
-          <element ref="gml:surfaceProperty" minOccurs="0"/>
-        </sequence>
-        <attributeGroup ref="gml:AggregationAttributeGroup"/>
-        <attribute name="universal" type="boolean" use="optional" default="false">
-          <annotation>
-            <documentation>If the topological representation exists an unbounded manifold (e.g. Euclidean plane), a gml:Face must indicate whether it is a universal face or not, to ensure a lossless topology representation as defined by Kuijpers, et. al. (see OGC 05-102 Topology IPR). The optional universal attribute of type boolean is used to indicate this. NOTE The universal face is normally not part of any feature, and is used to represent the unbounded portion of the data set. Its interior boundary (it has no exterior boundary) would normally be considered the exterior boundary of the map represented by the data set. </documentation>
-          </annotation>
-        </attribute>
-      </extension>
-    </complexContent>
-  </complexType>
-  <element name="Face" type="gml:FaceType" substitutionGroup="gml:AbstractTopoPrimitive">
-    <annotation>
-      <documentation>gml:Face represents the 2-dimensional topology primitive.
-The topological boundary of a face (gml:directedEdge) consists of a sequence of directed edges. If provided, the aggregationType attribute shall have the value "sequence".
-The optional coboundary of a face (gml:directedTopoSolid) is a pair of directed solids which are bounded by this face. A positively directed solid corresponds to a solid which lies in the direction of the negatively directed normal to the face in any geometric realisation. 
-A face may optionally be realised by a 2-dimensional geometric primitive (gml:surfaceProperty).</documentation>
-    </annotation>
-  </element>
-  <element name="directedFace" type="gml:DirectedFacePropertyType">
-    <annotation>
-      <documentation>The gml:directedFace property element describes the boundary of topology solids, in the coBoundary of topology edges and is used in the support of surface features via the gml:TopoSurface expression, see below. The orientation attribute of type gml:SignType expresses the sense in which the included face is used i.e. inward or outward with respect to the surface normal in any geometric realisation.</documentation>
-    </annotation>
-  </element>
-  <complexType name="DirectedFacePropertyType">
-    <sequence minOccurs="0">
-      <element ref="gml:Face"/>
-    </sequence>
-    <attribute name="orientation" type="gml:SignType" default="+"/>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <complexType name="TopoSolidType">
-    <complexContent>
-      <extension base="gml:AbstractTopoPrimitiveType">
-        <sequence>
-          <element name="isolated" type="gml:NodeOrEdgePropertyType" minOccurs="0" maxOccurs="unbounded"/>
-          <element ref="gml:directedFace" maxOccurs="unbounded"/>
-          <element ref="gml:solidProperty" minOccurs="0"/>
-        </sequence>
-        <attributeGroup ref="gml:AggregationAttributeGroup"/>
-        <attribute name="universal" type="boolean" use="optional" default="false">
-          <annotation>
-            <documentation>A gml:TopoSolid must indicate whether it is a universal topo-solid or not, to ensure a lossless topology representation as defined by Kuijpers, et. al. (see OGC 05-102 Topology IPR). The optional universal attribute of type boolean is used to indicate this and the default is fault. NOTE The universal topo-solid is normally not part of any feature, and is used to represent the unbounded portion of the data set. Its interior boundary (it has no exterior boundary) would normally be considered the exterior boundary of the data set.</documentation>
-          </annotation>
-        </attribute>
-      </extension>
-    </complexContent>
-  </complexType>
-  <element name="TopoSolid" type="gml:TopoSolidType" substitutionGroup="gml:AbstractTopoPrimitive">
-    <annotation>
-      <documentation>gml:TopoSolid represents the 3-dimensional topology primitive. 
-The topological boundary of a solid (gml:directedFace) consists of a set of directed faces.
-A solid may optionally be realised by a 3-dimensional geometric primitive (gml:solidProperty).</documentation>
-    </annotation>
-  </element>
-  <element name="directedTopoSolid" type="gml:DirectedTopoSolidPropertyType">
-    <annotation>
-      <documentation>The gml:directedSolid property element describes the coBoundary of topology faces and is used in the support of volume features via the gml:TopoVolume expression, see below. The orientation attribute of type gml:SignType expresses the sense in which the included solid appears in the face coboundary. In the context of a gml:TopoVolume the orientation attribute has no meaning.</documentation>
-    </annotation>
-  </element>
-  <complexType name="DirectedTopoSolidPropertyType">
-    <sequence minOccurs="0">
-      <element ref="gml:TopoSolid"/>
-    </sequence>
-    <attribute name="orientation" type="gml:SignType" default="+"/>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <complexType name="TopoPointType">
-    <complexContent>
-      <extension base="gml:AbstractTopologyType">
-        <sequence>
-          <element ref="gml:directedNode"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <element name="TopoPoint" type="gml:TopoPointType">
-    <annotation>
-      <documentation>The intended use of gml:TopoPoint is to appear within a point feature to express the structural and possibly geometric relationships of this feature to other features via shared node definitions.</documentation>
-    </annotation>
-  </element>
-  <complexType name="TopoPointPropertyType">
-    <sequence>
-      <element ref="gml:TopoPoint"/>
-    </sequence>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <element name="topoPointProperty" type="gml:TopoPointPropertyType">
-    <annotation>
-      <documentation>The gml:topoPointProperty property element may be used in features to express their relationship to the referenced topology node.</documentation>
-    </annotation>
-  </element>
-  <complexType name="TopoCurveType">
-    <complexContent>
-      <extension base="gml:AbstractTopologyType">
-        <sequence>
-          <element ref="gml:directedEdge" maxOccurs="unbounded"/>
-        </sequence>
-        <attributeGroup ref="gml:AggregationAttributeGroup"/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <element name="TopoCurve" type="gml:TopoCurveType">
-    <annotation>
-      <documentation>gml:TopoCurve represents a homogeneous topological expression, a sequence of directed edges, which if realised are isomorphic to a geometric curve primitive. The intended use of gml:TopoCurve is to appear within a line feature to express the structural and geometric relationships of this feature to other features via the shared edge definitions.
-If provided, the aggregationType attribute shall have the value "sequence".</documentation>
-    </annotation>
-  </element>
-  <complexType name="TopoCurvePropertyType">
-    <sequence>
-      <element ref="gml:TopoCurve"/>
-    </sequence>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <element name="topoCurveProperty" type="gml:TopoCurvePropertyType">
-    <annotation>
-      <documentation>The gml:topoCurveProperty property element may be used in features to express their relationship to the referenced topology edges.</documentation>
-    </annotation>
-  </element>
-  <complexType name="TopoSurfaceType">
-    <complexContent>
-      <extension base="gml:AbstractTopologyType">
-        <sequence>
-          <element ref="gml:directedFace" maxOccurs="unbounded"/>
-        </sequence>
-        <attributeGroup ref="gml:AggregationAttributeGroup"/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <element name="TopoSurface" type="gml:TopoSurfaceType">
-    <annotation>
-      <documentation>gml:TopoSurface represents a homogeneous topological expression, a set of directed faces, which if realised are isomorphic to a geometric surface primitive. The intended use of gml:TopoSurface is to appear within a surface feature to express the structural and possibly geometric relationships of this surface feature to other features via the shared face definitions.</documentation>
-    </annotation>
-  </element>
-  <complexType name="TopoSurfacePropertyType">
-    <sequence>
-      <element ref="gml:TopoSurface"/>
-    </sequence>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <element name="topoSurfaceProperty" type="gml:TopoSurfacePropertyType">
-    <annotation>
-      <documentation>The gml:topoSurfaceProperty property element may be used in features to express their relationship to the referenced topology faces.</documentation>
-    </annotation>
-  </element>
-  <complexType name="TopoVolumeType">
-    <complexContent>
-      <extension base="gml:AbstractTopologyType">
-        <sequence>
-          <element ref="gml:directedTopoSolid" maxOccurs="unbounded"/>
-        </sequence>
-        <attributeGroup ref="gml:AggregationAttributeGroup"/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <element name="TopoVolume" type="gml:TopoVolumeType">
-    <annotation>
-      <documentation>gml:TopoVolume represents a homogeneous topological expression, a set of directed topologic solids, which if realised are isomorphic to a geometric solid primitive. The intended use of gml:TopoVolume is to appear within a solid feature to express the structural and geometric relationships of this solid feature to other features via the shared solid definitions.</documentation>
-    </annotation>
-  </element>
-  <complexType name="TopoVolumePropertyType">
-    <sequence>
-      <element ref="gml:TopoVolume"/>
-    </sequence>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <element name="topoVolumeProperty" type="gml:TopoVolumePropertyType">
-    <annotation>
-      <documentation>The gml:topoVolumeProperty element may be used in features to express their relationship to the referenced topology volume.</documentation>
-    </annotation>
-  </element>
-  <complexType name="TopoComplexType">
-    <complexContent>
-      <extension base="gml:AbstractTopologyType">
-        <sequence>
-          <element ref="gml:maximalComplex"/>
-          <element ref="gml:superComplex" minOccurs="0" maxOccurs="unbounded"/>
-          <element ref="gml:subComplex" minOccurs="0" maxOccurs="unbounded"/>
-          <element ref="gml:topoPrimitiveMember" minOccurs="0" maxOccurs="unbounded"/>
-          <element ref="gml:topoPrimitiveMembers" minOccurs="0"/>
-        </sequence>
-        <attribute name="isMaximal" type="boolean" default="false"/>
-        <attributeGroup ref="gml:AggregationAttributeGroup"/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <element name="TopoComplex" type="gml:TopoComplexType" substitutionGroup="gml:AbstractTopology">
-    <annotation>
-      <documentation>gml:TopoComplex is a collection of topological primitives.
-Each complex holds a reference to its maximal complex (gml:maximalComplex) and optionally to sub- or super-complexes (gml:subComplex, gml:superComplex). 
-A topology complex contains its primitive and sub-complex members.
-</documentation>
-    </annotation>
-  </element>
-  <element name="subComplex" type="gml:TopoComplexPropertyType">
-    <annotation>
-      <documentation>The property elements gml:subComplex, gml:superComplex and gml:maximalComplex provide an encoding for relationships between topology complexes as described for gml:TopoComplex above.</documentation>
-    </annotation>
-  </element>
-  <element name="superComplex" type="gml:TopoComplexPropertyType">
-    <annotation>
-      <documentation>The property elements gml:subComplex, gml:superComplex and gml:maximalComplex provide an encoding for relationships between topology complexes as described for gml:TopoComplex above.</documentation>
-    </annotation>
-  </element>
-  <element name="maximalComplex" type="gml:TopoComplexPropertyType">
-    <annotation>
-      <documentation>The property elements gml:subComplex, gml:superComplex and gml:maximalComplex provide an encoding for relationships between topology complexes as described for gml:TopoComplex above.</documentation>
-    </annotation>
-  </element>
-  <element name="topoPrimitiveMember" type="gml:TopoPrimitiveMemberType">
-    <annotation>
-      <documentation>The gml:topoPrimitiveMember property element encodes for the relationship between a topology complex and a single topology primitive.</documentation>
-    </annotation>
-  </element>
-  <complexType name="TopoPrimitiveMemberType">
-    <sequence minOccurs="0">
-      <element ref="gml:AbstractTopoPrimitive"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <element name="topoPrimitiveMembers" type="gml:TopoPrimitiveArrayAssociationType">
-    <annotation>
-      <documentation>The gml:topoPrimitiveMembers property element encodes the relationship between a topology complex and an arbitrary number of topology primitives.</documentation>
-    </annotation>
-  </element>
-  <complexType name="TopoPrimitiveArrayAssociationType">
-    <sequence minOccurs="0" maxOccurs="unbounded">
-      <element ref="gml:AbstractTopoPrimitive"/>
-    </sequence>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <complexType name="TopoComplexPropertyType">
-    <sequence minOccurs="0">
-      <element ref="gml:TopoComplex"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/units.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/units.xsd
deleted file mode 100644
index b672893f6..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/units.xsd
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" xml:lang="en" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:units:3.2.1">units.xsd</appinfo>
-		<documentation>See ISO/DIS 17.2.
-Several GML Schema components concern or require a reference scale or units of measure.  Units are required for quantities that may occur as values of properties of feature types, as the results of observations, in the range parameters of a coverage, and for measures used in Coordinate Reference System definitions. 
-The basic unit definition is an extension of the general gml:Definition element defined in 16.2.1.  Three specialized elements for unit definition are further derived from this. 
-This model is based on the SI system of units [ISO 1000], which distinguishes between Base Units and Derived Units.  
--	Base Units are the preferred units for a set of orthogonal fundamental quantities which define the particular system of units, which may not be derived by combination of other base units.  
--	Derived Units are the preferred units for other quantities in the system, which may be defined by algebraic combination of the base units.  
-In some application areas Conventional units are used, which may be converted to the preferred units using a scaling factor or a formula which defines a re-scaling and offset.  The set of preferred units for all physical quantity types in a particular system of units is composed of the union of its base units and derived units.  
-Unit definitions are substitutable for the gml:Definition element declared as part of the dictionary model.  A dictionary that contains only unit definitions and references to unit definitions is a units dictionary.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="dictionary.xsd"/>
-	<element name="unitOfMeasure" type="gml:UnitOfMeasureType">
-		<annotation>
-			<documentation>The element gml:unitOfMeasure is a property element to refer to a unit of measure. This is an empty element which carries a reference to a unit of measure definition.</documentation>
-		</annotation>
-	</element>
-	<complexType name="UnitOfMeasureType">
-		<sequence/>
-		<attribute name="uom" type="gml:UomIdentifier" use="required"/>
-	</complexType>
-	<element name="UnitDefinition" type="gml:UnitDefinitionType" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>A gml:UnitDefinition is a general definition of a unit of measure. This generic element is used only for units for which no relationship with other units or units systems is known.
-The content model of gml:UnitDefinition adds three additional properties to gml:Definition, gml:quantityType, gml:quantityTypeReference and gml:catalogSymbol.  
-The gml:catalogSymbol property optionally gives the short symbol used for this unit. This element is usually used when the relationship of this unit to other units or units systems is unknown.</documentation>
-		</annotation>
-	</element>
-	<complexType name="UnitDefinitionType">
-		<complexContent>
-			<extension base="gml:DefinitionType">
-				<sequence>
-					<element ref="gml:quantityType" minOccurs="0"/>
-					<element ref="gml:quantityTypeReference" minOccurs="0"/>
-					<element ref="gml:catalogSymbol" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="quantityType" type="gml:StringOrRefType">
-		<annotation>
-			<documentation>The gml:quantityType property indicates the phenomenon to which the units apply. This element contains an informal description of the phenomenon or type of physical quantity that is measured or observed. When the physical quantity is the result of an observation or measurement, this term is known as observable type or measurand.
-The use of gml:quantityType for references to remote values is deprecated.</documentation>
-		</annotation>
-	</element>
-	<element name="quantityTypeReference" type="gml:ReferenceType">
-		<annotation>
-			<documentation>The gml:quantityTypeReference property indicates the phenomenon to which the units apply. The content is a reference to a remote value.</documentation>
-		</annotation>
-	</element>
-	<element name="catalogSymbol" type="gml:CodeType">
-		<annotation>
-			<documentation>The catalogSymbol is the preferred lexical symbol used for this unit of measure.
-The codeSpace attribute in gml:CodeType identifies a namespace for the catalog symbol value, and might reference the external catalog. The string value in gml:CodeType contains the value of a symbol that should be unique within this catalog namespace. This symbol often appears explicitly in the catalog, but it could be a combination of symbols using a specified algebra of units.</documentation>
-		</annotation>
-	</element>
-	<element name="BaseUnit" type="gml:BaseUnitType" substitutionGroup="gml:UnitDefinition">
-		<annotation>
-			<documentation>A base unit is a unit of measure that cannot be derived by combination of other base units within a particular system of units.  For example, in the SI system of units, the base units are metre, kilogram, second, Ampere, Kelvin, mole, and candela, for the physical quantity types length, mass, time interval, electric current, thermodynamic temperature, amount of substance and luminous intensity, respectively.
-gml:BaseUnit extends generic gml:UnitDefinition with the property gml:unitsSystem, which carries a reference to the units system to which this base unit is asserted to belong.  </documentation>
-		</annotation>
-	</element>
-	<complexType name="BaseUnitType">
-		<complexContent>
-			<extension base="gml:UnitDefinitionType">
-				<sequence>
-					<element name="unitsSystem" type="gml:ReferenceType"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="DerivedUnit" type="gml:DerivedUnitType" substitutionGroup="gml:UnitDefinition">
-		<annotation>
-			<documentation>Derived units are defined by combination of other units.  Derived units are used for quantities other than those corresponding to the base units, such as hertz (s-1) for frequency, Newton (kg.m/s2) for force.  Derived units based directly on base units are usually preferred for quantities other than the fundamental quantities within a system. If a derived unit is not the preferred unit, the gml:ConventionalUnit element should be used instead.
-The gml:DerivedUnit extends gml:UnitDefinition with the property gml:derivationUnitTerms.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DerivedUnitType">
-		<complexContent>
-			<extension base="gml:UnitDefinitionType">
-				<sequence>
-					<element ref="gml:derivationUnitTerm" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="derivationUnitTerm" type="gml:DerivationUnitTermType">
-		<annotation>
-			<documentation>A set of gml:derivationUnitTerm elements describes a derived unit of measure.  Each element carries an integer exponent.  The terms are combined by raising each referenced unit to the power of its exponent and forming the product.
-This unit term references another unit of measure (uom) and provides an integer exponent applied to that unit in defining the compound unit. The exponent may be positive or negative, but not zero.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DerivationUnitTermType">
-		<complexContent>
-			<extension base="gml:UnitOfMeasureType">
-				<attribute name="exponent" type="integer"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="ConventionalUnit" type="gml:ConventionalUnitType" substitutionGroup="gml:UnitDefinition">
-		<annotation>
-			<documentation>Conventional units that are neither base units nor defined by direct combination of base units are used in many application domains.  For example electronVolt for energy, feet and nautical miles for length.  In most cases there is a known, usually linear, conversion to a preferred unit which is either a base unit or derived by direct combination of base units.
-The gml:ConventionalUnit extends gml:UnitDefinition with a property that describes a conversion to a preferred unit for this physical quantity.  When the conversion is exact, the element gml:conversionToPreferredUnit should be used, or when the conversion is not exact the element gml:roughConversionToPreferredUnit is available. Both of these elements have the same content model.  The gml:derivationUnitTerm property defined above is included to allow a user to optionally record how this unit may be derived from other ("more primitive") units.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ConventionalUnitType">
-		<complexContent>
-			<extension base="gml:UnitDefinitionType">
-				<sequence>
-					<choice>
-						<element ref="gml:conversionToPreferredUnit"/>
-						<element ref="gml:roughConversionToPreferredUnit"/>
-					</choice>
-					<element ref="gml:derivationUnitTerm" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="conversionToPreferredUnit" type="gml:ConversionToPreferredUnitType">
-		<annotation>
-			<documentation>The elements gml:conversionToPreferredUnit and gml:roughConversionToPreferredUnit represent parameters used to convert conventional units to preferred units for this physical quantity type.  A preferred unit is either a Base Unit or a Derived Unit that is selected for all values of one physical quantity type.</documentation>
-		</annotation>
-	</element>
-	<element name="roughConversionToPreferredUnit" type="gml:ConversionToPreferredUnitType">
-		<annotation>
-			<documentation>The elements gml:conversionToPreferredUnit and gml:roughConversionToPreferredUnit represent parameters used to convert conventional units to preferred units for this physical quantity type.  A preferred unit is either a Base Unit or a Derived Unit that is selected for all values of one physical quantity type.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ConversionToPreferredUnitType">
-		<annotation>
-			<documentation>The inherited attribute uom references the preferred unit that this conversion applies to. The conversion of a unit to the preferred unit for this physical quantity type is specified by an arithmetic conversion (scaling and/or offset). The content model extends gml:UnitOfMeasureType, which has a mandatory attribute uom which identifies the preferred unit for the physical quantity type that this conversion applies to. The conversion is specified by a choice of 
--	gml:factor, which defines the scale factor, or
--	gml:formula, which defines a formula 
-by which a value using the conventional unit of measure can be converted to obtain the corresponding value using the preferred unit of measure.  
-The formula defines the parameters of a simple formula by which a value using the conventional unit of measure can be converted to the corresponding value using the preferred unit of measure. The formula element contains elements a, b, c and d, whose values use the XML Schema type double. These values are used in the formula y = (a + bx) / (c + dx), where x is a value using this unit, and y is the corresponding value using the base unit. The elements a and d are optional, and if values are not provided, those parameters are considered to be zero. If values are not provided for both a and d, the formula is equivalent to a fraction with numerator and denominator parameters.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:UnitOfMeasureType">
-				<choice>
-					<element name="factor" type="double"/>
-					<element name="formula" type="gml:FormulaType"/>
-				</choice>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="FormulaType">
-		<sequence>
-			<element name="a" type="double" minOccurs="0"/>
-			<element name="b" type="double"/>
-			<element name="c" type="double"/>
-			<element name="d" type="double" minOccurs="0"/>
-		</sequence>
-	</complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/valueObjects.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/valueObjects.xsd
deleted file mode 100644
index b1865fb6c..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-20070906/gml/3.2.1/valueObjects.xsd
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1 2010-01-28">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:valueObjects:3.2.1">valueObjects.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 17.5.
-The elements declared in this Clause build on other GML schema components, in particular gml:AbstractTimeObject, gml:AbstractGeometry, and the following types:  gml:MeasureType, gml:MeasureListType, gml:CodeType, gml:CodeOrNilReasonListType, gml:BooleanOrNilReasonListType, gml:IntegerOrNilReasonList.  
-Of particular interest are elements that are the heads of substitution groups, and one named choice group. These are the primary reasons for the value objects schema, since they may act as variables in the definition of content models, such as Observations, when it is desired to permit alternative value types to occur some of which may have complex content such as arrays, geometry and time objects, and where it is useful not to prescribe the actual value type in advance. The members of the groups include quantities, category classifications, boolean, count, temporal and spatial values, and aggregates of these.  
-The value objects are defined in a hierarchy. The following relationships are defined:
--	Concrete elements gml:Quantity, gml:Category, gml:Count and gml:Boolean are substitutable for the abstract element gml:AbstractScalarValue.  
--	Concrete elements gml:QuantityList, gml:CategoryList, gml:CountList and gml:BooleanList are substitutable for the abstract element gml:AbstractScalarValueList.  
--	Concrete element gml:ValueArray is substitutable for the concrete element gml:CompositeValue.  
--	Abstract elements gml:AbstractScalarValue and gml:AbstractScalarValueList, and concrete elements gml:CompositeValue, gml:ValueExtent, gml:CategoryExtent, gml:CountExtent and gml:QuantityExtent are substitutable for abstract element gml:AbstractValue.  
--	Abstract elements gml:AbstractValue, gml:AbstractTimeObject and gml:AbstractGeometry are all in a choice group named gml:Value, which is used for compositing in gml:CompositeValue and gml:ValueExtent.  
--	Schemas which need values may use the abstract element gml:AbstractValue in a content model in order to permit any of the gml:AbstractScalarValues, gml:AbstractScalarValueLists, gml:CompositeValue or gml:ValueExtent to occur in an instance, or the named group gml:Value to also permit gml:AbstractTimeObjects, gml:AbstractGeometrys.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium, Inc. All Rights Reserved.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="geometryBasic0d1d.xsd"/>
-	<include schemaLocation="temporal.xsd"/>
-	<element name="Boolean" substitutionGroup="gml:AbstractScalarValue" nillable="true">
-		<complexType>
-			<simpleContent>
-				<extension base="boolean">
-					<attribute name="nilReason" type="gml:NilReasonType"/>
-				</extension>
-			</simpleContent>
-		</complexType>
-	</element>
-	<element name="BooleanList" type="gml:booleanOrNilReasonList" substitutionGroup="gml:AbstractScalarValueList"/>
-	<element name="Category" substitutionGroup="gml:AbstractScalarValue" nillable="true">
-		<annotation>
-			<documentation>A gml:Category has an optional XML attribute codeSpace, whose value is a URI which identifies a dictionary, codelist or authority for the term.</documentation>
-		</annotation>
-		<complexType>
-			<simpleContent>
-				<extension base="gml:CodeType">
-					<attribute name="nilReason" type="gml:NilReasonType"/>
-				</extension>
-			</simpleContent>
-		</complexType>
-	</element>
-	<element name="CategoryList" type="gml:CodeOrNilReasonListType" substitutionGroup="gml:AbstractScalarValueList"/>
-	<element name="Count" substitutionGroup="gml:AbstractScalarValue" nillable="true">
-		<complexType>
-			<simpleContent>
-				<extension base="integer">
-					<attribute name="nilReason" type="gml:NilReasonType"/>
-				</extension>
-			</simpleContent>
-		</complexType>
-	</element>
-	<element name="CountList" type="gml:integerOrNilReasonList" substitutionGroup="gml:AbstractScalarValueList"/>
-	<element name="Quantity" substitutionGroup="gml:AbstractScalarValue" nillable="true">
-		<annotation>
-			<documentation>An XML attribute uom ("unit of measure") is required, whose value is a URI which identifies the definition of a ratio scale or units by which the numeric value shall be multiplied, or an interval or position scale on which the value occurs.</documentation>
-		</annotation>
-		<complexType>
-			<simpleContent>
-				<extension base="gml:MeasureType">
-					<attribute name="nilReason" type="gml:NilReasonType"/>
-				</extension>
-			</simpleContent>
-		</complexType>
-	</element>
-	<element name="QuantityList" type="gml:MeasureOrNilReasonListType" substitutionGroup="gml:AbstractScalarValueList"/>
-	<element name="AbstractValue" type="anyType" abstract="true" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>gml:AbstractValue is an abstract element which acts as the head of a substitution group which contains gml:AbstractScalarValue, gml:AbstractScalarValueList, gml:CompositeValue and gml:ValueExtent, and (transitively) the elements in their substitution groups.
-These elements may be used in an application schema as variables, so that in an XML instance document any member of its substitution group may occur.</documentation>
-		</annotation>
-	</element>
-	<element name="AbstractScalarValue" type="anyType" abstract="true" substitutionGroup="gml:AbstractValue">
-		<annotation>
-			<documentation>gml:AbstractScalarValue is an abstract element which acts as the head of a substitution group which contains gml:Boolean, gml:Category, gml:Count and gml:Quantity, and (transitively) the elements in their substitution groups.</documentation>
-		</annotation>
-	</element>
-	<element name="AbstractScalarValueList" type="anyType" abstract="true" substitutionGroup="gml:AbstractValue">
-		<annotation>
-			<documentation>gml:AbstractScalarValueList is an abstract element which acts as the head of a substitution group which contains gml:BooleanList, gml:CategoryList, gml:CountList and gml:QuantityList, and (transitively) the elements in their substitution groups.</documentation>
-		</annotation>
-	</element>
-	<group name="Value">
-		<annotation>
-			<documentation>This is a convenience choice group which unifies generic values defined in this Clause with spatial and temporal objects and the measures described above, so that any of these may be used within aggregate values.</documentation>
-		</annotation>
-		<choice>
-			<element ref="gml:AbstractValue"/>
-			<element ref="gml:AbstractGeometry"/>
-			<element ref="gml:AbstractTimeObject"/>
-			<element ref="gml:Null"/>
-		</choice>
-	</group>
-	<element name="valueProperty" type="gml:ValuePropertyType">
-		<annotation>
-			<documentation>Property that refers to, or contains, a Value. Convenience element for general use.</documentation>
-		</annotation>
-	</element>
-	<element name="valueComponent" type="gml:ValuePropertyType">
-		<annotation>
-			<documentation>Property that refers to, or contains, a Value.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ValuePropertyType">
-		<sequence minOccurs="0">
-			<group ref="gml:Value"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="valueComponents" type="gml:ValueArrayPropertyType">
-		<annotation>
-			<documentation>Property that contains Values.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ValueArrayPropertyType">
-		<sequence maxOccurs="unbounded">
-			<group ref="gml:Value"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="CompositeValue" type="gml:CompositeValueType" substitutionGroup="gml:AbstractValue">
-		<annotation>
-			<documentation>gml:CompositeValue is an aggregate value built from other values . It contains zero or an arbitrary number of gml:valueComponent elements, and zero or one gml:valueComponents property elements.  It may be used for strongly coupled aggregates (vectors, tensors) or for arbitrary collections of values.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CompositeValueType">
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<sequence>
-					<element ref="gml:valueComponent" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:valueComponents" minOccurs="0"/>
-				</sequence>
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="ValueArray" type="gml:ValueArrayType" substitutionGroup="gml:CompositeValue">
-		<annotation>
-			<documentation>A Value Array is used for homogeneous arrays of primitive and aggregate values.  
-The member values may be scalars, composites, arrays or lists.
-ValueArray has the same content model as CompositeValue, but the member values shall be homogeneous.  The element declaration contains a Schematron constraint which expresses this restriction precisely.  Since the members are homogeneous, the gml:referenceSystem (uom, codeSpace) may be specified on the gml:ValueArray itself and inherited by all the members if desired.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ValueArrayType">
-		<complexContent>
-			<extension base="gml:CompositeValueType">
-				<attributeGroup ref="gml:referenceSystem"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<attributeGroup name="referenceSystem">
-		<attribute name="codeSpace" type="anyURI"/>
-		<attribute name="uom" type="gml:UomIdentifier"/>
-	</attributeGroup>
-	<element name="CategoryExtent" type="gml:CategoryExtentType" substitutionGroup="gml:AbstractValue"/>
-	<complexType name="CategoryExtentType">
-		<simpleContent>
-			<restriction base="gml:CodeOrNilReasonListType">
-				<length value="2"/>
-			</restriction>
-		</simpleContent>
-	</complexType>
-	<element name="CountExtent" type="gml:CountExtentType" substitutionGroup="gml:AbstractValue"/>
-	<simpleType name="CountExtentType">
-		<restriction base="gml:integerOrNilReasonList">
-			<length value="2"/>
-		</restriction>
-	</simpleType>
-	<element name="QuantityExtent" type="gml:QuantityExtentType" substitutionGroup="gml:AbstractValue"/>
-	<complexType name="QuantityExtentType">
-		<simpleContent>
-			<restriction base="gml:MeasureOrNilReasonListType">
-				<length value="2"/>
-			</restriction>
-		</simpleContent>
-	</complexType>
-	<complexType name="BooleanPropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:Boolean"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<complexType name="CategoryPropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:Category"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<complexType name="QuantityPropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:Quantity"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<complexType name="CountPropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:Count"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-BROPROFILE/gml/3.2/gml-profile.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-BROPROFILE/gml/3.2/gml-profile.xsd
deleted file mode 100644
index 5593a8b02..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/GML321-BROPROFILE/gml/3.2/gml-profile.xsd
+++ /dev/null
@@ -1,432 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:xlink="http://www.w3.org/1999/xlink" 
-    xmlns:gml="http://www.opengis.net/gml/3.2" 
-    version="0.0.2-3.2.1" 
-    elementFormDefault="qualified" 
-    targetNamespace="http://www.opengis.net/gml/3.2">
-    <annotation>
-        <documentation>GML 3.2.1 profile for BRO.
-        Based on: gml:AbstractFeature, gml:ReferenceType, gml:PointPropertyType, gml:EnvelopeType, gml:MeasureType, gml:TimeInstantPropertyType, (gml:CodeWithAuthorityType)
-        0.0.2: anyURI toegevoegd aan TimePositionUnion</documentation>
-    </annotation>
-    <import namespace="http://www.w3.org/1999/xlink" schemaLocation="https://schema.broservices.nl/profile/xlink/1.0/xlink-profile.xsd"/><!-- was:http://www.broservices.nl/profile/xlink/1.0/xlink-profile.xsd -->
-    <!-- ================================================= -->
-    <element name="AbstractFeature" type="gml:AbstractFeatureType" abstract="true" substitutionGroup="gml:AbstractGML">
-    </element>
-    <!-- ================================================= -->
-    <complexType name="AbstractFeatureType" abstract="true">
-        <complexContent>
-            <extension base="gml:AbstractGMLType"/>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="FeaturePropertyType">
-        <sequence minOccurs="0">
-            <element ref="gml:AbstractFeature"/>
-        </sequence>
-        <attributeGroup ref="gml:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="AbstractGMLType" abstract="true">
-        <!-- refers to StandardObjectProperties. Currently not used. Only gml:id is used
-        <sequence>
-            <group ref="gml:StandardObjectProperties"/>
-        </sequence>
-        -->
-        <attribute ref="gml:id" use="required"/>
-    </complexType>
-    <!-- ================================================= -->
-    <!-- These elements are currently not used.
-         gml:identifier might be used in the future, but its usage is currently not foreseen.
-
-    <group name="StandardObjectProperties">
-        <sequence>
-            <element ref="gml:description" minOccurs="0"/>
-            <element ref="gml:descriptionReference" minOccurs="0"/>
-            <element ref="gml:identifier" minOccurs="0"/>
-            <element ref="gml:name" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-    </group>
-    -->
-    <!-- ================================================= -->
-    <attribute name="id" type="ID"/>
-    <!-- ================================================= -->
-    <element name="AbstractObject" abstract="true"/>
-    <!-- ================================================= -->
-    <attributeGroup name="AssociationAttributeGroup">
-        <attributeGroup ref="xlink:simpleAttrs"/>
-        <attribute name="nilReason" type="gml:NilReasonType"/>
-    </attributeGroup>
-    <!-- ================================================= -->
-    <simpleType name="NilReasonType">
-        <union memberTypes="gml:NilReasonEnumeration anyURI"/>
-    </simpleType>
-    <!-- ================================================= -->
-    <simpleType name="NilReasonEnumeration">
-        <union>
-            <simpleType>
-                <restriction base="string">
-                    <enumeration value="inapplicable"/>
-                    <enumeration value="missing"/>
-                    <enumeration value="template"/>
-                    <enumeration value="unknown"/>
-                    <enumeration value="withheld"/>
-                </restriction>
-            </simpleType>
-            <simpleType>
-                <restriction base="string">
-                    <pattern value="other:\w{2,}"/>
-                </restriction>
-            </simpleType>
-        </union>
-    </simpleType>
-    <!-- ================================================= -->
-    <!-- Is being referred to from StandardObjectProperties. Currently not used. Usage not foreseen.  
-    <element name="description" type="string"/>
-    -->
-    <!-- ================================================= -->
-    <!-- Is being referred to from StandardObjectProperties. Currently not used. Usage not foreseen.  
-    <element name="descriptionReference" type="gml:ReferenceType"/>
-    -->
-    <!-- ================================================= -->
-    <complexType name="ReferenceType">
-        <attributeGroup ref="gml:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <!-- TODO: currently included to allow validation of current examples
-    -->
-    <complexType name="CodeType">
-        <simpleContent>
-            <extension base="string">
-                <attribute name="codeSpace" type="anyURI"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-    <!-- ================================================= -->
-    <!-- Currently not needed
-    <element name="identifier" type="gml:CodeWithAuthorityType"/>
-    -->
-    <!-- ================================================= -->
-    <!-- Currently included to allow validation of current examples
-    -->
-    <complexType name="CodeWithAuthorityType">
-        <simpleContent>
-            <restriction base="gml:CodeType">
-                <attribute name="codeSpace" type="anyURI" use="required"/>
-            </restriction>
-        </simpleContent>
-    </complexType>
-    <!-- ================================================= -->
-    <!-- Name is currently not needed
-    <element name="name" type="gml:CodeType"/>
-    --> 
-    <!-- ================================================= -->
-    <element name="Envelope" type="gml:EnvelopeType" substitutionGroup="gml:AbstractObject"/>
-    <!-- ================================================= -->
-    <complexType name="EnvelopeType">
-        <sequence>
-            <element name="lowerCorner" type="gml:DirectPositionType"/>
-            <element name="upperCorner" type="gml:DirectPositionType"/>
-        </sequence>
-        <attributeGroup ref="gml:SRSReferenceGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="DirectPositionType">
-        <simpleContent>
-            <extension base="gml:doubleList"/>
-        </simpleContent>
-    </complexType>
-    <!-- ================================================= -->
-    <simpleType name="doubleList">
-        <list itemType="double"/>
-    </simpleType>
-    <!-- ================================================= -->
-    <attributeGroup name="SRSReferenceGroup">
-        <attribute name="srsName" type="anyURI"/>
-        <attribute name="srsDimension" type="positiveInteger"/>
-    </attributeGroup>
-    <!-- ================================================= -->
-    <simpleType name="NCNameList">
-        <list itemType="NCName"/>
-    </simpleType>
-    <!-- ================================================= -->
-    <element name="pos" type="gml:DirectPositionType"/>
-    <!-- ================================================= -->
-    <element name="AbstractGeometry" type="gml:AbstractGeometryType" abstract="true" substitutionGroup="gml:AbstractGML"/>
-    <!-- ================================================= -->
-    <complexType name="AbstractGeometryType" abstract="true">
-        <complexContent>
-            <extension base="gml:AbstractGMLType">
-                <attributeGroup ref="gml:SRSReferenceGroup"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="AbstractGML" type="gml:AbstractGMLType" abstract="true" substitutionGroup="gml:AbstractObject"/>
-    <!-- ================================================= -->
-    <complexType name="PointPropertyType">
-        <sequence>
-            <element ref="gml:Point"/>
-        </sequence>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="Point" type="gml:PointType" substitutionGroup="gml:AbstractGeometricPrimitive"/>
-    <!-- ================================================= -->
-    <complexType name="PointType">
-        <complexContent>
-            <extension base="gml:AbstractGeometricPrimitiveType">
-                <sequence>
-                    <element ref="gml:pos"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="AbstractGeometricPrimitiveType" abstract="true">
-        <complexContent>
-            <extension base="gml:AbstractGeometryType"/>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="AbstractGeometricPrimitive" type="gml:AbstractGeometricPrimitiveType" abstract="true" substitutionGroup="gml:AbstractGeometry"/>
-    <!-- ================================================= -->
-    <complexType name="MeasureType">
-        <simpleContent>
-            <extension base="double">
-                <attribute name="uom" type="gml:UomIdentifier" use="required"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-    <!-- ================================================= -->
-    <simpleType name="UomIdentifier">
-        <union memberTypes="gml:UomSymbol gml:UomURI"/>
-    </simpleType>
-    <!-- ================================================= -->
-    <simpleType name="UomSymbol">
-        <restriction base="string">
-            <pattern value="[^: \n\r\t]+"/>
-        </restriction>
-    </simpleType>
-    <!-- ================================================= -->
-    <simpleType name="UomURI">
-        <restriction base="anyURI">
-            <pattern value="([a-zA-Z][a-zA-Z0-9\-\+\.]*:|\.\./|\./|#).*"/>
-        </restriction>
-    </simpleType>
-    <!-- ================================================= -->
-    <element name="AbstractTimeObject" type="gml:AbstractTimeObjectType" abstract="true" substitutionGroup="gml:AbstractGML"/>
-    <!-- ================================================= -->
-    <complexType name="AbstractTimeObjectType" abstract="true">
-        <complexContent>
-            <extension base="gml:AbstractGMLType"/>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="AbstractTimePrimitive" type="gml:AbstractTimePrimitiveType" abstract="true" substitutionGroup="gml:AbstractTimeObject"/>
-    <!-- ================================================= -->
-    <complexType name="AbstractTimePrimitiveType" abstract="true">
-        <complexContent>
-            <extension base="gml:AbstractTimeObjectType"/>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="TimePrimitivePropertyType">
-        <sequence>
-            <element ref="gml:AbstractTimePrimitive"/>
-        </sequence>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="AbstractTimeGeometricPrimitive" type="gml:AbstractTimeGeometricPrimitiveType" abstract="true" substitutionGroup="gml:AbstractTimePrimitive"/>
-    <!-- ================================================= -->
-    <complexType name="AbstractTimeGeometricPrimitiveType" abstract="true">
-        <complexContent>
-            <extension base="gml:AbstractTimePrimitiveType">
-                <attribute name="frame" type="anyURI" default="#ISO-8601"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="TimeInstant" type="gml:TimeInstantType" substitutionGroup="gml:AbstractTimeGeometricPrimitive"/>
-    <!-- ================================================= -->
-    <complexType name="TimeInstantType" final="#all">
-        <complexContent>
-            <extension base="gml:AbstractTimeGeometricPrimitiveType">
-                <sequence>
-                    <element ref="gml:timePosition"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="TimeInstantPropertyType">
-        <sequence minOccurs="0">
-            <element ref="gml:TimeInstant"/>
-        </sequence>
-        <attributeGroup ref="gml:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="TimePeriod" type="gml:TimePeriodType" substitutionGroup="gml:AbstractTimeGeometricPrimitive"/>
-    <!-- ================================================= -->
-    <complexType name="TimePeriodType">
-        <complexContent>
-            <extension base="gml:AbstractTimeGeometricPrimitiveType">
-                <sequence>
-                    <element name="beginPosition" type="gml:TimePositionType"/>
-                    <element name="endPosition" type="gml:TimePositionType"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="TimePeriodPropertyType">
-        <sequence>
-            <element ref="gml:TimePeriod"/>
-        </sequence>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="TimePositionType" final="#all">
-        <simpleContent>
-            <extension base="gml:TimePositionUnion">
-                <attribute name="frame" type="anyURI" default="#ISO-8601"/>
-                <!-- Usage not foreseen
-                <attribute name="calendarEraName" type="string"/>
-                -->
-                <attribute name="indeterminatePosition" type="gml:TimeIndeterminateValueType"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-    <!-- ================================================= -->
-    <simpleType name="TimeIndeterminateValueType">
-        <restriction base="string">
-            <!-- Only the usage of "unknown" is foreseen for the BRO
-            <enumeration value="after"/>
-            <enumeration value="before"/>
-            <enumeration value="now"/>
-            -->
-            <enumeration value="unknown"/>
-        </restriction>
-    </simpleType>
-    <!-- ================================================= -->
-    <simpleType name="TimePositionUnion">
-        <!-- anyURI is added to facilitate an empty value in case the date is unknown
-        <union memberTypes="gml:CalDate time dateTime anyURI decimal"/> -->
-        <union memberTypes="gml:CalDate time dateTime anyURI "/>
-    </simpleType>
-    <!-- ================================================= -->
-    <simpleType name="CalDate">
-        <union memberTypes="date gYearMonth gYear"/>
-    </simpleType>
-    <!-- ================================================= -->
-    <element name="timePosition" type="gml:TimePositionType"/>
-    <!-- ================================================= -->
-    <complexType name="CurvePropertyType">
-        <sequence>
-            <element ref="gml:AbstractCurve"/>
-        </sequence>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="AbstractCurve" type="gml:AbstractCurveType" abstract="true" substitutionGroup="gml:AbstractGeometricPrimitive"/>
-    <!-- ================================================= -->
-    <complexType name="AbstractCurveType" abstract="true">
-        <complexContent>
-            <extension base="gml:AbstractGeometricPrimitiveType"/>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="SurfacePropertyType">
-        <sequence>
-            <element ref="gml:AbstractSurface"/>
-        </sequence>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="AbstractSurface" type="gml:AbstractSurfaceType" abstract="true" substitutionGroup="gml:AbstractGeometricPrimitive"/>
-    <!-- ================================================= -->
-    <complexType name="AbstractSurfaceType" abstract="true">
-        <complexContent>
-            <extension base="gml:AbstractGeometricPrimitiveType"/>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="LineString" type="gml:LineStringType" substitutionGroup="gml:AbstractCurve"/>
-    <!-- ================================================= -->
-    <complexType name="LineStringType">
-        <complexContent>
-            <extension base="gml:AbstractCurveType">
-                <sequence>
-                    <element ref="gml:posList"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="posList" type="gml:DirectPositionListType"/>
-    <!-- ================================================= -->
-    <complexType name="DirectPositionListType">
-        <simpleContent>
-            <extension base="gml:doubleList"/>
-        </simpleContent>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="Polygon" type="gml:PolygonType" substitutionGroup="gml:AbstractSurface"/>
-    <!-- ================================================= -->
-    <complexType name="PolygonType">
-        <complexContent>
-            <extension base="gml:AbstractSurfaceType">
-                <sequence>
-                    <element ref="gml:exterior" minOccurs="0"/>
-                    <element ref="gml:interior" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="exterior" type="gml:AbstractRingPropertyType"/>
-    <!-- ================================================= -->
-    <complexType name="AbstractRingPropertyType">
-        <sequence>
-            <element ref="gml:AbstractRing"/>
-        </sequence>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="AbstractRing" type="gml:AbstractRingType" abstract="true" substitutionGroup="gml:AbstractObject"/>
-    <!-- ================================================= -->
-    <complexType name="AbstractRingType" abstract="true">
-        <sequence/>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="interior" type="gml:AbstractRingPropertyType"/>
-    <!-- ================================================= -->
-    <element name="LinearRing" type="gml:LinearRingType" substitutionGroup="gml:AbstractRing"/>
-    <!-- ================================================= -->
-    <complexType name="LinearRingType">
-        <complexContent>
-            <extension base="gml:AbstractRingType">
-                <sequence>
-                    <element ref="gml:posList"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-<!-- BooleanPropertyType was used in earlier versions of CPT, but not used anymore
-    <complexType name="BooleanPropertyType">
-        <sequence minOccurs="0">
-            <element ref="gml:Boolean"/>
-        </sequence>
-        <attributeGroup ref="gml:AssociationAttributeGroup"/>
-    </complexType>
-    <element name="Boolean"  substitutionGroup="gml:AbstractScalarValue" nillable="true">
-        <complexType>
-            <simpleContent>
-                <extension base="boolean">
-                    <attribute name="nilReason" type="gml:NilReasonType"/>
-                </extension>
-            </simpleContent>
-        </complexType>
-    </element>
-    <element name="AbstractValue" type="anyType" abstract="true" substitutionGroup="gml:AbstractObject"/>
-    <element name="AbstractScalarValue" type="anyType" abstract="true" substitutionGroup="gml:AbstractValue"/>
--->
-    
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/GML322PROFILE-20200728/gml/3.2/ihw-gml.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/GML322PROFILE-20200728/gml/3.2/ihw-gml.xsd
new file mode 100644
index 000000000..a9d85bc89
--- /dev/null
+++ b/src/main/resources/input/IHW/xsd/www.opengis.net/GML322PROFILE-20200728/gml/3.2/ihw-gml.xsd
@@ -0,0 +1,851 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:xs="http://www.w3.org/2001/XMLSchema"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:gml="http://www.opengis.net/gml/3.2"
+        version="1.0.0-3.2.2"
+        elementFormDefault="qualified"
+        targetNamespace="http://www.opengis.net/gml/3.2">
+   <annotation>
+      <documentation>GML profile for Kadaster</documentation>
+   </annotation>
+   <import namespace="http://www.w3.org/1999/xlink"
+           schemaLocation="../../xlink/1.0.0/xlinks.xsd"/>
+   <element name="AbstractCurve"
+            type="gml:AbstractCurveType"
+            abstract="true"
+            substitutionGroup="gml:AbstractGeometricPrimitive">
+      <annotation>
+         <documentation>The AbstractCurve element is the abstract head of the substitution group for all (continuous) curve elements.</documentation>
+      </annotation>
+   </element>
+   <element name="AbstractCurveSegment"
+            type="gml:AbstractCurveSegmentType"
+            abstract="true"
+            substitutionGroup="gml:AbstractObject">
+      <annotation>
+         <documentation>A curve segment defines a homogeneous segment of a curve.
+The attributes numDerivativesAtStart, numDerivativesAtEnd and numDerivativesInterior specify the type of continuity as specified in ISO 19107:2003, 6.4.9.3.
+The AbstractCurveSegment element is the abstract head of the substituition group for all curve segment elements, i.e. continuous segments of the same interpolation mechanism.
+All curve segments shall have an attribute interpolation with type gml:CurveInterpolationType specifying the curve interpolation mechanism used for this segment. This mechanism uses the control points and control parameters to determine the position of this curve segment.</documentation>
+      </annotation>
+   </element>
+   <complexType name="AbstractCurveSegmentType" abstract="true">
+      <attribute name="numDerivativesAtStart" type="integer" default="0"/>
+      <attribute name="numDerivativesAtEnd" type="integer" default="0"/>
+      <attribute name="numDerivativeInterior" type="integer" default="0"/>
+   </complexType>
+   <complexType name="AbstractCurveType" abstract="true">
+      <annotation>
+         <documentation>gml:AbstractCurveType is an abstraction of a curve to support the different levels of complexity. The curve may always be viewed as a geometric primitive, i.e. is continuous.</documentation>
+      </annotation>
+      <complexContent>
+         <extension base="gml:AbstractGeometricPrimitiveType"/>
+      </complexContent>
+   </complexType>
+   <complexType name="AbstractFeatureType" abstract="true">
+      <annotation>
+         <documentation>The basic feature model is given by the gml:AbstractFeatureType.
+            The content model for gml:AbstractFeatureType adds two specific properties suitable for geographic features to the content model defined in gml:AbstractGMLType. 
+            The value of the gml:boundedBy property describes an envelope that encloses the entire feature instance, and is primarily useful for supporting rapid searching for features that occur in a particular location. 
+            The value of the gml:location property describes the extent, position or relative location of the feature.</documentation>
+      </annotation>
+      <complexContent>
+         <extension base="gml:AbstractGMLType">
+            <sequence>
+               <!-- TODO toevoegen?
+               <element ref="gml:boundedBy" minOccurs="0"/>
+               <element ref="gml:location" minOccurs="0"/>
+               -->
+            </sequence>
+         </extension>
+      </complexContent>
+   </complexType>
+   <element name="AbstractFeature" type="gml:AbstractFeatureType" abstract="true" substitutionGroup="gml:AbstractGML">
+      <annotation>
+         <documentation>This abstract element serves as the head of a substitution group which may contain any elements whose content model is derived from gml:AbstractFeatureType.  This may be used as a variable in the construction of content models.  
+            gml:AbstractFeature may be thought of as "anything that is a GML feature" and may be used to define variables or templates in which the value of a GML property is "any feature". This occurs in particular in a GML feature collection where the feature member properties contain one or multiple copies of gml:AbstractFeature respectively.</documentation>
+      </annotation>
+   </element>
+   <element name="AbstractGML"
+            type="gml:AbstractGMLType"
+            abstract="true"
+            substitutionGroup="gml:AbstractObject">
+      <annotation>
+         <documentation>The abstract element gml:AbstractGML is "any GML object having identity".   It acts as the head of an XML Schema substitution group, which may include any element which is a GML feature, or other object, with identity.  This is used as a variable in content models in GML core and application schemas.  It is effectively an abstract superclass for all GML objects.</documentation>
+      </annotation>
+   </element>
+   <complexType name="AbstractGMLType" abstract="true">
+      <sequence>
+         <group ref="gml:StandardObjectProperties"/>
+      </sequence>
+      <attribute ref="gml:id"/>
+   </complexType>
+   <element name="AbstractGeometricAggregate"
+            type="gml:AbstractGeometricAggregateType"
+            abstract="true"
+            substitutionGroup="gml:AbstractGeometry">
+      <annotation>
+         <documentation>gml:AbstractGeometricAggregate is the abstract head of the substitution group for all geometric aggregates.</documentation>
+      </annotation>
+   </element>
+   <complexType name="AbstractGeometricAggregateType" abstract="true">
+      <complexContent>
+         <extension base="gml:AbstractGeometryType">
+            <attributeGroup ref="gml:AggregationAttributeGroup"/>
+         </extension>
+      </complexContent>
+   </complexType>
+   <element name="AbstractGeometricPrimitive"
+            type="gml:AbstractGeometricPrimitiveType"
+            abstract="true"
+            substitutionGroup="gml:AbstractGeometry">
+      <annotation>
+         <documentation>The AbstractGeometricPrimitive element is the abstract head of the substitution group for all (pre- and user-defined) geometric primitives.</documentation>
+      </annotation>
+   </element>
+   <complexType name="AbstractGeometricPrimitiveType" abstract="true">
+      <annotation>
+         <documentation>gml:AbstractGeometricPrimitiveType is the abstract root type of the geometric primitives. A geometric primitive is a geometric object that is not decomposed further into other primitives in the system. All primitives are oriented in the direction implied by the sequence of their coordinate tuples.</documentation>
+      </annotation>
+      <complexContent>
+         <extension base="gml:AbstractGeometryType"/>
+      </complexContent>
+   </complexType>
+   <element name="AbstractGeometry"
+            type="gml:AbstractGeometryType"
+            abstract="true"
+            substitutionGroup="gml:AbstractGML">
+      <annotation>
+         <documentation>The AbstractGeometry element is the abstract head of the substitution group for all geometry elements of GML. This includes pre-defined and user-defined geometry elements. Any geometry element shall be a direct or indirect extension/restriction of AbstractGeometryType and shall be directly or indirectly in the substitution group of AbstractGeometry.</documentation>
+      </annotation>
+   </element>
+   <complexType name="AbstractGeometryType" abstract="true">
+      <annotation>
+         <documentation>All geometry elements are derived directly or indirectly from this abstract supertype. A geometry element may have an identifying attribute (gml:id), one or more names (elements identifier and name) and a description (elements description and descriptionReference) . It may be associated with a spatial reference system (attribute group gml:SRSReferenceGroup).
+The following rules shall be adhered to:
+-	Every geometry type shall derive from this abstract type.
+-	Every geometry element (i.e. an element of a geometry type) shall be directly or indirectly in the substitution group of AbstractGeometry.</documentation>
+      </annotation>
+      <complexContent>
+         <extension base="gml:AbstractGMLType">
+            <attributeGroup ref="gml:SRSReferenceGroup"/>
+         </extension>
+      </complexContent>
+   </complexType>
+   <element name="AbstractMetaData"
+            type="gml:AbstractMetaDataType"
+            abstract="true"
+            substitutionGroup="gml:AbstractObject">
+      <annotation>
+         <appinfo>deprecated</appinfo>
+      </annotation>
+   </element>
+   <complexType name="AbstractMetaDataType" abstract="true" mixed="true">
+      <annotation>
+         <appinfo>deprecated</appinfo>
+      </annotation>
+      <sequence/>
+      <attribute ref="gml:id"/>
+   </complexType>
+   <element name="AbstractObject" abstract="true">
+      <annotation>
+         <documentation>This element has no type defined, and is therefore implicitly (according to the rules of W3C XML Schema) an XML Schema anyType. It is used as the head of an XML Schema substitution group which unifies complex content and certain simple content elements used for datatypes in GML, including the gml:AbstractGML substitution group.</documentation>
+      </annotation>
+   </element>
+   <element name="AbstractRing"
+            type="gml:AbstractRingType"
+            abstract="true"
+            substitutionGroup="gml:AbstractCurve">
+      <annotation>
+         <documentation>An abstraction of a ring to support surface boundaries of different complexity.
+The AbstractRing element is the abstract head of the substituition group for all closed boundaries of a surface patch.</documentation>
+      </annotation>
+   </element>
+   <complexType name="AbstractRingPropertyType">
+      <annotation>
+         <documentation>A property with the content model of gml:AbstractRingPropertyType encapsulates a ring to represent the surface boundary property of a surface.</documentation>
+      </annotation>
+      <sequence>
+         <element ref="gml:AbstractRing"/>
+      </sequence>
+   </complexType>
+   <complexType name="AbstractRingType" abstract="true">
+      <complexContent>
+         <extension base="gml:AbstractCurveType">
+            <sequence/>
+         </extension>
+      </complexContent>
+   </complexType>
+   <element name="AbstractSurface"
+            type="gml:AbstractSurfaceType"
+            abstract="true"
+            substitutionGroup="gml:AbstractGeometricPrimitive">
+      <annotation>
+         <documentation>The AbstractSurface element is the abstract head of the substitution group for all (continuous) surface elements.</documentation>
+      </annotation>
+   </element>
+   <element name="AbstractSurfacePatch"
+            type="gml:AbstractSurfacePatchType"
+            abstract="true">
+      <annotation>
+         <documentation>A surface patch defines a homogenuous portion of a surface. 
+The AbstractSurfacePatch element is the abstract head of the substituition group for all surface patch elements describing a continuous portion of a surface.
+All surface patches shall have an attribute interpolation (declared in the types derived from gml:AbstractSurfacePatchType) specifying the interpolation mechanism used for the patch using gml:SurfaceInterpolationType.</documentation>
+      </annotation>
+   </element>
+   <complexType name="AbstractSurfacePatchType" abstract="true"/>
+   <complexType name="AbstractSurfaceType" abstract="true">
+      <annotation>
+         <documentation>gml:AbstractSurfaceType is an abstraction of a surface to support the different levels of complexity. A surface is always a continuous region of a plane.</documentation>
+      </annotation>
+      <complexContent>
+         <extension base="gml:AbstractGeometricPrimitiveType"/>
+      </complexContent>
+   </complexType>
+   <attributeGroup name="AggregationAttributeGroup">
+      <annotation>
+         <documentation>A GML Object Collection is any GML Object with a property element in its content model whose content model is derived by extension from gml:AbstractMemberType.
+In addition, the complex type describing the content model of the GML Object Collection may also include a reference to the attribute group gml:AggregationAttributeGroup to provide additional information about the semantics of the object collection.  This information may be used by applications to group GML objects, and optionally to order and index them.
+The allowed values for the aggregationType attribute are defined by gml:AggregationType. See 8.4 of ISO/IEC 11404:1996 for the meaning of the values in the enumeration.</documentation>
+      </annotation>
+      <attribute name="aggregationType" type="gml:AggregationType"/>
+   </attributeGroup>
+   <simpleType name="AggregationType" final="#all">
+      <restriction base="string">
+         <enumeration value="set"/>
+         <enumeration value="bag"/>
+         <enumeration value="sequence"/>
+         <enumeration value="array"/>
+         <enumeration value="record"/>
+         <enumeration value="table"/>
+      </restriction>
+   </simpleType>
+   <attributeGroup name="AssociationAttributeGroup">
+      <annotation>
+         <documentation>XLink components are the standard method to support hypertext referencing in XML. An XML Schema attribute group, gml:AssociationAttributeGroup, is provided to support the use of Xlinks as the method for indicating the value of a property by reference in a uniform manner in GML.</documentation>
+      </annotation>
+      <attributeGroup ref="xlink:simpleAttrs"/>
+      <attribute name="nilReason" type="gml:NilReasonType"/>
+      <attribute ref="gml:remoteSchema">
+         <annotation>
+            <appinfo>deprecated</appinfo>
+         </annotation>
+      </attribute>
+   </attributeGroup>
+   <complexType name="CodeType">
+      <annotation>
+         <documentation>gml:CodeType is a generalized type to be used for a term, keyword or name.
+It adds a XML attribute codeSpace to a term, where the value of the codeSpace attribute (if present) shall indicate a dictionary, thesaurus, classification scheme, authority, or pattern for the term.</documentation>
+      </annotation>
+      <simpleContent>
+         <extension base="string">
+            <attribute name="codeSpace" type="anyURI"/>
+         </extension>
+      </simpleContent>
+   </complexType>
+   <complexType name="CodeWithAuthorityType">
+      <annotation>
+         <documentation>gml:CodeWithAuthorityType requires that the codeSpace attribute is provided in an instance.</documentation>
+      </annotation>
+      <simpleContent>
+         <restriction base="gml:CodeType">
+            <attribute name="codeSpace" type="anyURI" use="required"/>
+         </restriction>
+      </simpleContent>
+   </complexType>
+   <complexType name="CoordinatesType">
+      <annotation>
+         <documentation>This type is deprecated for tuples with ordinate values that are numbers.
+CoordinatesType is a text string, intended to be used to record an array of tuples or coordinates. 
+While it is not possible to enforce the internal structure of the string through schema validation, some optional attributes have been provided in previous versions of GML to support a description of the internal structure. These attributes are deprecated. The attributes were intended to be used as follows:
+Decimal	symbol used for a decimal point (default="." a stop or period)
+cs        	symbol used to separate components within a tuple or coordinate string (default="," a comma)
+ts        	symbol used to separate tuples or coordinate strings (default=" " a space)
+Since it is based on the XML Schema string type, CoordinatesType may be used in the construction of tables of tuples or arrays of tuples, including ones that contain mixed text and numeric values.</documentation>
+      </annotation>
+      <simpleContent>
+         <extension base="string">
+            <attribute name="decimal" type="string" default="."/>
+            <attribute name="cs" type="string" default=","/>
+            <attribute name="ts" type="string" default=" "/>
+         </extension>
+      </simpleContent>
+   </complexType>
+   <element name="Curve"
+            type="gml:CurveType"
+            substitutionGroup="gml:AbstractCurve">
+      <annotation>
+         <documentation>A curve is a 1-dimensional primitive. Curves are continuous, connected, and have a measurable length in terms of the coordinate system. 
+A curve is composed of one or more curve segments. Each curve segment within a curve may be defined using a different interpolation method. The curve segments are connected to one another, with the end point of each segment except the last being the start point of the next segment in the segment list.
+The orientation of the curve is positive.
+The element segments encapsulates the segments of the curve.</documentation>
+      </annotation>
+   </element>
+   <complexType name="CurveArrayPropertyType">
+      <annotation>
+         <documentation>A container for an array of curves. The elements are always contained in the array property, referencing geometry elements or arrays of geometry elements via XLinks is not supported.</documentation>
+      </annotation>
+      <sequence minOccurs="0" maxOccurs="unbounded">
+         <element ref="gml:AbstractCurve"/>
+      </sequence>
+      <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+   </complexType>
+   <complexType name="CurvePropertyType">
+      <annotation>
+         <documentation>A property that has a curve as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
+      </annotation>
+      <sequence minOccurs="0">
+         <element ref="gml:AbstractCurve"/>
+      </sequence>
+      <attributeGroup ref="gml:AssociationAttributeGroup"/>
+      <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+   </complexType>
+   <complexType name="CurveSegmentArrayPropertyType">
+      <annotation>
+         <documentation>gml:CurveSegmentArrayPropertyType is a container for an array of curve segments.</documentation>
+      </annotation>
+      <sequence minOccurs="0" maxOccurs="unbounded">
+         <element ref="gml:AbstractCurveSegment"/>
+      </sequence>
+   </complexType>
+   <complexType name="CurveType">
+      <complexContent>
+         <extension base="gml:AbstractCurveType">
+            <sequence>
+               <element ref="gml:segments"/>
+            </sequence>
+         </extension>
+      </complexContent>
+   </complexType>
+   <complexType name="DirectPositionListType">
+      <annotation>
+         <documentation>posList instances (and other instances with the content model specified by DirectPositionListType) hold the coordinates for a sequence of direct positions within the same coordinate reference system (CRS).
+if no srsName attribute is given, the CRS shall be specified as part of the larger context this geometry element is part of, typically a geometric object like a point, curve, etc. 
+The optional attribute count specifies the number of direct positions in the list. If the attribute count is present then the attribute srsDimension shall be present, too.
+The number of entries in the list is equal to the product of the dimensionality of the coordinate reference system (i.e. it is a derived value of the coordinate reference system definition) and the number of direct positions.</documentation>
+      </annotation>
+      <simpleContent>
+         <extension base="gml:doubleList">
+            <attributeGroup ref="gml:SRSReferenceGroup"/>
+            <attribute name="count" type="positiveInteger"/>
+         </extension>
+      </simpleContent>
+   </complexType>
+   <complexType name="DirectPositionType">
+      <annotation>
+         <documentation>Direct position instances hold the coordinates for a position within some coordinate reference system (CRS). Since direct positions, as data types, will often be included in larger objects (such as geometry elements) that have references to CRS, the srsName attribute will in general be missing, if this particular direct position is included in a larger element with such a reference to a CRS. In this case, the CRS is implicitly assumed to take on the value of the containing object's CRS.
+if no srsName attribute is given, the CRS shall be specified as part of the larger context this geometry element is part of, typically a geometric object like a point, curve, etc.</documentation>
+      </annotation>
+      <simpleContent>
+         <extension base="gml:doubleList">
+            <attributeGroup ref="gml:SRSReferenceGroup"/>
+         </extension>
+      </simpleContent>
+   </complexType>
+   <element name="LineString"
+            type="gml:LineStringType"
+            substitutionGroup="gml:AbstractCurve">
+      <annotation>
+         <documentation>A LineString is a special curve that consists of a single segment with linear interpolation. It is defined by two or more coordinate tuples, with linear interpolation between them. The number of direct positions in the list shall be at least two.</documentation>
+      </annotation>
+   </element>
+   <complexType name="LineStringType">
+      <complexContent>
+         <extension base="gml:AbstractCurveType">
+            <sequence>
+               <choice>
+                  <choice minOccurs="2" maxOccurs="unbounded">
+                     <element ref="gml:pos"/>
+                     <element ref="gml:pointProperty"/>
+                     <element ref="gml:pointRep"/>
+                  </choice>
+                  <element ref="gml:posList"/>
+                  <element ref="gml:coordinates"/>
+               </choice>
+            </sequence>
+         </extension>
+      </complexContent>
+   </complexType>
+   <element name="LinearRing"
+            type="gml:LinearRingType"
+            substitutionGroup="gml:AbstractRing">
+      <annotation>
+         <documentation>A LinearRing is defined by four or more coordinate tuples, with linear interpolation between them; the first and last coordinates shall be coincident. The number of direct positions in the list shall be at least four.</documentation>
+      </annotation>
+   </element>
+   <complexType name="LinearRingPropertyType">
+      <annotation>
+         <documentation>A property with the content model of gml:LinearRingPropertyType encapsulates a linear ring to represent a component of a surface boundary.</documentation>
+      </annotation>
+      <sequence>
+         <element ref="gml:LinearRing"/>
+      </sequence>
+   </complexType>
+   <complexType name="LinearRingType">
+      <complexContent>
+         <extension base="gml:AbstractRingType">
+            <sequence>
+               <choice>
+                  <choice minOccurs="4" maxOccurs="unbounded">
+                     <element ref="gml:pos"/>
+                     <element ref="gml:pointProperty"/>
+                     <element ref="gml:pointRep"/>
+                  </choice>
+                  <element ref="gml:posList"/>
+                  <element ref="gml:coordinates"/>
+               </choice>
+            </sequence>
+         </extension>
+      </complexContent>
+   </complexType>
+   <complexType name="MetaDataPropertyType">
+      <annotation>
+         <appinfo>deprecated</appinfo>
+      </annotation>
+      <sequence minOccurs="0">
+         <element ref="gml:AbstractMetaData"/>
+      </sequence>
+      <attributeGroup ref="gml:AssociationAttributeGroup"/>
+      <attribute name="about" type="anyURI"/>
+   </complexType>
+   <element name="MultiCurve"
+            type="gml:MultiCurveType"
+            substitutionGroup="gml:AbstractGeometricAggregate">
+      <annotation>
+         <documentation>A gml:MultiCurve is defined by one or more gml:AbstractCurves.
+The members of the geometric aggregate may be specified either using the "standard" property (gml:curveMember) or the array property (gml:curveMembers). It is also valid to use both the "standard" and the array properties in the same collection.</documentation>
+      </annotation>
+   </element>
+   <complexType name="MultiCurvePropertyType">
+      <annotation>
+         <documentation>A property that has a collection of curves as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
+      </annotation>
+      <sequence minOccurs="0">
+         <element ref="gml:MultiCurve"/>
+      </sequence>
+      <attributeGroup ref="gml:AssociationAttributeGroup"/>
+      <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+   </complexType>
+   <complexType name="MultiCurveType">
+      <complexContent>
+         <extension base="gml:AbstractGeometricAggregateType">
+            <sequence>
+               <element ref="gml:curveMember" minOccurs="0" maxOccurs="unbounded"/>
+               <element ref="gml:curveMembers" minOccurs="0"/>
+            </sequence>
+         </extension>
+      </complexContent>
+   </complexType>
+   <element name="MultiPoint"
+            type="gml:MultiPointType"
+            substitutionGroup="gml:AbstractGeometricAggregate">
+      <annotation>
+         <documentation>A gml:MultiPoint consists of one or more gml:Points.
+The members of the geometric aggregate may be specified either using the "standard" property (gml:pointMember) or the array property (gml:pointMembers). It is also valid to use both the "standard" and the array properties in the same collection.</documentation>
+      </annotation>
+   </element>
+   <complexType name="MultiPointPropertyType">
+      <annotation>
+         <documentation>A property that has a collection of points as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
+      </annotation>
+      <sequence minOccurs="0">
+         <element ref="gml:MultiPoint"/>
+      </sequence>
+      <attributeGroup ref="gml:AssociationAttributeGroup"/>
+      <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+   </complexType>
+   <complexType name="MultiPointType">
+      <complexContent>
+         <extension base="gml:AbstractGeometricAggregateType">
+            <sequence>
+               <element ref="gml:pointMember" minOccurs="0" maxOccurs="unbounded"/>
+               <element ref="gml:pointMembers" minOccurs="0"/>
+            </sequence>
+         </extension>
+      </complexContent>
+   </complexType>
+   <element name="MultiSurface"
+            type="gml:MultiSurfaceType"
+            substitutionGroup="gml:AbstractGeometricAggregate">
+      <annotation>
+         <documentation>A gml:MultiSurface is defined by one or more gml:AbstractSurfaces.
+The members of the geometric aggregate may be specified either using the "standard" property (gml:surfaceMember) or the array property (gml:surfaceMembers). It is also valid to use both the "standard" and the array properties in the same collection.</documentation>
+      </annotation>
+   </element>
+   <complexType name="MultiSurfacePropertyType">
+      <annotation>
+         <documentation>A property that has a collection of surfaces as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
+      </annotation>
+      <sequence minOccurs="0">
+         <element ref="gml:MultiSurface"/>
+      </sequence>
+      <attributeGroup ref="gml:AssociationAttributeGroup"/>
+      <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+   </complexType>
+   <complexType name="MultiSurfaceType">
+      <complexContent>
+         <extension base="gml:AbstractGeometricAggregateType">
+            <sequence>
+               <element ref="gml:surfaceMember" minOccurs="0" maxOccurs="unbounded"/>
+               <element ref="gml:surfaceMembers" minOccurs="0"/>
+            </sequence>
+         </extension>
+      </complexContent>
+   </complexType>
+   <simpleType name="NCNameList">
+      <annotation>
+         <documentation>A type for a list of values of the respective simple type.</documentation>
+      </annotation>
+      <list itemType="NCName"/>
+   </simpleType>
+   <simpleType name="NilReasonEnumeration">
+      <union>
+         <simpleType>
+            <restriction base="string">
+               <enumeration value="inapplicable"/>
+               <enumeration value="missing"/>
+               <enumeration value="template"/>
+               <enumeration value="unknown"/>
+               <enumeration value="withheld"/>
+            </restriction>
+         </simpleType>
+         <simpleType>
+            <restriction base="string">
+               <pattern value="other:\w{2,}"/>
+            </restriction>
+         </simpleType>
+      </union>
+   </simpleType>
+   <simpleType name="NilReasonType">
+      <annotation>
+         <documentation>gml:NilReasonType defines a content model that allows recording of an explanation for a void value or other exception.
+gml:NilReasonType is a union of the following enumerated values:
+-	inapplicable there is no value
+-	missing the correct value is not readily available to the sender of this data. Furthermore, a correct value may not exist
+-	template the value will be available later
+-	unknown the correct value is not known to, and not computable by, the sender of this data. However, a correct value probably exists
+-	withheld the value is not divulged
+-	other:text other brief explanation, where text is a string of two or more characters with no included spaces
+and
+-	anyURI which should refer to a resource which describes the reason for the exception
+A particular community may choose to assign more detailed semantics to the standard values provided. Alternatively, the URI method enables a specific or more complete explanation for the absence of a value to be provided elsewhere and indicated by-reference in an instance document.
+gml:NilReasonType is used as a member of a union in a number of simple content types where it is necessary to permit a value from the NilReasonType union as an alternative to the primary type.</documentation>
+      </annotation>
+      <union memberTypes="gml:NilReasonEnumeration anyURI"/>
+   </simpleType>
+   <attributeGroup name="OwnershipAttributeGroup">
+      <annotation>
+         <documentation>Encoding a GML property inline vs. by-reference shall not imply anything about the "ownership" of the contained or referenced GML Object, i.e. the encoding style shall not imply any "deep-copy" or "deep-delete" semantics. To express ownership over the contained or referenced GML Object, the gml:OwnershipAttributeGroup attribute group may be added to object-valued property elements. If the attribute group is not part of the content model of such a property element, then the value may not be "owned".
+When the value of the owns attribute is "true", the existence of inline or referenced object(s) depends upon the existence of the parent object.</documentation>
+      </annotation>
+      <attribute name="owns" type="boolean" default="false"/>
+   </attributeGroup>
+   <element name="Point"
+            type="gml:PointType"
+            substitutionGroup="gml:AbstractGeometricPrimitive">
+      <annotation>
+         <documentation>A Point is defined by a single coordinate tuple. The direct position of a point is specified by the pos element which is of type DirectPositionType.</documentation>
+      </annotation>
+   </element>
+   <complexType name="PointArrayPropertyType">
+      <annotation>
+         <documentation>gml:PointArrayPropertyType is a container for an array of points. The elements are always contained inline in the array property, referencing geometry elements or arrays of geometry elements via XLinks is not supported.</documentation>
+      </annotation>
+      <sequence minOccurs="0" maxOccurs="unbounded">
+         <element ref="gml:Point"/>
+      </sequence>
+      <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+   </complexType>
+   <complexType name="PointPropertyType">
+      <annotation>
+         <documentation>A property that has a point as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
+      </annotation>
+      <sequence minOccurs="0">
+         <element ref="gml:Point"/>
+      </sequence>
+      <attributeGroup ref="gml:AssociationAttributeGroup"/>
+      <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+   </complexType>
+   <complexType name="PointType">
+      <complexContent>
+         <extension base="gml:AbstractGeometricPrimitiveType">
+            <sequence>
+               <choice>
+                  <element ref="gml:pos"/>
+                  <element ref="gml:coordinates"/>
+               </choice>
+            </sequence>
+         </extension>
+      </complexContent>
+   </complexType>
+   <element name="Polygon"
+            type="gml:PolygonType"
+            substitutionGroup="gml:AbstractSurface">
+      <annotation>
+         <documentation>A Polygon is a special surface that is defined by a single surface patch (see D.3.6). The boundary of this patch is coplanar and the polygon uses planar interpolation in its interior. 
+The elements exterior and interior describe the surface boundary of the polygon.</documentation>
+      </annotation>
+   </element>
+   <element name="PolygonPatch"
+            type="gml:PolygonPatchType"
+            substitutionGroup="gml:AbstractSurfacePatch">
+      <annotation>
+         <documentation>A gml:PolygonPatch is a surface patch that is defined by a set of boundary curves and an underlying surface to which these curves adhere. The curves shall be coplanar and the polygon uses planar interpolation in its interior. 
+interpolation is fixed to "planar", i.e. an interpolation shall return points on a single plane. The boundary of the patch shall be contained within that plane.</documentation>
+      </annotation>
+   </element>
+   <complexType name="PolygonPatchType">
+      <complexContent>
+         <extension base="gml:AbstractSurfacePatchType">
+            <sequence>
+               <element ref="gml:exterior" minOccurs="0"/>
+               <element ref="gml:interior" minOccurs="0" maxOccurs="unbounded"/>
+            </sequence>
+            <attribute name="interpolation"
+                       type="gml:SurfaceInterpolationType"
+                       fixed="planar"/>
+         </extension>
+      </complexContent>
+   </complexType>
+   <complexType name="PolygonType">
+      <complexContent>
+         <extension base="gml:AbstractSurfaceType">
+            <sequence>
+               <element ref="gml:exterior" minOccurs="0"/>
+               <element ref="gml:interior" minOccurs="0" maxOccurs="unbounded"/>
+            </sequence>
+         </extension>
+      </complexContent>
+   </complexType>
+   <complexType name="ReferenceType">
+      <annotation>
+         <documentation>gml:ReferenceType is intended to be used in application schemas directly, if a property element shall use a "by-reference only" encoding.</documentation>
+      </annotation>
+      <sequence/>
+      <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+      <attributeGroup ref="gml:AssociationAttributeGroup"/>
+   </complexType>
+   <attributeGroup name="SRSInformationGroup">
+      <annotation>
+         <documentation>The attributes uomLabels and axisLabels, defined in the SRSInformationGroup attribute group, are optional additional and redundant information for a CRS to simplify the processing of the coordinate values when a more complete definition of the CRS is not needed. This information shall be the same as included in the complete definition of the CRS, referenced by the srsName attribute. When the srsName attribute is included, either both or neither of the axisLabels and uomLabels attributes shall be included. When the srsName attribute is omitted, both of these attributes shall be omitted.
+The attribute axisLabels is an ordered list of labels for all the axes of this CRS. The gml:axisAbbrev value should be used for these axis labels, after spaces and forbidden characters are removed. When the srsName attribute is included, this attribute is optional. When the srsName attribute is omitted, this attribute shall also be omitted.
+The attribute uomLabels is an ordered list of unit of measure (uom) labels for all the axes of this CRS. The value of the string in the gml:catalogSymbol should be used for this uom labels, after spaces and forbidden characters are removed. When the axisLabels attribute is included, this attribute shall also be included. When the axisLabels attribute is omitted, this attribute shall also be omitted.</documentation>
+      </annotation>
+      <attribute name="axisLabels" type="gml:NCNameList"/>
+      <attribute name="uomLabels" type="gml:NCNameList"/>
+   </attributeGroup>
+   <attributeGroup name="SRSReferenceGroup">
+      <annotation>
+         <documentation>The attribute group SRSReferenceGroup is an optional reference to the CRS used by this geometry, with optional additional information to simplify the processing of the coordinates when a more complete definition of the CRS is not needed.
+In general the attribute srsName points to a CRS instance of gml:AbstractCoordinateReferenceSystem. For well-known references it is not required that the CRS description exists at the location the URI points to. 
+If no srsName attribute is given, the CRS shall be specified as part of the larger context this geometry element is part of.</documentation>
+      </annotation>
+      <attribute name="srsName" type="anyURI"/>
+      <attribute name="srsDimension" type="positiveInteger"/>
+      <attributeGroup ref="gml:SRSInformationGroup"/>
+   </attributeGroup>
+   <group name="StandardObjectProperties">
+      <sequence>
+         <element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
+         <element ref="gml:description" minOccurs="0"/>
+         <element ref="gml:descriptionReference" minOccurs="0"/>
+         <element ref="gml:identifier" minOccurs="0"/>
+         <element ref="gml:name" minOccurs="0" maxOccurs="unbounded"/>
+      </sequence>
+   </group>
+   <complexType name="StringOrRefType">
+      <annotation>
+         <appinfo>deprecated</appinfo>
+      </annotation>
+      <simpleContent>
+         <extension base="string">
+            <attributeGroup ref="gml:AssociationAttributeGroup"/>
+         </extension>
+      </simpleContent>
+   </complexType>
+   <element name="Surface"
+            type="gml:SurfaceType"
+            substitutionGroup="gml:AbstractSurface">
+      <annotation>
+         <documentation>A Surface is a 2-dimensional primitive and is composed of one or more surface patches as specified in ISO 19107:2003, 6.3.17.1. The surface patches are connected to one another.
+patches encapsulates the patches of the surface.</documentation>
+      </annotation>
+   </element>
+   <complexType name="SurfaceArrayPropertyType">
+      <annotation>
+         <documentation>gml:SurfaceArrayPropertyType is a container for an array of surfaces. The elements are always contained in the array property, referencing geometry elements or arrays of geometry elements via XLinks is not supported.</documentation>
+      </annotation>
+      <sequence minOccurs="0" maxOccurs="unbounded">
+         <element ref="gml:AbstractSurface"/>
+      </sequence>
+      <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+   </complexType>
+   <simpleType name="SurfaceInterpolationType">
+      <annotation>
+         <documentation>gml:SurfaceInterpolationType is a list of codes that may be used to identify the interpolation mechanisms specified by an application schema.</documentation>
+      </annotation>
+      <restriction base="string">
+         <enumeration value="none"/>
+         <enumeration value="planar"/>
+         <enumeration value="spherical"/>
+         <enumeration value="elliptical"/>
+         <enumeration value="conic"/>
+         <enumeration value="tin"/>
+         <enumeration value="parametricCurve"/>
+         <enumeration value="polynomialSpline"/>
+         <enumeration value="rationalSpline"/>
+         <enumeration value="triangulatedSpline"/>
+      </restriction>
+   </simpleType>
+   <complexType name="SurfacePatchArrayPropertyType">
+      <annotation>
+         <documentation>gml:SurfacePatchArrayPropertyType is a container for a sequence of surface patches.</documentation>
+      </annotation>
+      <sequence minOccurs="0" maxOccurs="unbounded">
+         <element ref="gml:AbstractSurfacePatch"/>
+      </sequence>
+   </complexType>
+   <complexType name="SurfacePropertyType">
+      <annotation>
+         <documentation>A property that has a surface as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
+      </annotation>
+      <sequence minOccurs="0">
+         <element ref="gml:AbstractSurface"/>
+      </sequence>
+      <attributeGroup ref="gml:AssociationAttributeGroup"/>
+      <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+   </complexType>
+   <complexType name="SurfaceType">
+      <complexContent>
+         <extension base="gml:AbstractSurfaceType">
+            <sequence>
+               <element ref="gml:patches"/>
+            </sequence>
+         </extension>
+      </complexContent>
+   </complexType>
+   <element name="coordinates" type="gml:CoordinatesType">
+      <annotation>
+         <appinfo>deprecated</appinfo>
+      </annotation>
+   </element>
+   <element name="curveMember" type="gml:CurvePropertyType"/>
+   <element name="curveMembers" type="gml:CurveArrayPropertyType">
+      <annotation>
+         <documentation>This property element contains a list of curves. The order of the elements is significant and shall be preserved when processing the array.</documentation>
+      </annotation>
+   </element>
+   <element name="description" type="gml:StringOrRefType">
+      <annotation>
+         <documentation>The value of this property is a text description of the object. gml:description uses gml:StringOrRefType as its content model, so it may contain a simple text string content, or carry a reference to an external description. The use of gml:description to reference an external description has been deprecated and replaced by the gml:descriptionReference property.</documentation>
+      </annotation>
+   </element>
+   <element name="descriptionReference" type="gml:ReferenceType">
+      <annotation>
+         <documentation>The value of this property is a remote text description of the object. The xlink:href attribute of the gml:descriptionReference property references the external description.</documentation>
+      </annotation>
+   </element>
+   <simpleType name="doubleList">
+      <annotation>
+         <documentation>A type for a list of values of the respective simple type.</documentation>
+      </annotation>
+      <list itemType="double"/>
+   </simpleType>
+   <element name="exterior" type="gml:AbstractRingPropertyType">
+      <annotation>
+         <documentation>A boundary of a surface consists of a number of rings. In the normal 2D case, one of these rings is distinguished as being the exterior boundary. In a general manifold this is not always possible, in which case all boundaries shall be listed as interior boundaries, and the exterior will be empty.</documentation>
+      </annotation>
+   </element>
+   <attribute name="id" type="ID">
+      <annotation>
+         <documentation>The attribute gml:id supports provision of a handle for the XML element representing a GML Object. Its use is mandatory for all GML objects. It is of XML type ID, so is constrained to be unique in the XML document within which it occurs.</documentation>
+      </annotation>
+   </attribute>
+   <element name="identifier" type="gml:CodeWithAuthorityType">
+      <annotation>
+         <documentation>Often, a special identifier is assigned to an object by the maintaining authority with the intention that it is used in references to the object For such cases, the codeSpace shall be provided. That identifier is usually unique either globally or within an application domain. gml:identifier is a pre-defined property for such identifiers.</documentation>
+      </annotation>
+   </element>
+   <element name="interior" type="gml:AbstractRingPropertyType">
+      <annotation>
+         <documentation>A boundary of a surface consists of a number of rings. The "interior" rings separate the surface / surface patch from the area enclosed by the rings.</documentation>
+      </annotation>
+   </element>
+   <element name="metaDataProperty" type="gml:MetaDataPropertyType">
+      <annotation>
+         <appinfo>deprecated</appinfo>
+      </annotation>
+   </element>
+   <element name="name" type="gml:CodeType">
+      <annotation>
+         <documentation>The gml:name property provides a label or identifier for the object, commonly a descriptive name. An object may have several names, typically assigned by different authorities. gml:name uses the gml:CodeType content model.  The authority for a name is indicated by the value of its (optional) codeSpace attribute.  The name may or may not be unique, as determined by the rules of the organization responsible for the codeSpace.  In common usage there will be one name per authority, so a processing application may select the name from its preferred codeSpace.</documentation>
+      </annotation>
+   </element>
+   <element name="patches" type="gml:SurfacePatchArrayPropertyType">
+      <annotation>
+         <documentation>The patches property element contains the sequence of surface patches. The order of the elements is significant and shall be preserved when processing the array.</documentation>
+      </annotation>
+   </element>
+   <element name="pointMember" type="gml:PointPropertyType">
+      <annotation>
+         <documentation>This property element either references a Point via the XLink-attributes or contains the Point element.</documentation>
+      </annotation>
+   </element>
+   <element name="pointMembers" type="gml:PointArrayPropertyType">
+      <annotation>
+         <documentation>This property element contains a list of points. The order of the elements is significant and shall be preserved when processing the array.</documentation>
+      </annotation>
+   </element>
+   <element name="pointProperty" type="gml:PointPropertyType">
+      <annotation>
+         <documentation>This property element either references a point via the XLink-attributes or contains the point element. pointProperty is the predefined property which may be used by GML Application Schemas whenever a GML feature has a property with a value that is substitutable for Point.</documentation>
+      </annotation>
+   </element>
+   <element name="pointRep" type="gml:PointPropertyType">
+      <annotation>
+         <appinfo>deprecated</appinfo>
+      </annotation>
+   </element>
+   <element name="pos" type="gml:DirectPositionType"/>
+   <element name="posList" type="gml:DirectPositionListType"/>
+   <attribute name="remoteSchema" type="anyURI">
+      <annotation>
+         <appinfo>deprecated</appinfo>
+      </annotation>
+   </attribute>
+   <element name="segments" type="gml:CurveSegmentArrayPropertyType">
+      <annotation>
+         <documentation>This property element contains a list of curve segments. The order of the elements is significant and shall be preserved when processing the array.</documentation>
+      </annotation>
+   </element>
+   <element name="surfaceMember" type="gml:SurfacePropertyType">
+      <annotation>
+         <documentation>This property element either references a surface via the XLink-attributes or contains the surface element. A surface element is any element, which is substitutable for gml:AbstractSurface.</documentation>
+      </annotation>
+   </element>
+   <element name="surfaceMembers" type="gml:SurfaceArrayPropertyType">
+      <annotation>
+         <documentation>This property element contains a list of surfaces. The order of the elements is significant and shall be preserved when processing the array.</documentation>
+      </annotation>
+   </element>
+   <complexType name="AbstractFeatureMemberType" abstract="true">
+      <annotation>
+         <documentation>To create a collection of GML features, a property type shall be derived by extension from gml:AbstractFeatureMemberType.
+            By default, this abstract property type does not imply any ownership of the features in the collection. The owns attribute of gml:OwnershipAttributeGroup may be used on a property element instance to assert ownership of a feature in the collection. A collection shall not own a feature already owned by another object.</documentation>
+      </annotation>
+      <sequence/>
+      <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+   </complexType>
+   <complexType name="GeometryPropertyType">
+      <annotation>
+         <documentation>A geometric property may either be any geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same or another document). Note that either the reference or the contained element shall be given, but not both or none.
+            If a feature has a property that takes a geometry element as its value, this is called a geometry property. A generic type for such a geometry property is GeometryPropertyType.</documentation>
+      </annotation>
+      <sequence minOccurs="0">
+         <element ref="gml:AbstractGeometry"/>
+      </sequence>
+      <attributeGroup ref="gml:AssociationAttributeGroup"/>
+      <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+   </complexType>
+</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/OM200-BROPROFILE/om/2.0/om-profile.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/OM200-BROPROFILE/om/2.0/om-profile.xsd
deleted file mode 100644
index 1a42aa7ba..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/OM200-BROPROFILE/om/2.0/om-profile.xsd
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema
-	xmlns:gml="http://www.opengis.net/gml/3.2"
-	xmlns:gmd="http://www.isotc211.org/2005/gmd"
-	xmlns="http://www.w3.org/2001/XMLSchema"
-	xmlns:om="http://www.opengis.net/om/2.0"
-	targetNamespace="http://www.opengis.net/om/2.0"
-	elementFormDefault="qualified"
-	attributeFormDefault="unqualified"
-	version="2.0.0">
-	<annotation>
-		<documentation>Observation profile for BRO.</documentation>
-	</annotation>
-	<!-- ====================================================================== -->
-	<import namespace="http://www.opengis.net/gml/3.2" schemaLocation="https://schema.broservices.nl/profile/gml/1.0/gml-profile.xsd"/>
-	<!-- ====================================================================== -->
-	<group
-		name="OM_CommonProperties">
-		<sequence>
-			<element
-				name="type"
-				type="gml:ReferenceType"
-				minOccurs="0"/>
-			<!-- TODO: check
-			<element
-				name="metadata"
-				type="gmd:MD_Metadata_PropertyType"
-				minOccurs="0"/>
-			-->
-			<element
-				name="relatedObservation"
-				type="om:ObservationContextPropertyType"
-				minOccurs="0"
-				maxOccurs="unbounded"/>
-			<!-- change of type to gml:TimeInstantPropertyType -->
-			<element
-				name="phenomenonTime"
-				type="gml:TimeInstantPropertyType"/>
-			<element
-				name="resultTime"
-				type="gml:TimeInstantPropertyType"
-				block="#all"/>
-			<element
-				name="validTime"
-				type="gml:TimePeriodPropertyType"
-				minOccurs="0"/>
-			<element
-				name="procedure"
-				type="om:OM_ProcessPropertyType"
-				nillable="true"/>
-			<element
-				name="parameter"
-				type="om:NamedValuePropertyType"
-				minOccurs="0"
-				maxOccurs="unbounded"/>
-			<element
-				name="observedProperty"
-				type="gml:ReferenceType"
-				nillable="true"/>
-			<element
-				name="featureOfInterest"
-				type="gml:FeaturePropertyType"
-				nillable="true"/>
-
-		</sequence>
-	</group>
-	<!-- ====================================================================== -->
-	<!-- TODO: restrict to specific type per registration object? -->
-	<element
-		name="result"/>
-	<!-- ====================================================================== -->
-	<complexType
-		name="OM_ObservationType">
-		<complexContent>
-			<extension
-				base="gml:AbstractFeatureType">
-				<sequence>
-					<group
-						ref="om:OM_CommonProperties"/>
-					<element
-						ref="om:result"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ====================================================================== -->
-	<element
-		name="OM_Observation"
-		type="om:OM_ObservationType"
-		substitutionGroup="gml:AbstractFeature"/>
-	<!-- ====================================================================== -->
-	<complexType
-		name="OM_ObservationPropertyType">
-		<sequence
-			minOccurs="0">
-			<element
-				ref="om:OM_Observation"/>
-		</sequence>
-		<attributeGroup
-			ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-	<complexType
-		name="ObservationContextType">
-		<sequence>
-			<element
-				name="role"
-				type="gml:ReferenceType"/>
-			<element
-				name="relatedObservation"
-				type="gml:ReferenceType"/>
-		</sequence>
-	</complexType>
-	<!-- ====================================================================== -->
-	<element
-		name="ObservationContext"
-		type="om:ObservationContextType"/>
-	<!-- ====================================================================== -->
-	<complexType
-		name="ObservationContextPropertyType">
-		<sequence>
-			<element
-				ref="om:ObservationContext"/>
-		</sequence>
-	</complexType>
-	<!-- ====================================================================== -->
-	<complexType
-		name="OM_ProcessPropertyType">
-		<sequence
-			minOccurs="0">
-			<any
-				namespace="##any"
-				processContents="lax"/>
-		</sequence>
-		<attributeGroup
-			ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-	<complexType
-		name="NamedValueType">
-		<sequence>
-			<element
-				name="name"
-				type="gml:ReferenceType"/>
-			<element
-				name="value"/>
-		</sequence>
-	</complexType>
-	<!-- ====================================================================== -->
-	<element
-		name="NamedValue"
-		type="om:NamedValueType"/>
-	<!-- ====================================================================== -->
-	<complexType
-		name="NamedValuePropertyType">
-		<sequence
-			minOccurs="0">
-			<element
-				ref="om:NamedValue"/>
-		</sequence>
-		<attributeGroup
-			ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-</schema>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/SA202-BROPROFILE/sampling/2.0/sa-profile.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/SA202-BROPROFILE/sampling/2.0/sa-profile.xsd
deleted file mode 100644
index 5d97818bd..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/SA202-BROPROFILE/sampling/2.0/sa-profile.xsd
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema
-	xmlns:gml="http://www.opengis.net/gml/3.2"
-	xmlns:gmd="http://www.isotc211.org/2005/gmd"
-	xmlns:om="http://www.opengis.net/om/2.0"
-	xmlns="http://www.w3.org/2001/XMLSchema"
-	xmlns:sam="http://www.opengis.net/sampling/2.0"
-	targetNamespace="http://www.opengis.net/sampling/2.0"
-	elementFormDefault="qualified"
-	attributeFormDefault="unqualified"
-	version="2.0.2">
-	<annotation>
-		<documentation>samplingFeature profile for BRO.</documentation>
-	</annotation>
-	<!-- ====================================================================== -->
-	<!-- bring in other schemas -->
-	<import
-		namespace="http://www.opengis.net/gml/3.2"
-		schemaLocation="https://schema.broservices.nl/profile/gml/1.0/gml-profile.xsd"/>
-	<!-- TODO: check
-	<import
-		namespace="http://www.isotc211.org/2005/gmd"
-		schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
-	-->
-	<import
-		namespace="http://www.opengis.net/om/2.0"
-		schemaLocation="https://schema.broservices.nl/profile/om/1.0/om-profile.xsd"/>
-	<!-- ====================================================================== -->
-	<group
-		name="SF_CommonProperties">
-		<sequence>
-			<element
-				name="type"
-				type="gml:ReferenceType"
-				minOccurs="0"/>
-			<element
-				name="sampledFeature"
-				type="gml:FeaturePropertyType"
-				maxOccurs="unbounded"
-				nillable="true"
-				block="#all"/>
-			<!-- TODO: check
-			<element
-				name="lineage"
-				minOccurs="0"
-				type="gmd:LI_Lineage_PropertyType"/>
-			-->
-			<element
-				name="relatedObservation"
-				type="om:OM_ObservationPropertyType"
-				minOccurs="0"
-				maxOccurs="unbounded"/>
-			<element
-				name="relatedSamplingFeature"
-				type="sam:SamplingFeatureComplexPropertyType"
-				minOccurs="0"
-				maxOccurs="unbounded"/>
-			<element
-				name="parameter"
-				type="om:NamedValuePropertyType"
-				minOccurs="0"
-				maxOccurs="unbounded"/>
-		</sequence>
-	</group>
-	<!-- ====================================================================== -->
-	<complexType
-		name="SF_SamplingFeatureType">
-		<complexContent>
-			<extension
-				base="gml:AbstractFeatureType">
-				<sequence>
-					<group
-						ref="sam:SF_CommonProperties"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ====================================================================== -->
-	<element
-		name="SF_SamplingFeature"
-		type="sam:SF_SamplingFeatureType"
-		abstract="true"
-		substitutionGroup="gml:AbstractFeature"/>
-	<!-- ====================================================================== -->
-	<complexType
-		name="SF_SamplingFeaturePropertyType">
-		<sequence
-			minOccurs="0">
-			<element
-				ref="sam:SF_SamplingFeature"/>
-		</sequence>
-		<attributeGroup
-			ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-	<complexType
-		name="SamplingFeatureComplexType">
-		<sequence>
-			<element
-				name="role"
-				type="gml:ReferenceType"/>
-			<element
-				name="relatedSamplingFeature"
-				type="sam:SF_SamplingFeaturePropertyType"/>
-		</sequence>
-	</complexType>
-	<!-- ====================================================================== -->
-	<element
-		name="SamplingFeatureComplex"
-		type="sam:SamplingFeatureComplexType"/>
-	<!-- ====================================================================== -->
-	<complexType
-		name="SamplingFeatureComplexPropertyType">
-		<sequence>
-			<element
-				ref="sam:SamplingFeatureComplex"/>
-		</sequence>
-	</complexType>
-	<!-- ====================================================================== -->
-	<complexType
-		name="SF_SamplingFeatureCollectionType">
-		<complexContent>
-			<extension
-				base="gml:AbstractFeatureType">
-				<sequence>
-					<element
-						name="member"
-						type="sam:SF_SamplingFeaturePropertyType"
-						maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ====================================================================== -->
-	<element
-		name="SF_SamplingFeatureCollection"
-		type="sam:SF_SamplingFeatureCollectionType"
-		substitutionGroup="gml:AbstractFeature"/>
-	<!-- ====================================================================== -->
-	<complexType
-		name="SF_SamplingFeatureCollectionPropertyType">
-		<sequence
-			minOccurs="0">
-			<element
-				ref="sam:SF_SamplingFeatureCollection"/>
-		</sequence>
-		<attributeGroup
-			ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-	<complexType
-		name="SF_ProcessPropertyType">
-		<sequence
-			minOccurs="0">
-			<any
-				namespace="##any"
-				processContents="lax"/>
-		</sequence>
-		<attributeGroup
-			ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/SAM202-BROPROFILE/sampling/2.0/sa-profile.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/SAM202-BROPROFILE/sampling/2.0/sa-profile.xsd
deleted file mode 100644
index 5d97818bd..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/SAM202-BROPROFILE/sampling/2.0/sa-profile.xsd
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema
-	xmlns:gml="http://www.opengis.net/gml/3.2"
-	xmlns:gmd="http://www.isotc211.org/2005/gmd"
-	xmlns:om="http://www.opengis.net/om/2.0"
-	xmlns="http://www.w3.org/2001/XMLSchema"
-	xmlns:sam="http://www.opengis.net/sampling/2.0"
-	targetNamespace="http://www.opengis.net/sampling/2.0"
-	elementFormDefault="qualified"
-	attributeFormDefault="unqualified"
-	version="2.0.2">
-	<annotation>
-		<documentation>samplingFeature profile for BRO.</documentation>
-	</annotation>
-	<!-- ====================================================================== -->
-	<!-- bring in other schemas -->
-	<import
-		namespace="http://www.opengis.net/gml/3.2"
-		schemaLocation="https://schema.broservices.nl/profile/gml/1.0/gml-profile.xsd"/>
-	<!-- TODO: check
-	<import
-		namespace="http://www.isotc211.org/2005/gmd"
-		schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
-	-->
-	<import
-		namespace="http://www.opengis.net/om/2.0"
-		schemaLocation="https://schema.broservices.nl/profile/om/1.0/om-profile.xsd"/>
-	<!-- ====================================================================== -->
-	<group
-		name="SF_CommonProperties">
-		<sequence>
-			<element
-				name="type"
-				type="gml:ReferenceType"
-				minOccurs="0"/>
-			<element
-				name="sampledFeature"
-				type="gml:FeaturePropertyType"
-				maxOccurs="unbounded"
-				nillable="true"
-				block="#all"/>
-			<!-- TODO: check
-			<element
-				name="lineage"
-				minOccurs="0"
-				type="gmd:LI_Lineage_PropertyType"/>
-			-->
-			<element
-				name="relatedObservation"
-				type="om:OM_ObservationPropertyType"
-				minOccurs="0"
-				maxOccurs="unbounded"/>
-			<element
-				name="relatedSamplingFeature"
-				type="sam:SamplingFeatureComplexPropertyType"
-				minOccurs="0"
-				maxOccurs="unbounded"/>
-			<element
-				name="parameter"
-				type="om:NamedValuePropertyType"
-				minOccurs="0"
-				maxOccurs="unbounded"/>
-		</sequence>
-	</group>
-	<!-- ====================================================================== -->
-	<complexType
-		name="SF_SamplingFeatureType">
-		<complexContent>
-			<extension
-				base="gml:AbstractFeatureType">
-				<sequence>
-					<group
-						ref="sam:SF_CommonProperties"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ====================================================================== -->
-	<element
-		name="SF_SamplingFeature"
-		type="sam:SF_SamplingFeatureType"
-		abstract="true"
-		substitutionGroup="gml:AbstractFeature"/>
-	<!-- ====================================================================== -->
-	<complexType
-		name="SF_SamplingFeaturePropertyType">
-		<sequence
-			minOccurs="0">
-			<element
-				ref="sam:SF_SamplingFeature"/>
-		</sequence>
-		<attributeGroup
-			ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-	<complexType
-		name="SamplingFeatureComplexType">
-		<sequence>
-			<element
-				name="role"
-				type="gml:ReferenceType"/>
-			<element
-				name="relatedSamplingFeature"
-				type="sam:SF_SamplingFeaturePropertyType"/>
-		</sequence>
-	</complexType>
-	<!-- ====================================================================== -->
-	<element
-		name="SamplingFeatureComplex"
-		type="sam:SamplingFeatureComplexType"/>
-	<!-- ====================================================================== -->
-	<complexType
-		name="SamplingFeatureComplexPropertyType">
-		<sequence>
-			<element
-				ref="sam:SamplingFeatureComplex"/>
-		</sequence>
-	</complexType>
-	<!-- ====================================================================== -->
-	<complexType
-		name="SF_SamplingFeatureCollectionType">
-		<complexContent>
-			<extension
-				base="gml:AbstractFeatureType">
-				<sequence>
-					<element
-						name="member"
-						type="sam:SF_SamplingFeaturePropertyType"
-						maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ====================================================================== -->
-	<element
-		name="SF_SamplingFeatureCollection"
-		type="sam:SF_SamplingFeatureCollectionType"
-		substitutionGroup="gml:AbstractFeature"/>
-	<!-- ====================================================================== -->
-	<complexType
-		name="SF_SamplingFeatureCollectionPropertyType">
-		<sequence
-			minOccurs="0">
-			<element
-				ref="sam:SF_SamplingFeatureCollection"/>
-		</sequence>
-		<attributeGroup
-			ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-	<complexType
-		name="SF_ProcessPropertyType">
-		<sequence
-			minOccurs="0">
-			<any
-				namespace="##any"
-				processContents="lax"/>
-		</sequence>
-		<attributeGroup
-			ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-</schema>
diff --git a/src/main/resources/input/IHW/xsd/www.opengis.net/SWE201-BROPROFILE/swe/2.0/swe-profile.xsd b/src/main/resources/input/IHW/xsd/www.opengis.net/SWE201-BROPROFILE/swe/2.0/swe-profile.xsd
deleted file mode 100644
index d563c581e..000000000
--- a/src/main/resources/input/IHW/xsd/www.opengis.net/SWE201-BROPROFILE/swe/2.0/swe-profile.xsd
+++ /dev/null
@@ -1,732 +0,0 @@
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    xmlns:swe="http://www.opengis.net/swe/2.0"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    targetNamespace="http://www.opengis.net/swe/2.0" 
-    elementFormDefault="qualified" 
-    attributeFormDefault="unqualified" 
-    version="2.0.1">
-    <annotation>
-        <documentation>SWE Common profile for BRO.</documentation>
-    </annotation>
-	<import namespace="http://www.w3.org/1999/xlink" schemaLocation="https://schema.broservices.nl/profile/xlink/1.0/xlink-profile.xsd" />
-    
-	<!-- ================================================= -->
-	<element name="AbstractSWE" type="swe:AbstractSWEType" abstract="true"/>
-	<!-- ================================================= -->
-	<complexType name="AbstractSWEType">
-		<!-- TODO: check
-		<sequence>
-			<element name="extension" type="anyType" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		-->
-		<attribute name="id" type="ID" use="optional"/>
-	</complexType>
-	<!-- ================================================= -->
-	<element name="AbstractSWEIdentifiable" type="swe:AbstractSWEIdentifiableType" abstract="true" substitutionGroup="swe:AbstractSWE"/>
-	<complexType name="AbstractSWEIdentifiableType">
-		<complexContent>
-			<extension base="swe:AbstractSWEType">
-				<sequence>
-					<element name="identifier" type="anyURI" minOccurs="0"/>
-					<element name="label" type="string" minOccurs="0"/>
-					<element name="description" type="string" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ================================================= -->
-	<complexType name="UnitReference">
-		<attribute name="code" type="swe:UomSymbol" use="optional"/>
-	  <attributeGroup ref="swe:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ================================================= -->
-	<simpleType name="UomSymbol">
-		<restriction base="string">
-			<pattern value="[^: \n\r\t]+"/>
-		</restriction>
-	</simpleType>
-	<!-- ================================================= -->
-	<complexType name="NilValue">
-		<simpleContent>
-			<extension base="token">
-				<attribute name="reason" type="anyURI" use="required"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<!-- ================================================= -->
-	<!-- TODO: check -->
-	<complexType name="EncodedValuesPropertyType">
-		<complexContent>
-			<extension base="anyType">
-			  <attributeGroup ref="swe:AssociationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ================================================= -->
-	<!-- TODO: check -->
-	<simpleType name="TokenPair">
-		<restriction>
-			<simpleType>
-				<list itemType="string"/>
-			</simpleType>
-			<length value="2"/>
-		</restriction>
-	</simpleType>
-	<!-- ================================================= -->
-	<!-- TODO: check -->
-	<simpleType name="IntegerPair">
-		<restriction>
-			<simpleType>
-				<list itemType="integer"/>
-			</simpleType>
-			<length value="2"/>
-		</restriction>
-	</simpleType>
-	<!-- ================================================= -->
-	<!-- TODO: check -->
-	<simpleType name="RealPair">
-		<restriction>
-			<simpleType>
-				<list itemType="double"/>
-			</simpleType>
-			<length value="2"/>
-		</restriction>
-	</simpleType>
-	<!-- ================================================= -->
-	<!-- TODO: check -->
-	<simpleType name="TimePair">
-		<restriction>
-			<simpleType>
-				<list itemType="swe:TimePosition"/>
-			</simpleType>
-			<length value="2"/>
-		</restriction>
-	</simpleType>
-	<!-- ================================================= -->
-	<simpleType name="TimePosition">
-		<union memberTypes="double swe:TimeIso8601"/>
-	</simpleType>
-	<!-- ================================================= -->
-	<simpleType name="TimeIso8601">
-		<union memberTypes="date time dateTime swe:TimeIndeterminateValue"/>
-	</simpleType>
-	<!-- ================================================= -->
-	<simpleType name="TimeIndeterminateValue">
-		<restriction base="string">
-			<enumeration value="now"/>
-		</restriction>
-	</simpleType>
-	<!-- ================================================= -->
-	<attributeGroup name="AssociationAttributeGroup">
-		<attributeGroup ref="xlink:simpleAttrs"/>
-	</attributeGroup>
-  <!-- ================================================= -->
-  <complexType name="Reference">    
-    <attributeGroup ref="swe:AssociationAttributeGroup"/>
-  </complexType>
-	<!-- ================================================= -->
-    <element name="DataRecord" substitutionGroup="swe:AbstractDataComponent" type="swe:DataRecordType"/>
-    <!-- ================================================= -->
-    <complexType name="DataRecordType">
-        <complexContent>
-            <extension base="swe:AbstractDataComponentType">
-                <sequence>
-                    <element maxOccurs="unbounded" minOccurs="1" name="field">
-                        <complexType>
-                            <complexContent>
-                                <extension base="swe:AbstractDataComponentPropertyType">
-                                    <attribute name="name" type="NCName" use="required"/>
-                                </extension>
-                            </complexContent>
-                        </complexType>
-                    </element>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="DataRecordPropertyType">
-        <sequence minOccurs="0">
-            <element ref="swe:DataRecord"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="DataRecordPropertyByValueType">
-        <sequence>
-            <element ref="swe:DataRecord"/>
-        </sequence>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="Vector" substitutionGroup="swe:AbstractDataComponent" type="swe:VectorType"/>
-    <!-- ================================================= -->
-    <complexType name="VectorType">
-        <complexContent>
-            <extension base="swe:AbstractDataComponentType">
-                <sequence>
-                    <element maxOccurs="unbounded" minOccurs="1" name="coordinate">
-                        <complexType>
-                            <complexContent>
-                                <extension base="swe:AnyNumericalPropertyType">
-                                    <attribute name="name" type="NCName" use="required"/>
-                                </extension>
-                            </complexContent>
-                        </complexType>
-                    </element>
-                </sequence>
-                <attribute name="referenceFrame" type="anyURI" use="required"/>
-                <attribute name="localFrame" type="anyURI" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="VectorPropertyType">
-        <sequence minOccurs="0">
-            <element ref="swe:Vector"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="VectorPropertyByValueType">
-        <sequence>
-            <element ref="swe:Vector"/>
-        </sequence>
-    </complexType>
-    <!-- ================================================= -->
-    <!-- TODO: AbstractDataComponent -->
-    <element name="Count" substitutionGroup="swe:AbstractSimpleComponent" type="swe:CountType"/>
-    <!-- ================================================= -->
-    <complexType name="CountType">
-        <complexContent>
-            <extension base="swe:AbstractSimpleComponentType">
-                <sequence>
-                    <element maxOccurs="1" minOccurs="0" name="constraint" type="swe:AllowedValuesPropertyType"/>
-                    <element maxOccurs="1" minOccurs="0" name="value" type="integer"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="CountPropertyType">
-        <sequence minOccurs="0">
-            <element ref="swe:Count"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <!-- TODO: AbstractDataComponent -->
-    <element name="CategoryRange" substitutionGroup="swe:AbstractSimpleComponent" type="swe:CategoryRangeType"/>
-    <!-- ================================================= -->
-    <complexType name="CategoryRangeType">
-        <complexContent>
-            <extension base="swe:AbstractSimpleComponentType">
-                <sequence>
-                    <element maxOccurs="1" minOccurs="0" name="codeSpace" type="swe:Reference"/>
-                    <element maxOccurs="1" minOccurs="0" name="constraint" type="swe:AllowedTokensPropertyType"/>
-                    <element maxOccurs="1" minOccurs="0" name="value" type="swe:TokenPair"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="CategoryRangePropertyType">
-        <sequence minOccurs="0">
-            <element ref="swe:CategoryRange"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <!-- TODO: AbstractDataComponent -->
-    <element abstract="true" name="AbstractSimpleComponent" substitutionGroup="swe:AbstractDataComponent" type="swe:AbstractSimpleComponentType"/>
-    <!-- ================================================= -->
-    <complexType abstract="true" name="AbstractSimpleComponentType">
-        <complexContent>
-            <extension base="swe:AbstractDataComponentType">
-                <sequence>
-                    <element maxOccurs="unbounded" minOccurs="0" name="quality" type="swe:QualityPropertyType"/>
-                    <element maxOccurs="1" minOccurs="0" name="nilValues" type="swe:NilValuesPropertyType"/>
-                </sequence>
-                <attribute name="referenceFrame" type="anyURI" use="optional"/>
-                <attribute name="axisID" type="string" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="AbstractSimpleComponentPropertyType">
-        <sequence minOccurs="0">
-            <element ref="swe:AbstractSimpleComponent"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="QuantityRange" substitutionGroup="swe:AbstractSimpleComponent" type="swe:QuantityRangeType"/>
-    <!-- ================================================= -->
-    <complexType name="QuantityRangeType">
-        <complexContent>
-            <extension base="swe:AbstractSimpleComponentType">
-                <sequence>
-                    <element name="uom" type="swe:UnitReference"/>
-                    <element maxOccurs="1" minOccurs="0" name="constraint" type="swe:AllowedValuesPropertyType"/>
-                    <element maxOccurs="1" minOccurs="0" name="value" type="swe:RealPair"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="QuantityRangePropertyType">
-        <sequence minOccurs="0">
-            <element ref="swe:QuantityRange"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="Time" substitutionGroup="swe:AbstractSimpleComponent" type="swe:TimeType"/>
-    <!-- ================================================= -->
-    <complexType name="TimeType">
-        <complexContent>
-            <extension base="swe:AbstractSimpleComponentType">
-                <sequence>
-                    <element name="uom" type="swe:UnitReference"/>
-                    <element maxOccurs="1" minOccurs="0" name="constraint" type="swe:AllowedTimesPropertyType"/>
-                    <element maxOccurs="1" minOccurs="0" name="value" type="swe:TimePosition"/>
-                </sequence>
-                <attribute name="referenceTime" type="dateTime" use="optional"/>
-                <attribute name="localFrame" type="anyURI" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="TimePropertyType">
-        <sequence minOccurs="0">
-            <element ref="swe:Time"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="TimeRange" substitutionGroup="swe:AbstractSimpleComponent" type="swe:TimeRangeType"/>
-    <!-- ================================================= -->
-    <complexType name="TimeRangeType">
-        <complexContent>
-            <extension base="swe:AbstractSimpleComponentType">
-                <sequence>
-                    <element name="uom" type="swe:UnitReference"/>
-                    <element maxOccurs="1" minOccurs="0" name="constraint" type="swe:AllowedTimesPropertyType"/>
-                    <element maxOccurs="1" minOccurs="0" name="value" type="swe:TimePair"/>
-                </sequence>
-                <attribute name="referenceTime" type="dateTime" use="optional"/>
-                <attribute name="localFrame" type="anyURI" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="TimeRangePropertyType">
-        <sequence minOccurs="0">
-            <element ref="swe:TimeRange"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="Boolean" substitutionGroup="swe:AbstractSimpleComponent" type="swe:BooleanType"/>
-    <!-- ================================================= -->
-    <complexType name="BooleanType">
-        <complexContent>
-            <extension base="swe:AbstractSimpleComponentType">
-                <sequence>
-                    <element maxOccurs="1" minOccurs="0" name="value" type="boolean"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="BooleanPropertyType">
-        <sequence minOccurs="0">
-            <element ref="swe:Boolean"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="Text" substitutionGroup="swe:AbstractSimpleComponent" type="swe:TextType"/>
-    <!-- ================================================= -->
-    <complexType name="TextType">
-        <complexContent>
-            <extension base="swe:AbstractSimpleComponentType">
-                <sequence>
-                    <element maxOccurs="1" minOccurs="0" name="constraint" type="swe:AllowedTokensPropertyType"/>
-                    <element maxOccurs="1" minOccurs="0" name="value" type="string"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="TextPropertyType">
-        <sequence minOccurs="0">
-            <element ref="swe:Text"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="Category" substitutionGroup="swe:AbstractSimpleComponent" type="swe:CategoryType"/>
-    <!-- ================================================= -->
-    <complexType name="CategoryType">
-        <complexContent>
-            <extension base="swe:AbstractSimpleComponentType">
-                <sequence>
-                    <element maxOccurs="1" minOccurs="0" name="codeSpace" type="swe:Reference"/>
-                    <element maxOccurs="1" minOccurs="0" name="constraint" type="swe:AllowedTokensPropertyType"/>
-                    <element maxOccurs="1" minOccurs="0" name="value" type="string"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="CategoryPropertyType">
-        <sequence minOccurs="0">
-            <element ref="swe:Category"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="Quantity" substitutionGroup="swe:AbstractSimpleComponent" type="swe:QuantityType"/>
-    <!-- ================================================= -->
-    <complexType name="QuantityType">
-        <complexContent>
-            <extension base="swe:AbstractSimpleComponentType">
-                <sequence>
-                    <element name="uom" type="swe:UnitReference"/>
-                    <element maxOccurs="1" minOccurs="0" name="constraint" type="swe:AllowedValuesPropertyType"/>
-                    <element maxOccurs="1" minOccurs="0" name="value" type="double"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="QuantityPropertyType">
-        <sequence minOccurs="0">
-            <element ref="swe:Quantity"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <element abstract="true" name="AbstractDataComponent" substitutionGroup="swe:AbstractSWEIdentifiable" type="swe:AbstractDataComponentType"/>
-    <!-- ================================================= -->
-    <complexType abstract="true" name="AbstractDataComponentType">
-        <complexContent>
-            <extension base="swe:AbstractSWEIdentifiableType">
-                <attribute name="updatable" type="boolean" use="optional"/>
-                <attribute name="optional" type="boolean" use="optional" default="false"/>
-                <attribute name="definition" type="anyURI" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="AbstractDataComponentPropertyType">
-        <sequence minOccurs="0">
-            <element ref="swe:AbstractDataComponent"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="CountRange" substitutionGroup="swe:AbstractSimpleComponent" type="swe:CountRangeType"/>
-    <!-- ================================================= -->
-    <complexType name="CountRangeType">
-        <complexContent>
-            <extension base="swe:AbstractSimpleComponentType">
-                <sequence>
-                    <element maxOccurs="1" minOccurs="0" name="constraint" type="swe:AllowedValuesPropertyType"/>
-                    <element maxOccurs="1" minOccurs="0" name="value" type="swe:IntegerPair"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="CountRangePropertyType">
-        <sequence minOccurs="0">
-            <element ref="swe:CountRange"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="NilValues" substitutionGroup="swe:AbstractSWE" type="swe:NilValuesType"/>
-    <!-- ================================================= -->
-    <complexType name="NilValuesType">
-        <complexContent>
-            <extension base="swe:AbstractSWEType">
-                <sequence>
-                    <element maxOccurs="unbounded" minOccurs="1" name="nilValue" type="swe:NilValue"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="NilValuesPropertyType">
-        <sequence minOccurs="0">
-            <element ref="swe:NilValues"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="AllowedTokens" substitutionGroup="swe:AbstractSWE" type="swe:AllowedTokensType"/>
-    <!-- ================================================= -->
-    <complexType name="AllowedTokensType">
-        <complexContent>
-            <extension base="swe:AbstractSWEType">
-                <sequence>
-                    <element maxOccurs="unbounded" minOccurs="0" name="value" type="string"/>
-                    <element maxOccurs="1" minOccurs="0" name="pattern" type="string"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="AllowedTokensPropertyType">
-        <sequence minOccurs="0">
-            <element ref="swe:AllowedTokens"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="AllowedTokensPropertyByValueType">
-        <sequence>
-            <element ref="swe:AllowedTokens"/>
-        </sequence>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="AllowedValues" substitutionGroup="swe:AbstractSWE" type="swe:AllowedValuesType"/>
-    <!-- ================================================= -->
-    <complexType name="AllowedValuesType">
-        <complexContent>
-            <extension base="swe:AbstractSWEType">
-                <sequence>
-                    <element maxOccurs="unbounded" minOccurs="0" name="value" type="double"/>
-                    <element maxOccurs="unbounded" minOccurs="0" name="interval" type="swe:RealPair"/>
-                    <element maxOccurs="1" minOccurs="0" name="significantFigures" type="integer"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="AllowedValuesPropertyType">
-        <sequence minOccurs="0">
-            <element ref="swe:AllowedValues"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="AllowedValuesPropertyByValueType">
-        <sequence>
-            <element ref="swe:AllowedValues"/>
-        </sequence>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="AllowedTimes" substitutionGroup="swe:AbstractSWE" type="swe:AllowedTimesType"/>
-    <!-- ================================================= -->
-    <complexType name="AllowedTimesType">
-        <complexContent>
-            <extension base="swe:AbstractSWEType">
-                <sequence>
-                    <element maxOccurs="unbounded" minOccurs="0" name="value" type="swe:TimePosition"/>
-                    <element maxOccurs="unbounded" minOccurs="0" name="interval" type="swe:TimePair"/>
-                    <element maxOccurs="1" minOccurs="0" name="significantFigures" type="integer"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="AllowedTimesPropertyType">
-        <sequence minOccurs="0">
-            <element ref="swe:AllowedTimes"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="AllowedTimesPropertyByValueType">
-        <sequence>
-            <element ref="swe:AllowedTimes"/>
-        </sequence>
-    </complexType>
-    <!-- ================================================= -->
-    <group name="Quality">
-        <choice>
-            <element ref="swe:Quantity"/>
-            <element ref="swe:QuantityRange"/>
-            <element ref="swe:Category"/>
-            <element ref="swe:Text"/>
-        </choice>
-    </group>
-    <!-- ================================================= -->
-    <complexType name="QualityPropertyType">
-        <sequence minOccurs="0">
-            <group ref="swe:Quality"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <group name="AnyRange">
-        <annotation>
-            <documentation>Re-usable group providing a choice of range data components</documentation>
-        </annotation>
-        <choice>
-            <element ref="swe:QuantityRange"/>
-            <element ref="swe:TimeRange"/>
-            <element ref="swe:CountRange"/>
-            <element ref="swe:CategoryRange"/>
-        </choice>
-    </group>
-    <!-- ================================================= -->
-    <complexType name="AnyRangePropertyType">
-        <sequence minOccurs="0">
-            <group ref="swe:AnyRange"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <group name="AnyNumerical">
-        <annotation>
-            <documentation>Re-usable group providing a choice of numeric data components</documentation>
-        </annotation>
-        <choice>
-            <element ref="swe:Count"/>
-            <element ref="swe:Quantity"/>
-            <element ref="swe:Time"/>
-        </choice>
-    </group>
-    <!-- ================================================= -->
-    <complexType name="AnyNumericalPropertyType">
-        <sequence minOccurs="0">
-            <group ref="swe:AnyNumerical"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <group name="AnyScalar">
-        <annotation>
-            <documentation>Re-usable group providing a choice of scalar data components</documentation>
-        </annotation>
-        <choice>
-            <element ref="swe:Boolean"/>
-            <element ref="swe:Count"/>
-            <element ref="swe:Quantity"/>
-            <element ref="swe:Time"/>
-            <element ref="swe:Category"/>
-            <element ref="swe:Text"/>
-        </choice>
-    </group>
-    <!-- ================================================= -->
-    <complexType name="AnyScalarPropertyType">
-        <sequence minOccurs="0">
-            <group ref="swe:AnyScalar"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="DataArray" substitutionGroup="swe:AbstractDataComponent" type="swe:DataArrayType"/>
-    <!-- ================================================= -->
-    <complexType name="DataArrayType">
-        <complexContent>
-            <extension base="swe:AbstractDataComponentType">
-                <sequence>
-                    <element name="elementCount" type="swe:CountPropertyType"/>
-                    <element name="elementType">
-                        <complexType>
-                            <complexContent>
-                                <extension base="swe:AbstractDataComponentPropertyType">
-                                    <attribute name="name" type="NCName" use="required"/>
-                                </extension>
-                            </complexContent>
-                        </complexType>
-                    </element>
-                    <element maxOccurs="1" minOccurs="0" name="encoding">
-                        <complexType>
-                            <sequence>
-                                <element ref="swe:AbstractEncoding"/>
-                            </sequence>
-                        </complexType>
-                    </element>
-                    <element maxOccurs="1" minOccurs="0" name="values" type="swe:EncodedValuesPropertyType"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="DataArrayPropertyType">
-        <sequence minOccurs="0">
-            <element ref="swe:DataArray"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="DataArrayPropertyByValueType">
-        <sequence>
-            <element ref="swe:DataArray"/>
-        </sequence>
-    </complexType>    
-    <!-- ================================================= -->
-    <element abstract="true" name="AbstractEncoding" substitutionGroup="swe:AbstractSWE" type="swe:AbstractEncodingType"/>
-    <!-- ================================================= -->
-    <complexType abstract="true" name="AbstractEncodingType">
-        <complexContent>
-            <extension base="swe:AbstractSWEType"/>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="AbstractEncodingPropertyType">
-        <sequence minOccurs="0">
-            <element ref="swe:AbstractEncoding"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType abstract="true" name="AbstractEncodingPropertyByValueType">
-        <sequence>
-            <element ref="swe:AbstractEncoding"/>
-        </sequence>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="XMLEncoding" substitutionGroup="swe:AbstractEncoding" type="swe:XMLEncodingType"/>
-    <!-- ================================================= -->
-    <complexType name="XMLEncodingType">
-        <complexContent>
-            <extension base="swe:AbstractEncodingType"/>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="XMLEncodingPropertyType">
-        <sequence minOccurs="0">
-            <element ref="swe:XMLEncoding"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="XMLEncodingPropertyByValueType">
-        <sequence>
-            <element ref="swe:XMLEncoding"/>
-        </sequence>
-    </complexType>
-    <!-- ================================================= -->
-    <element name="TextEncoding" substitutionGroup="swe:AbstractEncoding" type="swe:TextEncodingType"/>
-    <!-- ================================================= -->
-    <complexType name="TextEncodingType">
-        <complexContent>
-            <extension base="swe:AbstractEncodingType">
-                <attribute default="true" name="collapseWhiteSpaces" type="boolean" use="optional"/>
-                <attribute default="." name="decimalSeparator" type="string" use="optional"/>
-                <attribute name="tokenSeparator" type="string" use="required"/>
-                <attribute name="blockSeparator" type="string" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="TextEncodingPropertyType">
-        <sequence minOccurs="0">
-            <element ref="swe:TextEncoding"/>
-        </sequence>
-        <attributeGroup ref="swe:AssociationAttributeGroup"/>
-    </complexType>
-    <!-- ================================================= -->
-    <complexType name="TextEncodingPropertyByValueType">
-        <sequence>
-            <element ref="swe:TextEncoding"/>
-        </sequence>
-    </complexType>
-    <!-- ================================================= -->
-</schema>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/www.w3.org/SMIL20-20010731/smil20/smil20-language.xsd b/src/main/resources/input/IHW/xsd/www.w3.org/SMIL20-20010731/smil20/smil20-language.xsd
deleted file mode 100644
index 4cc3b257b..000000000
--- a/src/main/resources/input/IHW/xsd/www.w3.org/SMIL20-20010731/smil20/smil20-language.xsd
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-=================== OpenGIS ============================  
-	This schema is here because there are errors in publicly available smil schemas at w3c site.
-	One is acknowledged by w3c - it is typographical error described in SMIL errata document at:
- 	http://www.w3.org/2001/07/REC-SMIL20-20010731-errata
- 	under:
-	E30: Correction in the SMIL 2.0 utility Schema, section B.3.48 (revised 29 03 2002)
-	Others (at least one) are assumed after failed validation using Visual Studio .NET.
-	These smil schemas are reorganized to include in minimum number of files all and only definitions required by
-	defaultStyle.xsd. It was done to enable the validation of GML3.0 schemas.
-	When w3c fixes the public schemas these will be discarded 
-	comment: Milan Trninic, Galdos Systems Inc., May 2002
-=================== OpenGIS ============================ 
--->
-<!--
-XML Schema for the SMIL 2.0 Language
-
-This is SMIL 2.0
-Copyright: 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-See http://www.w3.org/Consortium/Legal/.
-
-Public URI: http://www.w3.org/2001/SMIL20/smil20-language.xsd
-Author: Aaron Michael Cohen (Intel)
-
-Revision: 2001/07/15
-
-Note: <any> wildcard element content is missing from most of the SMIL 2.0 elements because of a conflict 
-between substitutionGroups and wildcard content.
--->
-<schema targetNamespace="http://www.w3.org/2001/SMIL20/Language" xmlns:smil20lang="http://www.w3.org/2001/SMIL20/Language" xmlns:smil20="http://www.w3.org/2001/SMIL20/" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-	<!-- import the smil20 namespaces -->
-	<import namespace="http://www.w3.org/2001/SMIL20/" schemaLocation="smil20.xsd"/>
-	<element name="animate" type="smil20lang:animateType"/>
-	<complexType name="animateType">
-		<complexContent>
-			<extension base="smil20:animatePrototype">
-				<choice minOccurs="0" maxOccurs="unbounded">
-					<any namespace="##other" processContents="lax"/>
-				</choice>
-				<attributeGroup ref="smil20lang:CoreAttrs"/>
-				<attributeGroup ref="smil20lang:TimingAttrs"/>
-				<attributeGroup ref="smil20:animTargetAttrs"/>
-				<attributeGroup ref="smil20:animModeAttrs"/>
-				<attributeGroup ref="smil20:skipContentAttrs"/>
-				<anyAttribute namespace="##any" processContents="strict"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<attributeGroup name="CoreAttrs">
-		<attributeGroup ref="smil20:structureModuleAttrs"/>
-		<attributeGroup ref="smil20:alternateContentAttrs"/>
-	</attributeGroup>
-	<attributeGroup name="TimingAttrs">
-		<attributeGroup ref="smil20lang:BasicTimingAttrs"/>
-		<attributeGroup ref="smil20:syncBehaviorAttrs"/>
-		<attributeGroup ref="smil20:syncBehaviorDefaultAttrs"/>
-		<attributeGroup ref="smil20:restartTimingAttrs"/>
-		<attributeGroup ref="smil20:restartDefaultAttrs"/>
-		<attributeGroup ref="smil20:fillTimingAttrs"/>
-		<attributeGroup ref="smil20:fillDefaultAttrs"/>
-	</attributeGroup>
-	<attributeGroup name="BasicTimingAttrs">
-		<attributeGroup ref="smil20:beginEndTimingAttrs"/>
-		<attributeGroup ref="smil20:durTimingAttrs"/>
-		<attributeGroup ref="smil20:repeatTimingAttrs"/>
-		<attributeGroup ref="smil20:deprecatedRepeatTiming"/>
-		<attributeGroup ref="smil20:minMaxTimingAttrs"/>
-	</attributeGroup>
-	<element name="animateMotion" type="smil20lang:animateMotionType"/>
-	<complexType name="animateMotionType">
-		<complexContent>
-			<extension base="smil20:animateMotionPrototype">
-				<choice minOccurs="0" maxOccurs="unbounded">
-					<any namespace="##other" processContents="lax"/>
-				</choice>
-				<attributeGroup ref="smil20lang:CoreAttrs"/>
-				<attributeGroup ref="smil20lang:TimingAttrs"/>
-				<attributeGroup ref="smil20:animTargetAttrs"/>
-				<attributeGroup ref="smil20:animModeAttrs"/>
-				<attributeGroup ref="smil20:skipContentAttrs"/>
-				<anyAttribute namespace="##any" processContents="strict"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="animateColor" type="smil20lang:animateColorType"/>
-	<complexType name="animateColorType">
-		<complexContent>
-			<extension base="smil20:animateColorPrototype">
-				<choice minOccurs="0" maxOccurs="unbounded">
-					<any namespace="##other" processContents="lax"/>
-				</choice>
-				<attributeGroup ref="smil20lang:CoreAttrs"/>
-				<attributeGroup ref="smil20lang:TimingAttrs"/>
-				<attributeGroup ref="smil20:animTargetAttrs"/>
-				<attributeGroup ref="smil20:animModeAttrs"/>
-				<attributeGroup ref="smil20:skipContentAttrs"/>
-				<anyAttribute namespace="##any" processContents="strict"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="set" type="smil20lang:setType"/>
-	<complexType name="setType">
-		<complexContent>
-			<extension base="smil20:setPrototype">
-				<choice minOccurs="0" maxOccurs="unbounded">
-					<any namespace="##other" processContents="lax"/>
-				</choice>
-				<attributeGroup ref="smil20lang:CoreAttrs"/>
-				<attributeGroup ref="smil20lang:TimingAttrs"/>
-				<attributeGroup ref="smil20:animTargetAttrs"/>
-				<attributeGroup ref="smil20:skipContentAttrs"/>
-				<anyAttribute namespace="##any" processContents="strict"/>
-			</extension>
-		</complexContent>
-	</complexType>
-</schema>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/www.w3.org/SMIL20-20010731/smil20/smil20.xsd b/src/main/resources/input/IHW/xsd/www.w3.org/SMIL20-20010731/smil20/smil20.xsd
deleted file mode 100644
index 47c4ba598..000000000
--- a/src/main/resources/input/IHW/xsd/www.w3.org/SMIL20-20010731/smil20/smil20.xsd
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-=================== OpenGIS ============================  
-	This schema is here because there are errors in publicly available smil schemas at w3c site.
-	One is acknowledged by w3c - it is typographical error described in SMIL errata document at:
- 	http://www.w3.org/2001/07/REC-SMIL20-20010731-errata
- 	under:
-	E30: Correction in the SMIL 2.0 utility Schema, section B.3.48 (revised 29 03 2002)
-	Others (at least one) are assumed after failed validation using Visual Studio .NET.
-	These smil schemas are reorganized to include in minimum number of files all and only definitions required by
-	defaultStyle.xsd. It was done to enable the validation of GML3.0 schemas.
-	When w3c fixes the public schemas these will be discarded 
-	comment: Milan Trninic, Galdos Systems Inc., May 2002
-	
-	comment#2: Milan Trninic, Galdos Systems Inc., Dec 2002
-	In order to validate with xerces, changed the "x:" prefix to "xml:" in the namespace declaration and reference to "lang" attribute
-=================== OpenGIS ============================ 
--->
-<!--
-XML Schema for the SMIL 2.0 modules
-
-This is SMIL 2.0
-Copyright: 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-See http://www.w3.org/Consortium/Legal/.
-
-Public URI: http://www.w3.org/2001/SMIL20/smil20.xsd
-Author: Aaron Michael Cohen (Intel)
-Revision: 2001/07/31
--->
-<schema targetNamespace="http://www.w3.org/2001/SMIL20/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:smil20="http://www.w3.org/2001/SMIL20/" xmlns:smil20lang="http://www.w3.org/2001/SMIL20/Language" elementFormDefault="qualified">
-	<import namespace="http://www.w3.org/2001/SMIL20/Language" schemaLocation="smil20-language.xsd"/>
-	<!-- ============================================================= 
-	struct.xsd
-	============================================================== -->
-	<import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml-mod.xsd"/>
-	<attributeGroup name="structureModuleAttrs">
-		<attribute name="id" type="ID" use="optional"/>
-		<attribute name="class" type="string" use="optional"/>
-		<attribute ref="xml:lang" use="optional"/>
-	</attributeGroup>
-	<!-- ============================================================= 
-	content.xsd
-	============================================================== -->
-	<attributeGroup name="skipContentAttrs">
-		<attribute name="skip-content" type="boolean" use="optional" default="true"/>
-	</attributeGroup>
-	<!-- ============================================================= 
-	media.xsd
-	============================================================== -->
-	<attributeGroup name="alternateContentAttrs">
-		<attribute name="alt" type="string" use="optional"/>
-		<attribute name="longdesc" type="anyURI" use="optional"/>
-	</attributeGroup>
-	<!-- ============================================================= 
-	utility.xsd
-	============================================================== -->
-	<simpleType name="nonNegativeDecimalType">
-		<restriction base="decimal">
-			<minInclusive value="0.0"/>
-		</restriction>
-	</simpleType>
-	<!-- ============================================================= 
-	animate.xsd
-	============================================================== -->
-	<element name="animate" type="smil20lang:animateType" substitutionGroup="smil20lang:animate"/>
-	<complexType name="animatePrototype">
-		<attributeGroup ref="smil20:animNamedTargetAttrs"/>
-		<attributeGroup ref="smil20:animAddAccumAttrs"/>
-		<attributeGroup ref="smil20:animValuesAttrs"/>
-	</complexType>
-	<attributeGroup name="animNamedTargetAttrs">
-		<attribute name="attributeName" type="string" use="required"/>
-		<attribute name="attributeType" use="optional" default="auto">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="XML"/>
-					<enumeration value="CSS"/>
-					<enumeration value="auto"/>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</attributeGroup>
-	<attributeGroup name="animAddAccumAttrs">
-		<attribute name="additive" use="optional" default="replace">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="replace"/>
-					<enumeration value="sum"/>
-				</restriction>
-			</simpleType>
-		</attribute>
-		<attribute name="accumulate" use="optional" default="none">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="none"/>
-					<enumeration value="sum"/>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</attributeGroup>
-	<attributeGroup name="animValuesAttrs">
-		<attributeGroup ref="smil20:animSetValuesAttrs"/>
-		<attribute name="from" type="string" use="optional"/>
-		<attribute name="by" type="string" use="optional"/>
-		<attribute name="values" type="string" use="optional"/>
-	</attributeGroup>
-	<attributeGroup name="animSetValuesAttrs">
-		<attribute name="to" type="string" use="optional"/>
-	</attributeGroup>
-	<attributeGroup name="animTargetAttrs">
-		<attribute name="targetElement" type="IDREF" use="optional"/>
-	</attributeGroup>
-	<attributeGroup name="animModeAttrs">
-		<attribute name="calcMode" use="optional" default="linear">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="discrete"/>
-					<enumeration value="linear"/>
-					<enumeration value="paced"/>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</attributeGroup>
-	<element name="animateMotion" type="smil20lang:animateMotionType" substitutionGroup="smil20lang:animateMotion"/>
-	<complexType name="animateMotionPrototype">
-		<attributeGroup ref="smil20:animAddAccumAttrs"/>
-		<attributeGroup ref="smil20:animValuesAttrs"/>
-		<attribute name="origin" type="string" use="optional"/>
-	</complexType>
-	<element name="animateColor" type="smil20lang:animateColorType" substitutionGroup="smil20lang:animateColor"/>
-	<complexType name="animateColorPrototype">
-		<attributeGroup ref="smil20:animNamedTargetAttrs"/>
-		<attributeGroup ref="smil20:animAddAccumAttrs"/>
-		<attributeGroup ref="smil20:animValuesAttrs"/>
-	</complexType>
-	<element name="set" type="smil20lang:setType" substitutionGroup="smil20lang:set"/>
-	<complexType name="setPrototype">
-		<attributeGroup ref="smil20:animNamedTargetAttrs"/>
-		<attributeGroup ref="smil20:animSetValuesAttrs"/>
-	</complexType>
-	<!-- ============================================================= 
-	timing.xsd
-	============================================================== -->
-	<attributeGroup name="syncBehaviorAttrs">
-		<attribute name="syncBehavior" type="smil20:syncBehaviorType" default="default"/>
-		<attribute name="syncTolerance" type="string" use="optional"/>
-	</attributeGroup>
-	<simpleType name="syncBehaviorType">
-		<restriction base="string">
-			<enumeration value="canSlip"/>
-			<enumeration value="locked"/>
-			<enumeration value="independent"/>
-			<enumeration value="default"/>
-		</restriction>
-	</simpleType>
-	<attributeGroup name="syncBehaviorDefaultAttrs">
-		<attribute name="syncBehaviorDefault" type="smil20:syncBehaviorDefaultType" default="inherit"/>
-		<attribute name="syncToleranceDefault" type="string" default="inherit"/>
-	</attributeGroup>
-	<simpleType name="syncBehaviorDefaultType">
-		<restriction base="string">
-			<enumeration value="canSlip"/>
-			<enumeration value="locked"/>
-			<enumeration value="independent"/>
-			<enumeration value="inherit"/>
-		</restriction>
-	</simpleType>
-	<attributeGroup name="restartTimingAttrs">
-		<attribute name="restart" type="smil20:restartTimingType" default="default"/>
-	</attributeGroup>
-	<simpleType name="restartTimingType">
-		<restriction base="string">
-			<enumeration value="never"/>
-			<enumeration value="always"/>
-			<enumeration value="whenNotActive"/>
-			<enumeration value="default"/>
-		</restriction>
-	</simpleType>
-	<attributeGroup name="restartDefaultAttrs">
-		<attribute name="restartDefault" type="smil20:restartDefaultType" default="inherit"/>
-	</attributeGroup>
-	<simpleType name="restartDefaultType">
-		<restriction base="string">
-			<enumeration value="never"/>
-			<enumeration value="always"/>
-			<enumeration value="whenNotActive"/>
-			<enumeration value="inherit"/>
-		</restriction>
-	</simpleType>
-	<attributeGroup name="fillTimingAttrs">
-		<attribute name="fill" type="smil20:fillTimingAttrsType" default="default"/>
-	</attributeGroup>
-	<simpleType name="fillTimingAttrsType">
-		<restriction base="string">
-			<enumeration value="remove"/>
-			<enumeration value="freeze"/>
-			<enumeration value="hold"/>
-			<enumeration value="auto"/>
-			<enumeration value="default"/>
-			<enumeration value="transition"/>
-		</restriction>
-	</simpleType>
-	<attributeGroup name="fillDefaultAttrs">
-		<attribute name="fillDefault" type="smil20:fillDefaultType" default="inherit"/>
-	</attributeGroup>
-	<simpleType name="fillDefaultType">
-		<restriction base="string">
-			<enumeration value="remove"/>
-			<enumeration value="freeze"/>
-			<enumeration value="hold"/>
-			<enumeration value="auto"/>
-			<enumeration value="inherit"/>
-			<enumeration value="transition"/>
-		</restriction>
-	</simpleType>
-	<attributeGroup name="beginEndTimingAttrs">
-		<attribute name="begin" type="string"/>
-		<attribute name="end" type="string"/>
-	</attributeGroup>
-	<attributeGroup name="durTimingAttrs">
-		<attribute name="dur" type="string"/>
-	</attributeGroup>
-	<attributeGroup name="repeatTimingAttrs">
-		<attribute name="repeatDur" type="string"/>
-		<attribute name="repeatCount" type="smil20:nonNegativeDecimalType"/>
-	</attributeGroup>
-	<attributeGroup name="deprecatedRepeatTiming">
-		<attribute name="repeat" type="nonNegativeInteger"/>
-	</attributeGroup>
-	<attributeGroup name="minMaxTimingAttrs">
-		<attribute name="min" type="string"/>
-		<attribute name="max" type="string"/>
-	</attributeGroup>
-</schema>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/www.w3.org/SMIL20-20010731/smil20/xml-mod.xsd b/src/main/resources/input/IHW/xsd/www.w3.org/SMIL20-20010731/smil20/xml-mod.xsd
deleted file mode 100644
index d01a0fb5a..000000000
--- a/src/main/resources/input/IHW/xsd/www.w3.org/SMIL20-20010731/smil20/xml-mod.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-=================== OpenGIS ============================  
-	This schema is required by SMIL schemas.
-	There are errors in publicly available smil schemas at w3c site.
-	One is acknowledged by w3c - it is typographical error described in SMIL errata document at:
- 	http://www.w3.org/2001/07/REC-SMIL20-20010731-errata
- 	under:
-	E30: Correction in the SMIL 2.0 utility Schema, section B.3.48 (revised 29 03 2002)
-	Others (at least one) are assumed after failed validation using Visual Studio .NET.
-	These smil schemas are reorganized to include in minimum number of files all and only definitions required by
-	defaultStyle.xsd. It was done to enable the validation of GML3.0 schemas.
-	When w3c fixes the public schemas these will be discarded 
-	comment: Milan Trninic, Galdos Systems Inc., May 2002
-	
-	comment#2: Milan Trninic, Galdos Systems Inc., Dec 2002
-	In order to validate with xerces, changed the "x:" prefix to "xml:" in the namespace declaration and references to "lang" and "space" attributes
-=================== OpenGIS ============================ 
--->
-<schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns="http://www.w3.org/2001/XMLSchema">
-	<attribute name="lang" type="language">
-		<annotation>
-			<documentation>In due course, we should install the relevant ISO 2- and 3-letter
-                codes as the enumerated possible values . . .</documentation>
-		</annotation>
-	</attribute>
-	<attribute name="space" default="preserve">
-		<simpleType>
-			<restriction base="NCName">
-				<enumeration value="default"/>
-				<enumeration value="preserve"/>
-			</restriction>
-		</simpleType>
-	</attribute>
-	<attributeGroup name="specialAttrs">
-		<attribute ref="xml:lang"/>
-		<attribute ref="xml:space"/>
-	</attributeGroup>
-</schema>
\ No newline at end of file
diff --git a/src/main/resources/input/IHW/xsd/www.w3.org/XLINKS-BROPROFILE/xlink/1.0.0/xlink-profile.xsd b/src/main/resources/input/IHW/xsd/www.w3.org/XLINKS-BROPROFILE/xlink/1.0.0/xlink-profile.xsd
deleted file mode 100644
index 0091abd05..000000000
--- a/src/main/resources/input/IHW/xsd/www.w3.org/XLINKS-BROPROFILE/xlink/1.0.0/xlink-profile.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink">
- <xs:annotation>
-  <xs:documentation>Xlink profile for BRO</xs:documentation>
- </xs:annotation>
- 
- <xs:attribute name="type" type="xlink:typeType"/>
-
- <xs:simpleType name="typeType">
-  <xs:restriction base="xs:token">
-   <xs:enumeration value="simple"/>
-  </xs:restriction>
- </xs:simpleType>
-
- <xs:attribute name="href" type="xlink:hrefType"/>
-
- <xs:simpleType name="hrefType">
-  <xs:restriction base="xs:anyURI"/>
- </xs:simpleType>
-
- <xs:attributeGroup name="simpleAttrs">
-  <xs:attribute ref="xlink:type" fixed="simple"/>
-  <xs:attribute ref="xlink:href"/>
- </xs:attributeGroup>
-
-</xs:schema>
\ No newline at end of file
diff --git a/src/main/resources/input/ISO/xsd/cm-GML322PROFILE.xml b/src/main/resources/input/ISO/xsd/cm-GML322PROFILE.xml
new file mode 100644
index 000000000..d0effddf1
--- /dev/null
+++ b/src/main/resources/input/ISO/xsd/cm-GML322PROFILE.xml
@@ -0,0 +1,671 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cs:Map xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:cs="http://www.imvertor.org/metamodels/conceptualschemas/model/v20181210"
+    xmlns:cs-ref="http://www.imvertor.org/metamodels/conceptualschemas/model-ref/v20181210"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xsi:schemaLocation="http://www.imvertor.org/metamodels/conceptualschemas/model/v20181210 
+    ../../../etc/xsd/ConceptualSchema/root/model/v20181210/ConceptualSchemas_Model_v1_0.xsd">
+   
+    <cs:id>GML322PROFILE</cs:id>
+    <cs:namespace>http://www.opengis.net/gml/3.2</cs:namespace>
+    <cs:desc>Kadaster profiel van GML 3.2.2. Let op, profielen kunnen ook dynamisch worden gegenereerd voor specifieke toepassingen.</cs:desc>
+    <cs:location>http://schemas.opengis.net/gml/3.2/[appinfo/gml-profile-name-encoded].xsd</cs:location>
+    <!-- de locatie is een standaard naam kadaster-gml of een model specifieke naam zoals bakstenen-gml, afhanklijk van de parameter cli/creategmlprofile yes/no -->
+    <cs:phase>3</cs:phase>
+    <cs:version>3.2.2</cs:version>
+    <cs:release>20200728</cs:release>
+    <cs:forSchema>
+        <cs-ref:ConceptualSchemaRef xlink:href="#GML"/>
+    </cs:forSchema>
+    <cs:constructs>
+       <cs:Construct>
+          <cs:name>GM_SENTINEL</cs:name>
+          <cs:sentinel>true</cs:sentinel>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_AbstractFeature</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>AbstractFeature</cs:name>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_AbstractFeatureType</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>AbstractFeatureType</cs:name>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_AbstractFeatureMemberType</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>AbstractFeatureMemberType</cs:name>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_AbstractFeatureCollection</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>AbstractFeatureCollection</cs:name>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_AbstractFeatureCollectionType</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>AbstractFeatureCollectionType</cs:name>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_AbstractFeatureMember</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>AbstractFeatureMember</cs:name>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_AbstractFeatureMemberType</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>AbstractFeatureMemberType</cs:name>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_AbstractGML</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>AbstractGML</cs:name>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_AbstractGMLType</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>AbstractGMLType</cs:name>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_Point</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>Point</cs:name>
+                <cs:asAttribute>PointPropertyType</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+          <cs:rdfTypes>
+             <cs:RdfType>
+                <cs:name>rdfs:Datatype</cs:name>
+             </cs:RdfType>
+          </cs:rdfTypes>
+          <cs:oasTypes>
+             <cs:OasType>
+                <cs:name>pointGeoJSON</cs:name>
+                <cs:primitive>false</cs:primitive>
+             </cs:OasType>
+          </cs:oasTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_Curve</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>Curve</cs:name>
+                <cs:asAttribute>CurvePropertyType</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+          <cs:rdfTypes>
+             <cs:RdfType>
+                <cs:name>rdfs:Datatype</cs:name>
+             </cs:RdfType>
+          </cs:rdfTypes>
+          <cs:oasTypes>
+             <cs:OasType>
+                <cs:name>linestringGeoJSON</cs:name>
+                <cs:primitive>false</cs:primitive>
+             </cs:OasType>
+          </cs:oasTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_Surface</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>Surface</cs:name>
+                <cs:asAttribute>SurfacePropertyType</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+          <cs:rdfTypes>
+             <cs:RdfType>
+                <cs:name>rdfs:Datatype</cs:name>
+             </cs:RdfType>
+          </cs:rdfTypes>
+          <cs:oasTypes>
+             <cs:OasType>
+                <cs:name>polygonGeoJSON</cs:name>
+                <cs:primitive>false</cs:primitive>
+             </cs:OasType>
+          </cs:oasTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_MultiPoint</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>MultiPoint</cs:name>
+                <cs:asAttribute>MultiPointPropertyType</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+          <cs:rdfTypes>
+             <cs:RdfType>
+                <cs:name>rdfs:Datatype</cs:name>
+             </cs:RdfType>
+          </cs:rdfTypes>
+          <cs:oasTypes>
+             <cs:OasType>
+                <cs:name>multipointGeoJSON</cs:name>
+                <cs:primitive>false</cs:primitive>
+             </cs:OasType>
+          </cs:oasTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_MultiSurface</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>MultiSurface</cs:name>
+                <cs:asAttribute>MultiSurfacePropertyType</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+          <cs:rdfTypes>
+             <cs:RdfType>
+                <cs:name>rdfs:Datatype</cs:name>
+             </cs:RdfType>
+          </cs:rdfTypes>
+          <cs:oasTypes>
+             <cs:OasType>
+                <cs:name>multipolygonGeoJSON</cs:name>
+                <cs:primitive>false</cs:primitive>
+             </cs:OasType>
+          </cs:oasTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_MultiCurve</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>MultiCurve</cs:name>
+                <cs:asAttribute>MultiCurvePropertyType</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+          <cs:rdfTypes>
+             <cs:RdfType>
+                <cs:name>rdfs:Datatype</cs:name>
+             </cs:RdfType>
+          </cs:rdfTypes>
+          <cs:oasTypes>
+             <cs:OasType>
+                <cs:name>multilinestringGeoJSON</cs:name>
+                <cs:primitive>false</cs:primitive>
+             </cs:OasType>
+          </cs:oasTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_MultiLinestring</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:oasTypes>
+             <cs:OasType>
+                <cs:name>multilinestringGeoJSON</cs:name>
+                <cs:primitive>false</cs:primitive>
+             </cs:OasType>
+          </cs:oasTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_Geometry</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>Geometry</cs:name>
+                <cs:asAttribute>GeometryPropertyType</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+          <cs:oasTypes>
+             <cs:OasType>
+                <cs:name>geometryGeoJSON</cs:name>
+                <cs:primitive>false</cs:primitive>
+             </cs:OasType>
+          </cs:oasTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_Geometrycollection</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:oasTypes>
+             <cs:OasType>
+                <cs:name>geometrycollectionGeoJSON</cs:name>
+                <cs:primitive>false</cs:primitive>
+             </cs:OasType>
+          </cs:oasTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_MultiGeometry</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>MultiGeometry</cs:name>
+                <cs:asAttribute>MultiGeometryPropertyType</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+          <cs:oasTypes>
+             <cs:OasType>
+                <cs:name>geometrycollectionGeoJSON</cs:name>
+                <cs:primitive>false</cs:primitive>
+             </cs:OasType>
+          </cs:oasTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_ArcString</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>ArcString</cs:name>
+                <cs:asAttribute>ArcStringPropertyType</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+          <cs:rdfTypes>
+             <cs:RdfType>
+                <cs:name>rdfs:Datatype</cs:name>
+             </cs:RdfType>
+          </cs:rdfTypes>
+          <cs:oasTypes>
+             <cs:OasType>
+                <cs:name>linestringGeoJSON</cs:name>
+                <cs:primitive>false</cs:primitive>
+             </cs:OasType>
+          </cs:oasTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_LineString</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>LineString</cs:name>
+                <cs:asAttribute>LineStringPropertyType</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+          <cs:rdfTypes>
+             <cs:RdfType>
+                <cs:name>rdfs:Datatype</cs:name>
+             </cs:RdfType>
+          </cs:rdfTypes>
+          <cs:oasTypes>
+             <cs:OasType>
+                <cs:name>linestringGeoJSON</cs:name>
+                <cs:primitive>false</cs:primitive>
+             </cs:OasType>
+          </cs:oasTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_Polygon</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>PolygonPatch</cs:name>
+                <cs:asAttribute>PolygonPatchType</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+          <cs:rdfTypes>
+             <cs:RdfType>
+                <cs:name>rdfs:Datatype</cs:name>
+             </cs:RdfType>
+          </cs:rdfTypes>
+          <cs:oasTypes>
+             <cs:OasType>
+                <cs:name>polygonGeoJSON</cs:name>
+                <cs:primitive>false</cs:primitive>
+             </cs:OasType>
+          </cs:oasTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_Object</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>Object</cs:name>
+                <cs:asAttribute>GeometryPropertyType</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_Primitive</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>Primitve</cs:name>
+                <cs:asAttribute>GeometricPrimtivePropertyType</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_Position</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>Position</cs:name>
+                <cs:asAttribute>geometricPositionGroup</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_PointArray</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>PointArray</cs:name>
+                <cs:asAttribute>geometricPositionListGroup</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+          <cs:rdfTypes>
+             <cs:RdfType>
+                <cs:name>rdfs:Datatype</cs:name>
+             </cs:RdfType>
+          </cs:rdfTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_Solid</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>Solid</cs:name>
+                <cs:asAttribute>SolidPropertyType</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+          <cs:rdfTypes>
+             <cs:RdfType>
+                <cs:name>rdfs:Datatype</cs:name>
+             </cs:RdfType>
+          </cs:rdfTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_OrientableCurve</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>OrientableCurve</cs:name>
+                <cs:asAttribute>CurvePropertyType</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+          <cs:rdfTypes>
+             <cs:RdfType>
+                <cs:name>rdfs:Datatype</cs:name>
+             </cs:RdfType>
+          </cs:rdfTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_OrientableSurface</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>OrientableSurface</cs:name>
+                <cs:asAttribute>SurfacePropertyType</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+          <cs:rdfTypes>
+             <cs:RdfType>
+                <cs:name>rdfs:Datatype</cs:name>
+             </cs:RdfType>
+          </cs:rdfTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_CompositePoint</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>CompositePoint</cs:name>
+                <cs:asAttribute>PointPropertyType</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+          <cs:rdfTypes>
+             <cs:RdfType>
+                <cs:name>rdfs:Datatype</cs:name>
+             </cs:RdfType>
+          </cs:rdfTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_Complex</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>Complex</cs:name>
+                <cs:asAttribute>GeometricComplexPropertyType</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_Aggregate</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>Aggregate</cs:name>
+                <cs:asAttribute>MultiGeometryPropertyType</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_MultiSolid</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>MultiSolid</cs:name>
+                <cs:asAttribute>MultiMultiSolidPropertyType</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+          <cs:rdfTypes>
+             <cs:RdfType>
+                <cs:name>rdfs:Datatype</cs:name>
+             </cs:RdfType>
+          </cs:rdfTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_MultiPrimitive</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>MultiPrimitive</cs:name>
+                <cs:asAttribute>MultiGeometryPropertyType</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+          <cs:rdfTypes>
+             <cs:RdfType>
+                <cs:name>rdfs:Datatype</cs:name>
+             </cs:RdfType>
+          </cs:rdfTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>GM_Aggregate</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>Aggregate</cs:name>
+                <cs:asAttribute>AggregatePropertyType</cs:asAttribute>
+                <cs:asAttributeDesignation>complextype</cs:asAttributeDesignation>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>Measure</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>MeasureType</cs:name>
+                <cs:primitive>false</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>Binary</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>xs:base64Binary</cs:name>
+                <cs:primitive>true</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>Boolean</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>xs:boolean</cs:name>
+                <cs:primitive>true</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>CharacterString</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>xs:string</cs:name>
+                <cs:primitive>true</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>Date</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>xs:date</cs:name>
+                <cs:primitive>true</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>DateTime</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>xs:dateTime</cs:name>
+                <cs:primitive>true</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>Integer</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>xs:integer</cs:name>
+                <cs:primitive>true</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>Real</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>xs:decimal</cs:name>
+                <cs:primitive>true</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>Time</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>xs:time</cs:name>
+                <cs:primitive>true</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+       <cs:Construct>
+          <cs:name>URI</cs:name>
+          <cs:sentinel>false</cs:sentinel>
+          <cs:xsdTypes>
+             <cs:XsdType>
+                <cs:name>xs:anyURI</cs:name>
+                <cs:primitive>true</cs:primitive>
+             </cs:XsdType>
+          </cs:xsdTypes>
+       </cs:Construct>
+    </cs:constructs>
+</cs:Map>
\ No newline at end of file
diff --git a/src/main/resources/input/ISO/xsd/cs-GML322PROFILE.xml b/src/main/resources/input/ISO/xsd/cs-GML322PROFILE.xml
new file mode 100644
index 000000000..af14bf5af
--- /dev/null
+++ b/src/main/resources/input/ISO/xsd/cs-GML322PROFILE.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cs:ConceptualSchema xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:cs="http://www.imvertor.org/metamodels/conceptualschemas/model/v20181210"
+    xmlns:cs-ref="http://www.imvertor.org/metamodels/conceptualschemas/model-ref/v20181210"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xsi:schemaLocation="http://www.imvertor.org/metamodels/conceptualschemas/model/v20181210 
+    ../../../etc/xsd/ConceptualSchema/root/model/v20181210/ConceptualSchemas_Model_v1_0.xsd">
+    
+    <!-- conceptual schema for GML 322 profile -->
+    <cs:id>GML</cs:id>
+    <cs:shortName>gml</cs:shortName>
+    <cs:version>3.2.2</cs:version>
+    <cs:phase>3</cs:phase>
+    <cs:desc>ISO19107 Geographic information – Spatial schema</cs:desc>
+    <cs:source>Kadaster</cs:source>
+    <cs:data-location>X<!--TODO--></cs:data-location>
+    <!-- all including conceptual schemas should include the prefix http://www.kadaster.nl/conceptual-schemas/ in their configuration! -->
+    <cs:url>http://www.kadaster.nl/conceptual-schemas/ISO19107</cs:url>
+    <cs:catalogUrl>X<!--TODO--></cs:catalogUrl>
+    
+</cs:ConceptualSchema>
+            
\ No newline at end of file
diff --git a/src/main/resources/input/Imvertor/cfg/owners/Imvertor.xml b/src/main/resources/input/Imvertor/cfg/owners/Imvertor.xml
index b5a065f59..50ce41880 100644
--- a/src/main/resources/input/Imvertor/cfg/owners/Imvertor.xml
+++ b/src/main/resources/input/Imvertor/cfg/owners/Imvertor.xml
@@ -29,7 +29,7 @@
     <!-- 
         some constructs in UML have a fixed value
     -->
-    <parameter name="fixed-identification-attribute-name">identificatie</parameter>
+    <parameter name="fixed-identification-attribute-name"/><!--name may be anything-->
     <parameter name="url-prefix-conceptual-schema">http://www.kadaster.nl/conceptual-schemas/</parameter>
     <parameter name="url-prefix-schema-waardelijsten">http://www.kadaster.nl/schemas/waardelijsten/</parameter>
     <parameter name="class-name-waardelijst">Waardelijst</parameter>
diff --git a/src/main/resources/input/KING/cfg/owners/KING.xml b/src/main/resources/input/KING/cfg/owners/KING.xml
index 683676db7..9cc461da4 100644
--- a/src/main/resources/input/KING/cfg/owners/KING.xml
+++ b/src/main/resources/input/KING/cfg/owners/KING.xml
@@ -43,7 +43,7 @@
     <!--
         some constructs in UML have a fixed value
     -->
-    <parameter name="fixed-identification-attribute-name">identificatie</parameter>
+    <parameter name="fixed-identification-attribute-name"/><!--name may be anything-->
     <parameter name="url-prefix-conceptual-schema">
         <!-- space separated list of conceptual schema URL domains/paths -->
         http://www.geonovum.nl/conceptual-schemas/
diff --git a/src/main/resources/input/KOOP/cfg/owners/KOOP.xml b/src/main/resources/input/KOOP/cfg/owners/KOOP.xml
index 9ac86ea43..3241e22da 100644
--- a/src/main/resources/input/KOOP/cfg/owners/KOOP.xml
+++ b/src/main/resources/input/KOOP/cfg/owners/KOOP.xml
@@ -29,7 +29,7 @@
     <!-- 
         some constructs in UML have a fixed value
     -->
-    <parameter name="fixed-identification-attribute-name">identificatie</parameter>
+    <parameter name="fixed-identification-attribute-name"/><!--name may be anything-->
     <parameter name="url-prefix-conceptual-schema">
         <!-- space separated list of conceptual schema URL domains/paths -->
         http://www.geonovum.nl/conceptual-schemas/
diff --git a/src/main/resources/input/Kadaster/cfg/docrules/Kadaster.xml b/src/main/resources/input/Kadaster/cfg/docrules/Kadaster.xml
index 2482be808..e32857efd 100644
--- a/src/main/resources/input/Kadaster/cfg/docrules/Kadaster.xml
+++ b/src/main/resources/input/Kadaster/cfg/docrules/Kadaster.xml
@@ -45,6 +45,11 @@
     <include-overview-sections-by-type>yes</include-overview-sections-by-type>
     <include-detail-sections-by-type>yes</include-detail-sections-by-type>
     
+    <!-- 
+        Wanneer ReSpec wordt samengesteld, welke config kan worden gebruikt? 
+    -->
+    <respec-config>https://armatiek.nl/respec-profiles/w3c/profile/respec-w3c-common.js</respec-config>
+    
     <!-- visibility of properties: show in accordance with configuration (@show) or compact: only the specified parts -->
     
     <show-properties>config</show-properties> <!-- config, all, compact -->
diff --git a/src/main/resources/input/Kadaster/props/Kadaster.xlsx b/src/main/resources/input/Kadaster/props/Kadaster.xlsx
index 83da94a72..c8fb42b65 100644
Binary files a/src/main/resources/input/Kadaster/props/Kadaster.xlsx and b/src/main/resources/input/Kadaster/props/Kadaster.xlsx differ
diff --git a/src/main/resources/input/Kadaster/xsd/www.opengis.net/GML322PROFILE-20200728/gml/3.2/kadaster-gml.xsd b/src/main/resources/input/Kadaster/xsd/www.opengis.net/GML322PROFILE-20200728/gml/3.2/kadaster-gml.xsd
index 0997834b4..919a64736 100644
--- a/src/main/resources/input/Kadaster/xsd/www.opengis.net/GML322PROFILE-20200728/gml/3.2/kadaster-gml.xsd
+++ b/src/main/resources/input/Kadaster/xsd/www.opengis.net/GML322PROFILE-20200728/gml/3.2/kadaster-gml.xsd
@@ -829,4 +829,12 @@ patches encapsulates the patches of the surface.</documentation>
          <documentation>This property element contains a list of surfaces. The order of the elements is significant and shall be preserved when processing the array.</documentation>
       </annotation>
    </element>
+   <complexType name="AbstractFeatureMemberType" abstract="true">
+      <annotation>
+         <documentation>To create a collection of GML features, a property type shall be derived by extension from gml:AbstractFeatureMemberType.
+            By default, this abstract property type does not imply any ownership of the features in the collection. The owns attribute of gml:OwnershipAttributeGroup may be used on a property element instance to assert ownership of a feature in the collection. A collection shall not own a feature already owned by another object.</documentation>
+      </annotation>
+      <sequence/>
+      <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+   </complexType>
 </schema>
diff --git a/src/main/resources/input/Kennisnet/cfg/docrules/Kennisnet.xml b/src/main/resources/input/Kennisnet/cfg/docrules/Kennisnet.xml
index 3dbcaa8cb..b028a7354 100644
--- a/src/main/resources/input/Kennisnet/cfg/docrules/Kennisnet.xml
+++ b/src/main/resources/input/Kennisnet/cfg/docrules/Kennisnet.xml
@@ -45,4 +45,9 @@
     
     <show-properties>config</show-properties> <!-- config, all, compact -->
     
+    <!-- 
+        Wanneer ReSpec wordt samengesteld, welke config kan worden gebruikt? 
+    -->
+    <respec-config>https://armatiek.nl/respec-profiles/w3c/profile/respec-w3c-common.js</respec-config>
+    
 </doc-rules>
\ No newline at end of file
diff --git a/src/main/resources/input/Kennisnet/cfg/owners/Kennisnet.xml b/src/main/resources/input/Kennisnet/cfg/owners/Kennisnet.xml
index b6f1a7476..20c8c4433 100644
--- a/src/main/resources/input/Kennisnet/cfg/owners/Kennisnet.xml
+++ b/src/main/resources/input/Kennisnet/cfg/owners/Kennisnet.xml
@@ -43,7 +43,7 @@
     <!-- 
         some constructs in UML have a fixed value
     -->
-    <parameter name="fixed-identification-attribute-name">identificatie</parameter>
+    <parameter name="fixed-identification-attribute-name"/><!--name may be anything-->
     <parameter name="url-prefix-conceptual-schema">
         <!-- space separated list of conceptual schema URL domains/paths -->
         http://www.geonovum.nl/conceptual-schemas/
diff --git a/src/main/resources/input/MIM/cfg/docrules/MIM11.xml b/src/main/resources/input/MIM/cfg/docrules/MIM11.xml
index 00b41ecc8..371d8bf0c 100644
--- a/src/main/resources/input/MIM/cfg/docrules/MIM11.xml
+++ b/src/main/resources/input/MIM/cfg/docrules/MIM11.xml
@@ -52,6 +52,11 @@
     
     <show-properties>config</show-properties> <!-- config, all, compact -->
     
+    <!-- 
+        Wanneer ReSpec wordt samengesteld, welke config kan worden gebruikt? 
+    -->
+    <respec-config>https://armatiek.nl/respec-profiles/w3c/profile/respec-w3c-common.js</respec-config>
+    
     <image-purpose id="CFG-IMG-OVERVIEW">
         <name lang="nl">Overzichtsdiagram</name>
         <name lang="en">Overview diagram</name>
diff --git a/src/main/resources/input/MIM/cfg/tvsets/MIM11.xml b/src/main/resources/input/MIM/cfg/tvsets/MIM11.xml
index 2e550c44c..451a13bf1 100644
--- a/src/main/resources/input/MIM/cfg/tvsets/MIM11.xml
+++ b/src/main/resources/input/MIM/cfg/tvsets/MIM11.xml
@@ -113,6 +113,10 @@
             <stereotypes>
                 <stereo minmax="0..1">stereotype-name-complextype</stereo><!-- TODO moet eigenlijk verwijderd worden, ook in 1.0 en misschien zelfs in SBR? -->
                 <stereo minmax="0..1">stereotype-name-relation-role</stereo><!--TODO uitwerken in aparte validatiestap; relatiesoort/relatierol leidend -->
+                <stereo minmax="1..1">stereotype-name-base-package</stereo>
+                <stereo minmax="1..1">stereotype-name-application-package</stereo>
+                <stereo minmax="1..1">stereotype-name-view-package</stereo>
+                <stereo minmax="1..1">stereotype-name-external-package</stereo>
             </stereotypes>
         </tv>
 
diff --git a/src/main/resources/input/BIJ12/eap/BIJ12-MIM11.xmi b/src/main/resources/input/MIM/eap/MIM11.xmi
similarity index 100%
rename from src/main/resources/input/BIJ12/eap/BIJ12-MIM11.xmi
rename to src/main/resources/input/MIM/eap/MIM11.xmi
diff --git a/src/main/resources/input/MIM/xsd/cs-MIM11.xml b/src/main/resources/input/MIM/xsd/cs-MIM11.xml
index 74b634e78..67620a930 100644
--- a/src/main/resources/input/MIM/xsd/cs-MIM11.xml
+++ b/src/main/resources/input/MIM/xsd/cs-MIM11.xml
@@ -10,7 +10,11 @@
     <!-- conceptual schema for MIM11 -->
     <cs:id>MIM11</cs:id>
     <cs:shortName>mim11</cs:shortName>
-    <cs:desc>MIM11 schema</cs:desc>
+    <cs:version>1.1</cs:version>
+    <cs:phase>3</cs:phase>
+    <cs:desc>De primitieve datatypen zoals vastgesteld in de MIM 1.1 specificatie</cs:desc>
+    <cs:source>MIM</cs:source>
+    <cs:data-location>https://docs.geostandaarden.nl/mim/</cs:data-location>
     <!-- all including conceptual schemas should include the prefix http://www.geonovum.nl/conceptual-schemas/ in their configuration! -->
     <cs:url>http://www.geonovum.nl/conceptual-schemas/MIM11</cs:url>
     <cs:catalogUrl>https://geonovum.github.io/MIM-Werkomgeving/[entry]</cs:catalogUrl>
diff --git a/src/main/resources/input/RWS/cfg/owners/RWS.xml b/src/main/resources/input/RWS/cfg/owners/RWS.xml
index 82a70c372..a5d5dc7f4 100644
--- a/src/main/resources/input/RWS/cfg/owners/RWS.xml
+++ b/src/main/resources/input/RWS/cfg/owners/RWS.xml
@@ -29,7 +29,7 @@
     <!-- 
         some constructs in UML have a fixed value
     -->
-    <parameter name="fixed-identification-attribute-name">identificatie</parameter>
+    <parameter name="fixed-identification-attribute-name"/><!--name may be anything-->
     <parameter name="url-prefix-conceptual-schema">http://www.rws.nl/conceptual-schemas/</parameter>
     <parameter name="url-prefix-schema-waardelijsten">http://www.rws.nl/schemas/waardelijsten/</parameter>
     <parameter name="class-name-waardelijst">Waardelijst</parameter>
diff --git a/src/main/resources/input/Waarderingskamer/cfg/owners/Waarderingskamer.xml b/src/main/resources/input/Waarderingskamer/cfg/owners/Waarderingskamer.xml
index 64c0654cf..78fc23893 100644
--- a/src/main/resources/input/Waarderingskamer/cfg/owners/Waarderingskamer.xml
+++ b/src/main/resources/input/Waarderingskamer/cfg/owners/Waarderingskamer.xml
@@ -43,7 +43,7 @@
     <!--
         some constructs in UML have a fixed value
     -->
-    <parameter name="fixed-identification-attribute-name">identificatie</parameter>
+    <parameter name="fixed-identification-attribute-name"/><!--name may be anything-->
     <parameter name="url-prefix-conceptual-schema">
         <!-- space separated list of conceptual schema URL domains/paths -->
         http://www.geonovum.nl/conceptual-schemas/
diff --git a/src/main/resources/input/Waarderingskamer/props/Waarderingskamer.xlsx b/src/main/resources/input/Waarderingskamer/props/Waarderingskamer.xlsx
index 44f2b793b..30b56ba00 100644
Binary files a/src/main/resources/input/Waarderingskamer/props/Waarderingskamer.xlsx and b/src/main/resources/input/Waarderingskamer/props/Waarderingskamer.xlsx differ
diff --git a/src/main/resources/static/release/release.xml b/src/main/resources/static/release/release.xml
index c1d5b9b46..7ffc9760d 100644
--- a/src/main/resources/static/release/release.xml
+++ b/src/main/resources/static/release/release.xml
@@ -1,10 +1,10 @@
 <release-info>
     <release>
         <artifact>Imvertor</artifact>
-        <major-minor>1.65</major-minor>
-        <bugfix>4</bugfix>
+        <major-minor>1.66</major-minor>
+        <bugfix>0</bugfix>
         
-        <notice>Copyright (C) 2016-2019 Dienst voor het Kadaster en de openbare registers.
+        <notice>Copyright (C) 2016-2022 Dienst voor het Kadaster en de openbare registers.
             This program comes with ABSOLUTELY NO WARRANTY; for details pass -help program.
             This is free software, and you are welcome to redistribute it
             under certain conditions; pass -help license for full details.</notice>
diff --git a/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl b/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl
index 600fb0a4a..a9ad94555 100644
--- a/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl
+++ b/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl
@@ -37,6 +37,7 @@
     -->
    
     <xsl:import href="../common/Imvert-common.xsl"/>
+    <xsl:import href="../common/Imvert-common-validation.xsl"/>
     <xsl:import href="Imvert2configuration-speed-analyzer.xsl"/>
     
     <xsl:variable name="configuration-owner-doc" select="imf:document($configuration-owner-name,true())"/>
@@ -124,14 +125,20 @@
         </xsl:result-document>
         x?>
         
-        <!-- signal if not using the latest release of imvertor -->
+        <!-- signal if not using the latest release or a nightly build (or other feature branch build) of imvertor -->
         <xsl:variable name="crx" select="imf:get-config-string('run','version')"/>
         <xsl:variable name="lrx" select="imf:get-config-string('system','latest-imvertor-release')"/>
-        <xsl:variable name="cr" select="string-join(for $m in subsequence(tokenize($crx,'\.'),1,2) return functx:pad-integer-to-length($m,5),'')"/>
-        <xsl:variable name="lr" select="string-join(for $m in subsequence(tokenize($lrx,'\.'),1,2) return functx:pad-integer-to-length($m,5),'')"/>
-        <xsl:if test="$cr lt $lr">
-            <xsl:sequence select="imf:msg(.,'WARNING','You are using Imvertor version [1], however a more recent version [2] is available.',($crx,$lrx))"></xsl:sequence>
-        </xsl:if>
+        <xsl:choose>
+            <xsl:when test="matches($crx, '^\d+\.\d+\.\d+$')"> <!-- regular major-minor version? -->
+                <xsl:variable name="cr" select="string-join(for $m in subsequence(tokenize($crx,'\.'),1,2) return functx:pad-integer-to-length($m,5),'')"/>
+                <xsl:variable name="lr" select="string-join(for $m in subsequence(tokenize($lrx,'\.'),1,2) return functx:pad-integer-to-length($m,5),'')"/>
+                <xsl:sequence select="imf:report-warning(.,$cr lt $lr,'You are using Imvertor version [1], however a more recent version [2] is available.',($crx,$lrx))"/>
+            </xsl:when>
+            <xsl:otherwise> <!-- nightly or other feature branch "non-stable" build: -->
+                <xsl:sequence select="imf:report-warning(.,true(),'You are using Imvertor version [1] which is not considered a stable version. The most recent stable version is [2].',($crx,$lrx))"/>                 
+            </xsl:otherwise>
+        </xsl:choose>
+        
     </xsl:template>
     
     <!-- name normalization on all configuration files -->
@@ -403,6 +410,7 @@
                 <xsl:apply-templates select="($doc-rules//include-overview-sections-by-type)[last()]" mode="#current"/>
                 <xsl:apply-templates select="($doc-rules//include-detail-sections-by-type)[last()]" mode="#current"/>
                 <xsl:apply-templates select="($doc-rules//show-properties)[last()]" mode="#current"/>
+                <xsl:apply-templates select="($doc-rules//respec-config)[last()]" mode="#current"/>
                 
                 <xsl:for-each-group select="$doc-rules//doc-rule[name/@lang=($language,'#all')]" group-by="@id">
                     <xsl:sort select="@order" order="ascending"/>
diff --git a/src/main/resources/xsl/ConfigCompiler/Imvert2ea-profile.xsl b/src/main/resources/xsl/ConfigCompiler/Imvert2ea-profile.xsl
index d52f0d534..ffbbde79e 100644
--- a/src/main/resources/xsl/ConfigCompiler/Imvert2ea-profile.xsl
+++ b/src/main/resources/xsl/ConfigCompiler/Imvert2ea-profile.xsl
@@ -55,8 +55,8 @@
         <xsl:variable name="profile-name" select="$profile-name-string"/>
         <xsl:variable name="profile-version" select="if ($profile-release-string) then concat($profile-release-string,'-',$imvertor-version) else $imvertor-version"/>
         <xsl:variable name="profile-notes" select="imf:insert-fragments-by-index('Generated by Imvertor [1] at [2]',($imvertor-version,imf:format-dateTime(current-dateTime())))"/>
-        <xsl:variable name="profile-file-name" select="concat($profile-name-string,'-',$profile-version,'.ea-profile.xml')"/>
-        <xsl:variable name="toolbox-file-name" select="concat($profile-name-string,'-',$profile-version,'.ea-toolbox.xml')"/>
+        <xsl:variable name="profile-file-name" select="concat($profile-name-string,'.ea-profile.xml')"/>
+        <xsl:variable name="toolbox-file-name" select="concat($profile-name-string,'.ea-toolbox.xml')"/>
         
         <xsl:variable name="measures" select="$visuals/measure"/>
         <xsl:variable name="stereos" select="$visuals/stereo"/>
diff --git a/src/main/resources/xsl/GenericTransformer/RVK-transformer.xsl b/src/main/resources/xsl/GenericTransformer/RVK-transformer.xsl
deleted file mode 100644
index fed8e32bb..000000000
--- a/src/main/resources/xsl/GenericTransformer/RVK-transformer.xsl
+++ /dev/null
@@ -1,356 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="2.0" 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:ext="http://www.imvertor.org/xsl/extensions"
-  xmlns:imf="http://www.imvertor.org/xsl/functions"
-  
-  xmlns:re="http://www.kadaster.nl/schemas/Erfdienstbaarheden/RegistratieErfdienstbaarheden/v20150601"
-  xmlns:ko-ref="http://www.kadaster.nl/schemas/Erfdienstbaarheden/CDMKAD-kadastraalobject-ref/v20150601"
-  xmlns:ko="http://www.kadaster.nl/schemas/Erfdienstbaarheden/CDMKAD-kadastraalobject/v20150601"
-  xmlns:oz-ref="http://www.kadaster.nl/schemas/Erfdienstbaarheden/CDMKAD-onroerendezaak-ref/v20150601"
-  xmlns:oz="http://www.kadaster.nl/schemas/Erfdienstbaarheden/CDMKAD-onroerendezaak/v20150601"
-  xmlns:r-ref="http://www.kadaster.nl/schemas/Erfdienstbaarheden/CDMKAD-recht-ref/v20150601"
-  xmlns:r="http://www.kadaster.nl/schemas/Erfdienstbaarheden/CDMKAD-recht/v20150601"
-  xmlns:s-ref="http://www.kadaster.nl/schemas/Erfdienstbaarheden/CDMKAD-stuk-ref/v20150601"
-  xmlns:s="http://www.kadaster.nl/schemas/Erfdienstbaarheden/CDMKAD-stuk/v20150601"
-  xmlns:p="http://www.kadaster.nl/schemas/generiek/procesresultaat/v20110922"
-  xmlns:t="http://www.kadaster.nl/schemas/Erfdienstbaarheden/CDMKAD-typen/v20150601"
-  
-  xmlns:gml="http://www.opengis.net/gml/3.2"
-  
-  xmlns:cw="http://www.armatiek.nl/namespace/folder-content-wrapper"
-  
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  
-  xmlns:xlink="http://www.w3.org/1999/xlink"
-  
-  >
- 
-  <xsl:import href="../common/Imvert-common.xsl"/>
-  
-  <xsl:output method="xml" indent="yes"/>
-  
-  <!--
-  Zwolle Zoetermeer Utrecht Rotterdam Roermond Middelburg Lelystad Leeuwarden Groningen Eindhoven Breda Assen Arnhem Apeldoorn Amsterdam Alkmaar 
-  
-  <cw:files  role="">
-    <cw:file type="bin" path="Alkmaar\RVK Objecten\AAstandaard.xls" date="1288614394000" name="AAstandaard.xls" ishidden="false" isreadonly="true" ext="xls" fullpath="D:\data\project\Erfdienstbaarheden\RVK\input\Alkmaar\RVK Objecten\AAstandaard.xls"/>
-  
-  -->
-  <xsl:variable name="basepath" select="/bootstrap/data-folder"/>
-  
-  <xsl:variable name="temp-files-path" select="concat($basepath,'/work/files.xml')"/>
-  <xsl:variable name="c" select="imf:serializeFolder(concat($basepath,'/input'),$temp-files-path,'')"/>
-  <xsl:variable name="files" select="if (exists($c)) then imf:document($temp-files-path) else ()"/><!-- force the file listing -->
-  <xsl:variable name="selected-files" select="$files/*/cw:file[not(contains(@fullpath,'Buitenblok'))]"/>
-  
-  <xsl:variable name="cnt" select="count($selected-files)"/>
-  
-  <xsl:template match="/">
-    <xsl:message select="concat($cnt,' files')"/>
-    <xsl:apply-templates select="$selected-files[not(contains(@fullpath,'SPEC objecten')) and contains(@fullpath,'.xls')]"/> <!-- e.g. NDP02_I_RVK.xls -->
-  </xsl:template>
-  
-  <xsl:template match="cw:file">
-    <xsl:variable name="file-id" select="generate-id(.)"/>
-    
-    <xsl:variable name="excel-path" select="@fullpath"/>
-    <xsl:variable name="xml-path" select="concat($basepath,'/output/',@name,'.xml')"/>
-    <xsl:variable name="work-path" select="concat($basepath,'/work/',@name,'.xml')"/>
-  
-    <xsl:message select="concat('SERIALIZING: ', position(), ' of ', $cnt, ' ', $excel-path)"></xsl:message>
-
-    <xsl:variable name="existing-content" select="imf:document($work-path)"/>
-    <xsl:variable name="created-work-path" select="imf:serializeExcel($excel-path,$work-path)"/>
-    <xsl:variable name="excel-content" select="if (exists($existing-content)) then $existing-content else imf:document($created-work-path)"/>
-   
-    <xsl:variable name="prepared" as="element(row)*">
-      <xsl:apply-templates select="$excel-content/workbook/sheet/row" mode="prepare"/>
-    </xsl:variable>
-    
-    <xsl:variable name="info-struct" as="element(stuk)*">
-      <xsl:for-each-group select="$prepared" group-by="concat(@deel,'_',@nummer,'_',@reeks)">
-        <!-- stuk -->
-        <xsl:variable name="stuk-row" select="current-group()[1]"/>
-        <stuk id="{current-grouping-key()}">
-          <deel><xsl:value-of select="$stuk-row/@deel"/></deel>
-          <nummer><xsl:value-of select="$stuk-row/@nummer"/></nummer>
-          <reeks><xsl:value-of select="$stuk-row/@reeks"/></reeks>
-          <regdatum><xsl:value-of select="$stuk-row/@regdatum"/></regdatum>
-          <xsl:for-each-group select="current-group()" group-by="@txt-deel">
-            <!-- stukdeel -->
-            <xsl:variable name="stukdeel-row" select="current-group()[1]"/>
-            <stukdeel>
-              <txt-deel><xsl:value-of select="$stukdeel-row/@txt-deel"/></txt-deel>
-              <xsl:for-each-group select="current-group()" group-by="@soort">
-                <!-- aantekening -->
-                <xsl:variable name="aantekening-row" select="current-group()[1]"/>
-                <aantekening>
-                  <soort><xsl:value-of select="@soort"/></soort>
-                  <xsl:for-each-group select="current-group()" group-by="concat(@gemeente,'_',@sectie,'_',@perceelnr)">
-                    <!-- perceel -->
-                    <xsl:variable name="perceel-row" select="current-group()[1]"/>
-                    <perceel>
-                      <gemeente><xsl:value-of select="@gemeente"/></gemeente>
-                      <sectie><xsl:value-of select="@sectie"/></sectie>
-                      <perceelnr><xsl:value-of select="@perceelnr"/></perceelnr>
-                      <index><xsl:value-of select="@index"/></index>
-                      <indexnr><xsl:value-of select="@indexnr"/></indexnr>
-                      <kavelnr><xsl:value-of select="@kavelnr"/></kavelnr>
-                    </perceel>
-                  </xsl:for-each-group>
-                </aantekening>
-              </xsl:for-each-group>
-            </stukdeel>
-          </xsl:for-each-group>
-        </stuk>
-      </xsl:for-each-group>  
-    </xsl:variable>
-    
-    <!-- een Stuk per file -->
-    <xsl:for-each select="$info-struct">
-      <xsl:variable name="stuk" select="."/>
-      <xsl:variable name="stuk-id" select="generate-id($stuk)"/> 
-      
-      <xsl:variable name="output-file-url" select="imf:file-to-url(concat($xml-path,'/',@id,'-', $file-id, '.xml'))"/>
-      
-      <xsl:variable name="xml-info-raw" as="element(re:RegistratieErfdienstbaarheden)">
-        <re:RegistratieErfdienstbaarheden
-          xsi:schemaLocation="http://www.kadaster.nl/schemas/Erfdienstbaarheden/RegistratieErfdienstbaarheden/v20150601
-          ../../Erfdienstbaarheden-model/20150601/xsd/Erfdienstbaarheden/RegistratieErfdienstbaarheden/v20150601/Erfdienstbaarheden_RegistratieErfdienstbaarheden_v1_0_0.xsd">
-          <!--x
-          <BRON>
-            <xsl:sequence select="."/>
-          </BRON>
-          x-->
-          <re:log>
-            <p:ProcesVerwerking>
-              <p:ProcesVerwerkingCode>?</p:ProcesVerwerkingCode>
-              <p:SeverityCode>?</p:SeverityCode>
-            </p:ProcesVerwerking>
-          </re:log>
-          <re:akte>
-            <s-ref:TerInschrijvingAangebodenStukRef 
-              xlink:href="#TerInschrijvingAangebodenStuk.{$stuk-id}"/>
-          </re:akte>
-          <re:aantekeningen>
-            <xsl:for-each select="$stuk/stukdeel/aantekening">
-              <r-ref:AantekeningRef xlink:href="#Aantekening.{generate-id(.)}"/>
-            </xsl:for-each>
-          </re:aantekeningen>
-          <re:components>
-            <re:RegistratieErfdienstbaarhedenComponents>
-              <xsl:for-each select="stukdeel/aantekening/perceel">
-                <xsl:variable name="perceel" select="."/>
-                <xsl:variable name="perceel-id" select="generate-id($perceel)"/>
-                <oz:Perceel id="Perceel.{$perceel-id}">
-                  <oz:identificatie xsi:nil="true" nilReason="waardeOnbekend"/>
-                  <oz:kadastraleAanduiding>
-                    <oz:kadastraleGemeente>
-                      <t:code><xsl:value-of select="$perceel/gemeente"/></t:code>
-                    </oz:kadastraleGemeente>
-                    <oz:sectie><xsl:value-of select="$perceel/sectie"/></oz:sectie>
-                    <oz:perceelnummer><xsl:value-of select="$perceel/perceelnr"/></oz:perceelnummer>
-                    <oz:indexletter><xsl:value-of select="$perceel/indexnr"/></oz:indexletter>
-                    <oz:indexnummer><xsl:value-of select="$perceel/index"/></oz:indexnummer>
-                    <oz:kavelnummer><xsl:value-of select="$perceel/kavelnr"/></oz:kavelnummer>
-                  </oz:kadastraleAanduiding>
-                  <xsl:for-each select="$info-struct/stukdeel[aantekening/perceel[generate-id(.) = $perceel-id]]">
-                    <xsl:variable name="stukdeel" select="."/>
-                    <xsl:variable name="stukdeel-id" select="generate-id($stukdeel)"/>
-                    <oz:isVermeldIn>
-                      <s-ref:StukdeelRef xlink:href="Stukdeel.{$stukdeel-id}"/>
-                    </oz:isVermeldIn>
-                    <xsl:message select="if (position() eq 2) then 'perceel keert terug in meerdere stukdelen' else ''"></xsl:message>
-                  </xsl:for-each>
-                </oz:Perceel>
-              </xsl:for-each>
-              <xsl:for-each select="stukdeel/aantekening">
-                <xsl:variable name="aantekening" select="."/>
-                <xsl:variable name="aantekening-id" select="generate-id($aantekening)"/>
-                <r:Aantekening id="Aantekening.{$aantekening-id}">
-                  <r:identificatie xsi:nil="true" nilReason="waardeOnbekend"/>
-                  <r:aard>
-                    <t:code>62</t:code>
-                    <t:waarde>Erfdienstbaarheid</t:waarde>
-                  </r:aard>
-                  <r:aanduidingErfdienstbaarheid>
-                    <xsl:variable name="soort" select="normalize-space($aantekening/soort)"/>
-                    <xsl:choose>
-                      <xsl:when test="$soort = 'DI'">
-                        <t:code>1</t:code>
-                        <t:waarde>Dienend</t:waarde>
-                      </xsl:when>
-                      <xsl:when test="$soort = 'HE'">
-                        <t:code>2</t:code>
-                        <t:waarde>Heersend</t:waarde>
-                      </xsl:when>
-                      <xsl:when test="$soort = 'HEDI'">
-                        <t:code>3</t:code>
-                        <t:waarde>Dienend en heersend </t:waarde>
-                      </xsl:when>
-                      <xsl:otherwise>
-                        <xsl:sequence select="imf:msg('WARNING','Soort is onbekend: [1]',$soort)"/>
-                      </xsl:otherwise>
-                    </xsl:choose>
-                  </r:aanduidingErfdienstbaarheid>
-                  <r:aantekeningKadastraalObject>
-                    <xsl:for-each select="$aantekening/perceel">
-                      <xsl:variable name="perceel" select="."/>
-                      <oz-ref:PerceelRef xlink:href="#Perceel.{generate-id($perceel)}"/>
-                    </xsl:for-each>
-                  </r:aantekeningKadastraalObject>
-                  <r:isGebaseerdOp>
-                    <s-ref:StukdeelRef xlink:href="#Stukdeel.{generate-id($aantekening/..)}"/>
-                  </r:isGebaseerdOp>
-                </r:Aantekening>
-              </xsl:for-each>
-              <xsl:for-each select="$stuk/stukdeel">
-                <xsl:variable name="stukdeel" select="."/>
-                <s:Stukdeel id="Stukdeel.{generate-id($stukdeel)}">
-                  <s:identificatie xsi:nil="true" nilReason="waardeOnbekend"/>
-                  <s:aard>
-                    <t:code>62</t:code>
-                    <t:waarde>Erfdienstbaarheid</t:waarde>
-                  </s:aard>
-                  <s:isVerwoordIn>
-                    <s:Tekstdeel>
-                      <s:code>
-                        <xsl:value-of select="$stukdeel/txt-deel"/>
-                      </s:code>
-                    </s:Tekstdeel>
-                  </s:isVerwoordIn>
-                </s:Stukdeel>
-              </xsl:for-each>
-              <s:TerInschrijvingAangebodenStuk 
-                id="TerInschrijvingAangebodenStuk.{$stuk-id}">
-                <s:omvat>
-                  <xsl:for-each select="stukdeel">
-                    <xsl:variable name="stukdeel" select="."/>
-                    <xsl:variable name="stukdeel-id" select="generate-id($stukdeel)"/>
-                    <s-ref:StukdeelRef xlink:href="#Stukdeel.{$stukdeel-id}"/>
-                  </xsl:for-each>
-                </s:omvat>
-                <s:identificatie xsi:nil="true" nilReason="waardeOnbekend"/>
-                <s:aard>
-                  <t:code>5</t:code>
-                  <t:waarde>Overig</t:waarde>
-                </s:aard>
-                <s:deelEnNummer>
-                  <s:deel><xsl:value-of select="$stuk/deel"/></s:deel>
-                  <s:nummer><xsl:value-of select="$stuk/nummer"/></s:nummer>
-                  <s:reeks>
-                    <t:code><xsl:value-of select="$stuk/reeks"/></t:code>
-                  </s:reeks>
-                  <s:registercode>
-                    <t:code>2</t:code>
-                    <t:waarde>HYP4</t:waarde>
-                  </s:registercode>
-                  <s:soortRegister>
-                    <t:code>2</t:code>
-                    <t:waarde>Onroerende Zaken</t:waarde>
-                  </s:soortRegister>
-                </s:deelEnNummer>
-                <s:tijdstipAanbieding>
-                  <xsl:value-of select="imf:convert-date($stuk/regdatum)"/>
-                </s:tijdstipAanbieding>
-                <s:bestaatUit nilReason="geenWaarde" xsi:nil="true"/>
-              </s:TerInschrijvingAangebodenStuk>
-            </re:RegistratieErfdienstbaarhedenComponents>
-          </re:components>
-        </re:RegistratieErfdienstbaarheden>
-      </xsl:variable>
-      
-      <xsl:variable name="xml-info" as="element(re:RegistratieErfdienstbaarheden)">
-        <xsl:apply-templates select="$xml-info-raw" mode="compact"/>
-      </xsl:variable>
-
-      <xsl:result-document href="{$output-file-url}">
-        <xsl:comment select="concat('Excel path: ', $excel-path)"/>
-        <xsl:sequence select="$xml-info"/>
-      </xsl:result-document>
-    </xsl:for-each>
- 
-  </xsl:template>
-  
-  <!--
-        Serialize the excel 97-2003 file to the result XML file.
-        Returns the (full) xml result file path.
-    -->
-  <xsl:function name="imf:serializeExcel" as="xs:string*">
-    <xsl:param name="excelpath"/>
-    <xsl:param name="xmlpath"/>
-    <xsl:sequence select="ext:imvertorExcelSerializer($excelpath,$xmlpath)"/>
-  </xsl:function>
-  <!--
-        Serialize the folder holing the Excels.
-        Returns the (full) xml result file path.
-    -->
-  <xsl:function name="imf:serializeFolder" as="xs:string*">
-    <xsl:param name="folderpath"/>
-    <xsl:param name="xmlpath"/>
-    <xsl:param name="constraints"/>
-    <xsl:sequence select="ext:imvertorFolderSerializer($folderpath,$xmlpath,$constraints)"/>
-  </xsl:function>
-  
-  <!-- selecteer alleen de rows die een kavelnummer hebben. -->
-  <xsl:template match="row" mode="prepare">
-    <xsl:if test="normalize-space(col[@number='14']/data) and not(col[@number='0']/data = ('gemeente','perceel'))">
-      <row 
-        gemeente="{col[@number='0']}" 
-        sectie="{col[@number='1']/data}"	
-        perceelnr="{col[@number='2']/data}"	
-        index="{col[@number='3']/data}"	
-        indexnr="{col[@number='4']/data}"	
-        peildatum="{col[@number='5']/data}"	
-        status="{col[@number='6']/data}"	
-        register="{col[@number='7']/data}"	
-        deel="{col[@number='8']/data}"	
-        nummer="{col[@number='9']/data}"	
-        reeks="{col[@number='10']/data}"	
-        txt-deel="{col[@number='11']/data}"	
-        soort="{col[@number='12']/data}"	
-        regdatum="{col[@number='13']/data}"	
-        kavelnr="{col[@number='14']/data}"	
-      />
-    </xsl:if>
-  </xsl:template>
-  
-  <xsl:template match="node()|@*">
-    <xsl:copy>
-      <xsl:apply-templates select="@*"/>
-      <xsl:apply-templates select="node()"/>
-    </xsl:copy>
-  </xsl:template>
-  
-  <xsl:template match="dummy">
-    <!-- ignore -->
-  </xsl:template>
-  
-  <xsl:template match="*" mode="compact">
-    <xsl:if test="* or normalize-space(.) or exists(@xlink:href) or exists(@xsi:nil)">
-      <xsl:copy>
-        <xsl:copy-of select="@*"/>
-        <xsl:apply-templates select="node()" mode="compact"/>
-      </xsl:copy>
-    </xsl:if>
-  </xsl:template>
-  <xsl:template match="text()" mode="compact">
-      <xsl:copy/>
-  </xsl:template>
-  
-  <xsl:function name="imf:convert-date" as="xs:string*">
-    <xsl:param name="datum"/>
-    <xsl:if test="matches($datum,'\d+-\d+-\d+')">
-      <xsl:variable name="t" select="tokenize($datum,'-')"/>
-      <xsl:value-of select="concat('19',$t[3],'-',imf:leftpad($t[2]),'-',imf:leftpad($t[1]),'T00:00:00')"/>
-    </xsl:if>
-  </xsl:function>
-  
-  <xsl:function name="imf:leftpad">
-    <xsl:param name="s"/>
-    <xsl:value-of select="format-number(xs:integer($s), '00')" />
-  </xsl:function>
-  
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/main/resources/xsl/ImvertCompiler/Imvert2validate-derivation.xsl b/src/main/resources/xsl/ImvertCompiler/Imvert2validate-derivation.xsl
index d3db681fd..ef6e8596a 100644
--- a/src/main/resources/xsl/ImvertCompiler/Imvert2validate-derivation.xsl
+++ b/src/main/resources/xsl/ImvertCompiler/Imvert2validate-derivation.xsl
@@ -69,7 +69,10 @@
         <xsl:variable name="client-package" select="."/>
         
         <!-- GIT#22 -->
-        <!-- check if any supplier is generated using an older version of the Imvertor software -->
+        <!-- 
+            Check if any supplier is generated using an older version of the Imvertor software 
+            Client version must be "greater" than supplier
+        -->
         <xsl:variable name="client-generator" select="$client-package/imvert:generator"/>
         <xsl:variable name="supplier-generators" select="imf:get-supplier-models($client-package)"/>
         <xsl:variable name="newer-supplier-generators" select="for $g in $supplier-generators return if (imf:mm($g/imvert:generator) gt imf:mm($client-generator)) then $g else ()"/>
@@ -408,10 +411,12 @@
         
     </xsl:function>
   
-    <xsl:function name="imf:mm">
-        <xsl:param name="mmb"/>
+    <xsl:function name="imf:mm" as="xs:integer">
+        <xsl:param name="mmb" as="xs:string"/>
         <xsl:variable name="toks" select="tokenize($mmb,'\.')"/>
-        <xsl:value-of select="xs:integer($toks[1]) * 100 + xs:integer($toks[2])"/>
+        <xsl:variable name="major" select="if (matches($toks[1],'^\d+$')) then xs:integer($toks[1]) else 100"/><!-- may be "Nightly-build" which is the most recent -->
+        <xsl:variable name="minor" select="if (matches($toks[2],'^\d+$')) then xs:integer($toks[2]) else 0"/><!-- may be anything between 0 and 99 -->
+        <xsl:sequence select="$major * 100 + $minor"/>
     </xsl:function>
   
     <!-- https://github.com/Imvertor/Imvertor-Maven/issues/60 -->
diff --git a/src/main/resources/xsl/JsonSchemaCompiler/EP2Json.xsl b/src/main/resources/xsl/JsonSchemaCompiler/EP2Json.xsl
index 0e1a66231..94ca2c0fa 100644
--- a/src/main/resources/xsl/JsonSchemaCompiler/EP2Json.xsl
+++ b/src/main/resources/xsl/JsonSchemaCompiler/EP2Json.xsl
@@ -360,9 +360,10 @@
         <xsl:variable name="files" select="if (ext:imvertorFolderSerializer($path,$tempfile,'')) then imf:document($tempfile) else ()"/>
         <xsl:variable name="geoJSONfiles" as="element(geoJSONfile)*">
             <xsl:for-each select="$files/cw:files/cw:file[@ext = 'yaml']">
+                <xsl:variable name="fullpath" select="$path || '/' || replace(@path,'\\','/')"/>
                 <!-- transform to Saxon JsonXML -->
                 <geoJSONfile construct="{substring-before(@path,'.')}">
-                    <xsl:sequence select="parse-xml(ext:imvertorParseYaml(string(@fullpath)))"/>
+                    <xsl:sequence select="parse-xml(ext:imvertorParseYaml(string($fullpath)))"/>
                 </geoJSONfile>
             </xsl:for-each>
         </xsl:variable>
diff --git a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-EIGENAAR-CONCEPTUAL-html-respec.xsl b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-EIGENAAR-CONCEPTUAL-html-respec.xsl
index 54c2b17ef..4325cca8b 100644
--- a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-EIGENAAR-CONCEPTUAL-html-respec.xsl
+++ b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-EIGENAAR-CONCEPTUAL-html-respec.xsl
@@ -22,16 +22,17 @@
                 <title>
                     <xsl:value-of select="concat('Catalogus: ',@name)"/>
                 </title>
-                <script src="https://www.w3.org/Tools/respec/respec-w3c-common" class="remove"/>
+                <script src="{$configuration-docrules-file/respec-config}" class="remove"/>
                 <script class="remove">
                     var respecConfig = {
                         specStatus: "ED",
                         editors: [{
-                            name: "Arjan Loeffen, Armatiek Solutions BV",
-                            url: "http://www.armatiek.nl/imvertor-web.html",
+                            name: "<xsl:value-of select="imf:get-xparm('cli/userid')"/>, <xsl:value-of select="imf:get-xparm('cli/owner')"/>",
+                            url: "http://your.site/",
                         }],
                         edDraftURI: "http://some.place",
-                        shortName: "msgdoc"
+                        shortName: "msgdoc",
+                        maxTocLevel: 4
                     };
                 </script>
                 <style type="text/css">
diff --git a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-IHW-SIM-html-respec.xsl b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-IHW-SIM-html-respec.xsl
index 22680dc5c..d56ea8f0f 100644
--- a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-IHW-SIM-html-respec.xsl
+++ b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-IHW-SIM-html-respec.xsl
@@ -22,16 +22,17 @@
                 <title>
                     <xsl:value-of select="concat('Catalogus conceptueel model: ',@name)"/>
                 </title>
-                <script src="https://www.w3.org/Tools/respec/respec-w3c-common" class="remove"/>
+                <script src="{$configuration-docrules-file/respec-config}" class="remove"/>
                 <script class="remove">
                     var respecConfig = {
                         specStatus: "ED",
                         editors: [{
-                            name: "Arjan Loeffen, Armatiek Solutions BV",
-                            url: "http://www.armatiek.nl/imvertor-web.html",
+                            name: "<xsl:value-of select="imf:get-xparm('cli/userid')"/>, <xsl:value-of select="imf:get-xparm('cli/owner')"/>",
+                            url: "http://your.site/",
                         }],
                         edDraftURI: "http://some.place",
-                        shortName: "msgdoc"
+                        shortName: "msgdoc",
+                        maxTocLevel: 4
                     };
                 </script>
                 <style type="text/css">
diff --git a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-KOOP-CONCEPTUAL-html-respec.xsl b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-KOOP-CONCEPTUAL-html-respec.xsl
index 40749af7d..8f75b143c 100644
--- a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-KOOP-CONCEPTUAL-html-respec.xsl
+++ b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-KOOP-CONCEPTUAL-html-respec.xsl
@@ -22,16 +22,17 @@
                 <title>
                     <xsl:value-of select="concat('Catalogus: ',@name)"/>
                 </title>
-                <script src="https://www.w3.org/Tools/respec/respec-w3c-common" class="remove"/>
+                <script src="{$configuration-docrules-file/respec-config}" class="remove"/>
                 <script class="remove">
                     var respecConfig = {
                         specStatus: "ED",
                         editors: [{
-                            name: "Arjan Loeffen, Armatiek Solutions BV",
-                            url: "http://www.armatiek.nl/imvertor-web.html",
+                            name: "<xsl:value-of select="imf:get-xparm('cli/userid')"/>, <xsl:value-of select="imf:get-xparm('cli/owner')"/>",
+                            url: "http://your.site/",
                         }],
                         edDraftURI: "http://some.place",
-                        shortName: "msgdoc"
+                        shortName: "msgdoc",
+                        maxTocLevel: 4
                     };
                 </script>
                 <style type="text/css">
diff --git a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Kadaster-html-respec.xsl b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Kadaster-html-respec.xsl
index 65456b4b2..5169804b6 100644
--- a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Kadaster-html-respec.xsl
+++ b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Kadaster-html-respec.xsl
@@ -30,7 +30,7 @@
                         <title>
                             <xsl:value-of select="concat('Catalogus conceptueel model: ',@name)"/>
                         </title>
-                        <script src="https://www.w3.org/Tools/respec/respec-w3c-common" class="remove"/>
+                        <script src="{$configuration-docrules-file/respec-config}" class="remove"/>
                         <script class="remove">
                             var respecConfig = {
                                 specStatus: "ED",
diff --git a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Kennisnet-SIM-html-respec.xsl b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Kennisnet-SIM-html-respec.xsl
index bfbf455e1..a5069efc8 100644
--- a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Kennisnet-SIM-html-respec.xsl
+++ b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Kennisnet-SIM-html-respec.xsl
@@ -22,16 +22,17 @@
                 <title>
                     <xsl:value-of select="concat('Catalogus conceptueel model: ',@name)"/>
                 </title>
-                <script src="https://www.w3.org/Tools/respec/respec-w3c-common" class="remove"/>
+                <script src="{$configuration-docrules-file/respec-config}" class="remove"/>
                 <script class="remove">
                     var respecConfig = {
                         specStatus: "ED",
                         editors: [{
-                            name: "Arjan Loeffen, Armatiek Solutions BV",
-                            url: "http://www.armatiek.nl/imvertor-web.html",
+                            name: "<xsl:value-of select="imf:get-xparm('cli/userid')"/>, <xsl:value-of select="imf:get-xparm('cli/owner')"/>",
+                            url: "http://your.site/",
                         }],
                         edDraftURI: "http://some.place",
-                        shortName: "msgdoc"
+                        shortName: "msgdoc",
+                        maxTocLevel: 4
                     };
                 </script>
                 <style type="text/css">
diff --git a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Waarderingskamer-SIM-html-respec.xsl b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Waarderingskamer-SIM-html-respec.xsl
index d400e96aa..25254c671 100644
--- a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Waarderingskamer-SIM-html-respec.xsl
+++ b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-Waarderingskamer-SIM-html-respec.xsl
@@ -30,18 +30,18 @@
                         <title>
                             <xsl:value-of select="concat('Catalogus conceptueel model: ',@name)"/>
                         </title>
-                        <script src="https://www.w3.org/Tools/respec/respec-w3c-common" class="remove"/>
+                        <script src="{$configuration-docrules-file/respec-config}" class="remove"/>
                         <script class="remove">
                             var respecConfig = {
-                            specStatus: "ED",
-                            editors: [{
-                            name: "Waarderingskamer",
-                            url: "http://www.waarderingskamer.nl",
-                            }],
-                            edDraftURI: "http://some.place",
-                            shortName: "msgdoc",
-                            maxTocLevel: 3
-                        };
+                                specStatus: "ED",
+                                editors: [{
+                                    name: "<xsl:value-of select="imf:get-xparm('cli/userid')"/>, <xsl:value-of select="imf:get-xparm('cli/owner')"/>",
+                                    url: "http://your.site/",
+                                }],
+                                edDraftURI: "http://some.place",
+                                shortName: "msgdoc",
+                                maxTocLevel: 4
+                            };
                         </script>
                         <style type="text/css">
                             th, td {
diff --git a/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-xhtml-respec.xsl b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-xhtml-respec.xsl
new file mode 100644
index 000000000..8d54d3592
--- /dev/null
+++ b/src/main/resources/xsl/OfficeCompiler/Imvert2modeldoc-xhtml-respec.xsl
@@ -0,0 +1,41 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+    
+    xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+    
+    xmlns:imvert="http://www.imvertor.org/schema/system"
+    xmlns:imvert-imap="http://www.imvertor.org/schema/imagemap"
+    
+    xmlns:ext="http://www.imvertor.org/xsl/extensions"
+    xmlns:imf="http://www.imvertor.org/xsl/functions"
+    
+    exclude-result-prefixes="#all" 
+    version="2.0">
+    
+    <xsl:import href="common/Imvert2modeldoc-html-respec.xsl"/>
+    
+    <xsl:output method="xhtml" indent="yes"/>
+    
+    <xsl:template match="/book">
+        <xsl:variable name="catalog" as="element(section)*">
+            <xsl:apply-templates select="chapter"/><!-- calls upon the standard template for chapters such as CAT and REF -->
+        </xsl:variable>
+        <html>
+            <body>
+                <xsl:sequence select="$catalog"/> 
+            </body>
+        </html>
+    </xsl:template>
+    
+    <xsl:function name="imf:insert-chapter-intro" as="item()*">
+        <xsl:param name="chapter" as="element(chapter)"/>
+        <xsl:comment>
+            <xsl:value-of select="imf:get-config-string('appinfo','release-name')"/> imvertor <xsl:value-of select="$chapter/../@generator-version"/>
+        </xsl:comment>
+    </xsl:function>
+    
+    <xsl:function name="imf:insert-diagram-path">
+        <xsl:param name="diagram-id"/>
+        <xsl:value-of select="concat('Images/',$diagram-id,'.png')"/>
+    </xsl:function>
+    
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/main/resources/xsl/OfficeCompiler/common/Imvert2modeldoc-html-respec.xsl b/src/main/resources/xsl/OfficeCompiler/common/Imvert2modeldoc-html-respec.xsl
index a8a968ebb..238e7e1f8 100644
--- a/src/main/resources/xsl/OfficeCompiler/common/Imvert2modeldoc-html-respec.xsl
+++ b/src/main/resources/xsl/OfficeCompiler/common/Imvert2modeldoc-html-respec.xsl
@@ -32,7 +32,7 @@
     
     <xsl:variable name="document-ids" select="for $id in //@id return string($id)"/>
 
-    <xsl:variable name="meta-is-role-based" select="imf:boolean($configuration-metamodel-file//features/feature[@name='role-based'])"/><!-- TODO duplicate declaration -->
+    <xsl:variable name="meta-is-role-based" select="imf:boolean(imf:get-xparm('appinfo/meta-is-role-based'))"/>
     
     <xsl:template match="/book">
         <xsl:sequence select="imf:track('Generating HTML',())"/>
diff --git a/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-config.xsl b/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-config.xsl
index 2e0539598..581810aaa 100644
--- a/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-config.xsl
+++ b/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-config.xsl
@@ -36,7 +36,7 @@
          Stylesheet to filter intermediate config file.
     -->
     
-    <xsl:template match="cw:file/config" mode="mode-intermediate-config">
+    <xsl:template match="config" mode="mode-intermediate-config">
         <xsl:apply-templates mode="#current"/>
     </xsl:template>
     
@@ -44,11 +44,21 @@
         ignore the following alltogether 
     -->
     <xsl:template match="
-        desc | 
-        appinfo/previous-date
+        desc 
         " 
         mode="mode-intermediate-config">
         <xsl:call-template name="ignore"/>
     </xsl:template>
     
+    <!-- 
+        ignore the following alltogether (attributes)
+    -->
+    <xsl:template match="
+        @srcbase |
+        @src
+        " 
+        mode="mode-intermediate-config">
+        <!-- ignore -->
+    </xsl:template>
+    
 </xsl:stylesheet>
diff --git a/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-eaprofile.xsl b/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-eaprofile.xsl
new file mode 100644
index 000000000..58a3c4f81
--- /dev/null
+++ b/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-eaprofile.xsl
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ * Copyright (C) 2016 VNG/KING
+ * 
+ * This file is part of Imvertor.
+ *
+ * Imvertor is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Imvertor is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Imvertor.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<xsl:stylesheet 
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  
+    xmlns:ws="http://schemas.openxmlformats.org/spreadsheetml/2006/main"
+    
+    xmlns:imvert="http://www.imvertor.org/schema/system"
+    xmlns:ext="http://www.imvertor.org/xsl/extensions"
+    xmlns:imf="http://www.imvertor.org/xsl/functions"
+    
+    xmlns:cw="http://www.armatiek.nl/namespace/folder-content-wrapper"
+    
+    exclude-result-prefixes="#all"
+    version="2.0">
+    
+    <!-- 
+         Stylesheet to filter eaprofiles
+    -->
+    
+    <xsl:template match="MDG.Technology" mode="mode-intermediate-eaprofile">
+        <xsl:apply-templates mode="#current"/>
+    </xsl:template>
+    
+    <!-- 
+        ignore the following alltogether 
+    -->
+    <xsl:template match="
+        Documentation/@version |
+        Documentation/@notes"
+        mode="mode-intermediate-eaprofile">
+        <xsl:call-template name="ignore"/>
+    </xsl:template>
+    
+</xsl:stylesheet>
diff --git a/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-extract-canon.xsl b/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-extract-canon.xsl
new file mode 100644
index 000000000..a679a9556
--- /dev/null
+++ b/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-extract-canon.xsl
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ * Copyright (C) 2016 VNG/KING
+ * 
+ * This file is part of Imvertor.
+ *
+ * Imvertor is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Imvertor is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Imvertor.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<xsl:stylesheet 
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  
+    xmlns:ws="http://schemas.openxmlformats.org/spreadsheetml/2006/main"
+    
+    xmlns:imvert="http://www.imvertor.org/schema/system"
+    xmlns:imvert-history="http://www.imvertor.org/schema/history"
+    xmlns:imvert-result="http://www.imvertor.org/schema/imvertor/application/v20160201"
+    
+    xmlns:imf="http://www.imvertor.org/xsl/functions"
+    
+    xmlns:cw="http://www.armatiek.nl/namespace/folder-content-wrapper"
+    
+    xmlns:dlogger="http://www.armatiek.nl/functions/dlogger-proxy"
+    
+    exclude-result-prefixes="#all"
+    version="2.0">
+    
+    <!-- 
+         Stylesheet to filter ANY xml file found in the tst-canon or ref-canon folder.
+         This XSL is generic, and therefore calls upon any imported XSL (or such) to process specific types of file.
+    -->
+ 
+    <xsl:include href="../common/Imvert-common.xsl"/>
+    
+    <xsl:param name="file-path"/>
+    <xsl:param name="file-type"/>
+    
+    <?assume-not-relevant
+    <xsl:include href="RegressionExtractor-imvert.xsl"/>
+    <xsl:include href="RegressionExtractor-imvert-schema.xsl"/>
+    <xsl:include href="RegressionExtractor-history.xsl"/>
+    <xsl:include href="RegressionExtractor-office-html.xsl"/>
+    ?>
+    <xsl:include href="RegressionExtractor-xsd.xsl"/>
+    <xsl:include href="RegressionExtractor-eaprofile.xsl"/>
+    <xsl:include href="RegressionExtractor-config.xsl"/>
+    <?assume-not-relevant
+    <xsl:include href="RegressionExtractor-schemas.xsl"/>
+    <xsl:include href="RegressionExtractor-parms.xsl"/>
+    ?>    
+    <xsl:output method="xml" encoding="UTF-8" omit-xml-declaration="yes" indent="yes"/>
+    
+    <xsl:template match="/"> <!-- let op! deze extractor wordt aangeroepen op cw:file root elementen! -->
+        <xsl:variable name="path" select="replace($file-path, '\\','/')"/>
+        
+        <xsl:choose>
+            <!--
+                process the XSD's 
+            -->
+            <xsl:when test="starts-with($path, '/xsd/') and $file-type = 'xsd'">
+                <xsl:sequence select="dlogger:save('XSD test',$path)"/>
+                <xsl:apply-templates mode="mode-intermediate-xsd"/>
+            </xsl:when>
+            
+            <!-- process the EA profile -->
+            <xsl:when test="starts-with($path, '/ea/') and $file-type = 'xml'">
+                <xsl:sequence select="dlogger:save('EA test',$path)"/>
+                <xsl:apply-templates mode="mode-intermediate-eaprofile"/>
+            </xsl:when>
+            
+            <!-- process the config profile -->
+            <xsl:when test="$path = '/etc/config.xml'">
+                <xsl:sequence select="dlogger:save('Config test',$path)"/>
+                <xsl:apply-templates mode="mode-intermediate-config"/>
+            </xsl:when>
+            
+            <!-- skip all others -->
+        </xsl:choose>
+    </xsl:template>
+  
+    <xsl:template match="*|text()|@*" mode="#all">
+        <xsl:copy>
+            <xsl:apply-templates select="node()|@*" mode="#current"/>
+        </xsl:copy>
+    </xsl:template>
+    
+    <!-- ignore all comments and pi's -->
+    <xsl:template match="comment() | processing-instruction()" mode="#all"/>
+    
+    <xsl:template name="ignore">
+        <xsl:value-of select="'&#10;'"/>
+        <xsl:comment>IGNORED</xsl:comment>
+        <xsl:value-of select="'&#10;'"/>
+    </xsl:template>
+    
+</xsl:stylesheet>
diff --git a/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-extract.xsl b/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-extract.xsl
index 2bffb3960..acaa470be 100644
--- a/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-extract.xsl
+++ b/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-extract.xsl
@@ -27,11 +27,12 @@
     xmlns:imvert-history="http://www.imvertor.org/schema/history"
     xmlns:imvert-result="http://www.imvertor.org/schema/imvertor/application/v20160201"
     
-    xmlns:ext="http://www.imvertor.org/xsl/extensions"
     xmlns:imf="http://www.imvertor.org/xsl/functions"
     
     xmlns:cw="http://www.armatiek.nl/namespace/folder-content-wrapper"
     
+    xmlns:dlogger="http://www.armatiek.nl/functions/dlogger-proxy"
+    
     exclude-result-prefixes="#all"
     version="2.0">
     
@@ -58,17 +59,23 @@
          /work/*
          /executor.imvert.xml
       -->
+ 
+    <xsl:include href="../common/Imvert-common.xsl"/>
     
+    <?assume-not-relevant
     <xsl:include href="RegressionExtractor-imvert.xsl"/>
     <xsl:include href="RegressionExtractor-imvert-schema.xsl"/>
-    <xsl:include href="RegressionExtractor-config.xsl"/>
     <xsl:include href="RegressionExtractor-history.xsl"/>
     <xsl:include href="RegressionExtractor-office-html.xsl"/>
+    ?>
     <xsl:include href="RegressionExtractor-xsd.xsl"/>
+    <xsl:include href="RegressionExtractor-eaprofile.xsl"/>
+    <xsl:include href="RegressionExtractor-config.xsl"/>
+    <?assume-not-relevant
     <xsl:include href="RegressionExtractor-schemas.xsl"/>
     <xsl:include href="RegressionExtractor-parms.xsl"/>
-    
-    <xsl:output method="xml" encoding="UTF-8" omit-xml-declaration="yes"/>
+    ?>    
+    <xsl:output method="xml" encoding="UTF-8" omit-xml-declaration="yes" indent="yes"/>
     
     <xsl:template match="/"> <!-- let op! deze extractor wordt aangeroepen op cw:file root elementen! -->
         <xsl:apply-templates select="cw:file"/>
@@ -78,181 +85,26 @@
         <xsl:variable name="path" select="replace(@path, '\\','/')"/>
         <xsl:choose>
             <!--
-              no job info is compared. 
-            -->
-            <xsl:when test="starts-with($path, 'job/')">
-                <!-- ignore -->
-            </xsl:when>
-            <!-- 
-                skip all XMI files 
-            -->
-            <xsl:when test="lower-case(@ext) = ('xmi')">
-                <!-- ignore -->
-            </xsl:when>
-            <!-- 
-                skip all binary files. 
-                Assume that all differences in output can be explained by looking at the XML intermediate results. 
-            -->
-            <xsl:when test="@type = 'bin'">
-                <!-- ignore -->
-            </xsl:when>
-            <!-- 
-                skip this one: this file is passed when you simply copy the zip folder to the ref folder. It should not be checked.
+                process the XSD's 
             -->
-            <xsl:when test="$path = 'executor.imvert.xml'">
-                <!-- ignore -->
-            </xsl:when>
-            <!-- 
-               No not Process XML intermediate results. 
-            -->
-            <xsl:when test="starts-with($path,'work/imvert/')">
-                <!-- ignore -->
-                <?x
-                <xsl:copy>
-                    <xsl:copy-of select="@*[not(local-name(.) = ('date','size','fullpath'))]"/>
-                    <xsl:choose>
-                        <!--
-                            intermediate imvert files 
-                        -->
-                        <xsl:when test="@type='xml' and exists((imvert:packages,imvert:package-dependencies))">
-                            <xsl:apply-templates mode="mode-intermediate-imvert"/>
-                        </xsl:when>
-                        <!--
-                            intermediate config file 
-                        -->
-                        <xsl:when test="@type='xml' and exists(config)">
-                            <xsl:apply-templates mode="mode-intermediate-config"/>
-                        </xsl:when>
-                        <!--
-                            intermediate validation result file; ignore the contents 
-                            (imvertor.13.validate.xml imvertor.15.derive.xml )
-                        -->
-                        <xsl:when test="@type='xml' and exists(imvert:report)">
-                            <!-- ignore -->
-                        </xsl:when>
-                        <!--
-                           office file
-                        -->
-                        <xsl:when test="@ext='html'">
-                            <xsl:apply-templates mode="mode-intermediate-office-html"/>
-                        </xsl:when>
-                        <!--
-                            Check the history file
-                        -->
-                        <xsl:when test="@type='xml' and exists(imvert-history:versions)">
-                            <xsl:apply-templates mode="mode-intermediate-history"/>
-                        </xsl:when>
-                        <!--
-                            Check the model schema file
-                        -->
-                        <xsl:when test="@type='xml' and exists(imvert-result:Application)">
-                            <xsl:apply-templates mode="mode-intermediate-imvert-schema"/>
-                        </xsl:when>
-                        <!--
-                            Check the model schema file
-                        -->
-                        <xsl:when test="@type='xml' and exists(imvert:schemas)">
-                            <xsl:apply-templates mode="mode-intermediate-schemas"/>
-                        </xsl:when>
-                        <!--
-                            do not Check the run file
-                        -->
-                        <xsl:when test="@type='xml' and exists(no-output)"/>
-                        
-                        <xsl:otherwise>
-                            <xsl:value-of select="concat('unexpected intermediate file: ', $path, ' - cannot compare')"/>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                </xsl:copy>
-                x?>
-            </xsl:when>
-            <!-- 
-                reports
-            -->
-            <xsl:when test="starts-with($path,'work/rep')">
-                <!-- do not check -->
-            </xsl:when>
-            <!--
-               skip etc folder; only holds stuf that is already checked in intermediate steps.
-            -->
-            <xsl:when test="starts-with($path, 'work/app/etc')">
-                <!-- ignore -->
-            </xsl:when>
-            <!--
-               Check the catalogue
-            -->
-            <xsl:when test="starts-with($path, 'work/app/cat')">
-                <xsl:copy>
-                    <xsl:copy-of select="@*[not(local-name(.) = ('date','size','fullpath'))]"/>
-                    <xsl:apply-templates/>
-                </xsl:copy>
-            </xsl:when>
-            
-            <!-- process the EA profile -->
-            <xsl:when test="starts-with($path, 'work/app/ea')">
-                <xsl:copy>
-                    <xsl:copy-of select="@*[not(local-name(.) = ('date','size','fullpath'))]"/>
-                    <xsl:apply-templates/>
-                </xsl:copy>
-            </xsl:when>
-            
-            <!-- skip the compare XSL -->
-            <xsl:when test="starts-with($path, 'work/compare')">
-                <!-- ignore -->
-            </xsl:when>
-            
-            <!-- skip the profile info -->
-            <xsl:when test="starts-with($path, 'work/profile')">
-                <!-- ignore -->
-            </xsl:when>
-            
-            <!-- process the compliancy info -->
-            <xsl:when test="starts-with($path, 'work/TODO')"><!-- TODO speelt dit nog? -->
-                <!-- ignore -->
-            </xsl:when>
-            
-            <!--
-              documentation is not compared 
-            -->
-            <xsl:when test="starts-with($path, 'work/app/doc')">
-                <!-- ignore -->
-            </xsl:when>
-            <!--
-              work xsd (supporting stuff) is not compared 
-            -->
-            <xsl:when test="starts-with($path, 'work/app/etc/xsd')">
-                <!-- ignore -->
-            </xsl:when>
-            <!--
-              generated XSD is compared 
-            -->
-            <xsl:when test="starts-with($path, 'work/app/xsd')">
+            <xsl:when test="starts-with($path, 'work/xsd/')">
+                <xsl:sequence select="dlogger:save('XSD test',$path)"/>
                 <xsl:copy>
                     <xsl:copy-of select="@*[not(local-name(.) = ('date','size','fullpath'))]"/>
                     <xsl:apply-templates mode="mode-intermediate-xsd"/>
                 </xsl:copy>
             </xsl:when>
-            <!--
-              parms.xml is compared 
-            -->
-            <xsl:when test="starts-with($path, 'work/parms.xml')">
+           
+            <!-- process the EA profile -->
+            <xsl:when test="starts-with($path, 'work/ea/')">
+                <xsl:sequence select="dlogger:save('EA test',$path)"/>
                 <xsl:copy>
                     <xsl:copy-of select="@*[not(local-name(.) = ('date','size','fullpath'))]"/>
-                    <xsl:apply-templates mode="mode-intermediate-parms"/>
+                    <xsl:apply-templates mode="mode-intermediate-eaprofile"/>
                 </xsl:copy>
             </xsl:when>
-            <!--
-              skip the tracker info 
-            -->
-            <xsl:when test="@name = 'track.txt'">
-               <!-- ignore -->
-            </xsl:when>       
             
-            <xsl:otherwise>
-                <error>
-                    <xsl:value-of select="concat('Unexpected output file: ', $path, ' - cannot compare this resource')"/>
-                </error>   
-            </xsl:otherwise>
+           <!-- skip all others -->
         </xsl:choose>
     </xsl:template>
     
diff --git a/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-xsd.xsl b/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-xsd.xsl
index 4614ae6bf..14c52fb33 100644
--- a/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-xsd.xsl
+++ b/src/main/resources/xsl/RegressionExtractor/RegressionExtractor-xsd.xsl
@@ -36,7 +36,7 @@
          Stylesheet to filter xsd result file.
     -->
     
-    <xsl:template match="cw:file/xs:schema" mode="mode-intermediate-xsd">
+    <xsl:template match="xs:schema" mode="mode-intermediate-xsd">
         <xsl:apply-templates mode="#current"/>
     </xsl:template>
     
diff --git a/src/main/resources/xsl/RegressionExtractor/compare/xsl/Imvert/Imvert2compare-listing.xsl b/src/main/resources/xsl/RegressionExtractor/compare/xsl/Imvert/Imvert2compare-listing.xsl
index 403fde363..aa05e9d2e 100644
--- a/src/main/resources/xsl/RegressionExtractor/compare/xsl/Imvert/Imvert2compare-listing.xsl
+++ b/src/main/resources/xsl/RegressionExtractor/compare/xsl/Imvert/Imvert2compare-listing.xsl
@@ -40,7 +40,6 @@
     <xsl:import href="Imvert2compare-common.xsl"/>
     
     <!-- this import file is generated by the xml-to-diff.xsl meta-stylesheet -->
-    <xsl:import href="../../../../external/functx.xsl"/>
     <xsl:import href="../../../../external/xpath.xsl"/>
     
     <xsl:import href="http://www.imvertor.org/imvertor/1.0/xslt/compare/compare-generated.xsl"/><!-- resolved by catalog! -->
@@ -61,27 +60,29 @@
             <imvert:test>
                 <xsl:value-of select="$test-url"/>
             </imvert:test>           
-            <xsl:variable name="diffs">
+            <xsl:variable name="ctrl-diffs">
                 <xsl:apply-templates select="$ctrl-doc/*" mode="compare"/> <!-- returns a sequence of diff elements -->
             </xsl:variable>
-            <xsl:for-each-group select="$diffs/imvert:diff" group-by="@ctrl-id">
+            <xsl:for-each-group select="$ctrl-diffs/imvert:diff" group-by="@ctrl-id">
                 <imvert:diffs ctrl-id="{@ctrl-id}">
                     <xsl:for-each select="current-group()">
                         <xsl:sequence select="."/>
                     </xsl:for-each>
                 </imvert:diffs>
             </xsl:for-each-group>
-            <xsl:variable name="diffs">
+            <xsl:variable name="test-diffs">
                 <xsl:apply-templates select="$test-doc/*" mode="compare"/> <!-- returns a sequence of diff elements -->
             </xsl:variable>
-            <xsl:for-each-group select="$diffs/imvert:diff" group-by="@test-id">
+            <xsl:for-each-group select="$test-diffs/imvert:diff" group-by="@test-id">
                 <imvert:diffs test-id="{@test-id}">
                     <xsl:for-each select="current-group()">
                         <xsl:sequence select="."/>
                     </xsl:for-each>
                 </imvert:diffs>
             </xsl:for-each-group>
+            <xsl:sequence select="imf:set-xparm('application/differencesfound',count($ctrl-diffs) + count($test-diffs))"/>
         </imvert:report>
+   
     </xsl:template>
     
     <!-- 
diff --git a/src/main/resources/xsl/Validator/Imvert2canonical-Kadaster.xsl b/src/main/resources/xsl/Validator/Imvert2canonical-Kadaster.xsl
index 1355a6536..949ef1770 100644
--- a/src/main/resources/xsl/Validator/Imvert2canonical-Kadaster.xsl
+++ b/src/main/resources/xsl/Validator/Imvert2canonical-Kadaster.xsl
@@ -26,7 +26,9 @@
     xmlns:imf="http://www.imvertor.org/xsl/functions"
     
     exclude-result-prefixes="#all" 
-    version="2.0">
+    expand-text="yes"
+    version="3.0"
+    >
 
     <!-- 
           Transform BP UML constructs to canonical UML constructs.
@@ -86,6 +88,16 @@
         </xsl:copy>
     </xsl:template>
     
+    <!-- 
+        Union en union element moet nu expliciet worden doorgegeven als specifiek stereotype.
+        Keuze tussen datatypen is enige keuze die CDMKAD modellen kennen.
+    -->
+    <xsl:template match="imvert:class/imvert:stereotype[@id = 'stereotype-name-union']">
+        <xsl:variable name="attributes" select="../imvert:attributes/imvert:attribute"/>
+        <xsl:sequence select="."/>
+        <imvert:stereotype id="stereotype-name-union-datatypes" origin="system">{imf:get-config-name-by-id('stereotype-name-union-datatypes')}</imvert:stereotype>
+    </xsl:template>
+    
     <!-- 
        identity transform
     -->
diff --git a/src/main/resources/xsl/Validator/Imvert2interface.xsl b/src/main/resources/xsl/Validator/Imvert2interface.xsl
index 152b68368..841e32a68 100644
--- a/src/main/resources/xsl/Validator/Imvert2interface.xsl
+++ b/src/main/resources/xsl/Validator/Imvert2interface.xsl
@@ -92,10 +92,14 @@
                 <xsl:variable name="cn" select="($schema/cs:id)[1]"/>
                 <xsl:variable name="sn" select="($schema/cs:shortName)[1]"/>
                 
+                <xsl:variable name="tv-desc" select="($schema/cs:desc)[1]"/>
+                <xsl:variable name="tv-src" select="($schema/cs:source)[1]"/>
+                <xsl:variable name="tv-data" select="($schema/cs:data-location)[1]"/>
+                
                 <xsl:variable name="ve" select="($map/cs:version)[1]"/>
                 <xsl:variable name="ph" select="($map/cs:phase)[1]"/>
                 
-                <imvert:class origin="system" cs="{$cs}" cn="{$cn}" sn="{$sn}" ve="{$ve}" ph="{$ph}">
+                <imvert:class origin="system" cs="{$cs}" cn="{$cn}" sn="{$sn}" ve="{$ve}" ph="{$ph}" tv-desc="{$tv-desc}" tv-src="{$tv-src}" tv-data="{$tv-data}">
                     <imvert:name original="{$name}">
                         <xsl:value-of select="$name"/>
                     </imvert:name>
@@ -178,6 +182,28 @@
                 <imvert:stereotype id="stereotype-name-external-package">
                     <xsl:value-of select="imf:get-config-stereotypes('stereotype-name-external-package')"/>
                 </imvert:stereotype>
+                <!-- introduceer verplichte tagged values op externe packages -->
+                <imvert:tagged-values>
+                    <xsl:apply-templates select="imvert:tagged-values"/>
+                    <imvert:tagged-value origin="system" id="CFG-TV-SOURCE">
+                        <imvert:name original="Herkomst">Herkomst</imvert:name>
+                        <imvert:value>     
+                            <xsl:value-of select="current-group()[1]/@tv-src"/>
+                        </imvert:value>
+                    </imvert:tagged-value>
+                    <imvert:tagged-value origin="system" id="CFG-TV-DEFINITION">
+                        <imvert:name original="Definitie">Definitie</imvert:name>
+                        <imvert:value>
+                            <xsl:value-of select="current-group()[1]/@tv-desc"/>
+                        </imvert:value>
+                    </imvert:tagged-value>
+                    <imvert:tagged-value origin="system" id="CFG-TV-DATALOCATION">
+                        <imvert:name original="Locatie">Locatie</imvert:name>
+                        <imvert:value>
+                            <xsl:value-of select="current-group()[1]/@tv-data"/>
+                        </imvert:value>
+                    </imvert:tagged-value>
+                </imvert:tagged-values>
                 <!-- and list all classes -->
                 <xsl:sequence select="for $c in current-group() return if ($c/@type = 'sentinel') then () else $c"/>
             </imvert:package>
diff --git a/src/main/resources/xsl/Validator/Imvert2proxy.xsl b/src/main/resources/xsl/Validator/Imvert2proxy.xsl
index d480e08f8..67b8fc975 100644
--- a/src/main/resources/xsl/Validator/Imvert2proxy.xsl
+++ b/src/main/resources/xsl/Validator/Imvert2proxy.xsl
@@ -80,17 +80,22 @@
                 <xsl:variable name="proxied-outside-classes" select="$proxied-content//imvert:*[imvert:proxy-to-outside]"/>
                 
                 <xsl:for-each-group select="$proxied-outside-classes" group-by="imvert:proxy-to-outside">
-                    <xsl:if test="not($known-outside-classes/imvert:type-name = current-grouping-key())">
-                        <imvert:class origin="stub" umltype="Class">
-                            <xsl:comment>REQUIRED BY PROXY</xsl:comment>
-                            <imvert:name original="{current-grouping-key()}">
-                                <xsl:value-of select="current-grouping-key()"/>
-                            </imvert:name>
-                            <imvert:id>
-                                <xsl:value-of select="current-group()[1]/imvert:type-id"/>
-                            </imvert:id>
-                        </imvert:class>
-                    </xsl:if>
+                    <xsl:choose>
+                        <xsl:when test="$outside-package/imvert:class/imvert:id = current-group()[1]/imvert:type-id">
+                            <!-- deze was al opgenomen in de client, skip -->
+                        </xsl:when>
+                        <xsl:when test="not($known-outside-classes/imvert:type-name = current-grouping-key())">
+                            <imvert:class origin="stub" umltype="Class">
+                                <xsl:comment>REQUIRED BY PROXY</xsl:comment>
+                                <imvert:name original="{current-grouping-key()}">
+                                    <xsl:value-of select="current-grouping-key()"/>
+                                </imvert:name>
+                                <imvert:id>
+                                    <xsl:value-of select="current-group()[1]/imvert:type-id"/>
+                                </imvert:id>
+                            </imvert:class>
+                        </xsl:when>
+                    </xsl:choose>
                 </xsl:for-each-group>
                 
             </imvert:package>
diff --git a/src/main/resources/xsl/Validator/Imvert2validation.xsl b/src/main/resources/xsl/Validator/Imvert2validation.xsl
index bd5181dd3..082678206 100644
--- a/src/main/resources/xsl/Validator/Imvert2validation.xsl
+++ b/src/main/resources/xsl/Validator/Imvert2validation.xsl
@@ -170,6 +170,8 @@
     <!-- all display names of all properties -->
     <xsl:variable name="property-display-names" select="for $p in ($domain-package//imvert:attribute,$domain-package/imvert:association) return imf:get-display-name($p)"/>
     
+    <xsl:variable name="model-is-role-based" select="imf:get-tagged-value(/imvert:packages,'##CFG-TV-IMRELATIONMODELINGTYPE')"/>
+    <xsl:variable name="meta-is-role-based" select="if (exists($model-is-role-based)) then ($model-is-role-based = 'Relatierol leidend') else imf:boolean($configuration-metamodel-file//features/feature[@name='role-based'])"/>
     
     <xsl:key name="key-unique-id" match="//*[imvert:id]" use="imvert:id"/>
     
@@ -179,6 +181,10 @@
         Place rules here that focus on the complete specification rather than particular constructs. 
     -->
     <xsl:template match="/imvert:packages">
+        
+        <!-- bewaarde de info dat het model rolgebaseerd is of niet -->
+        <xsl:sequence select="imf:set-xparm('appinfo/meta-is-role-based',$meta-is-role-based)"/>
+   
         <imvert:report>
             
             <xsl:attribute name="release" select="imf:get-config-string('appinfo','release')"/>
diff --git a/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136-imports.xsl b/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136-imports.xsl
index 9b3e59ad9..72a4dbbd1 100644
--- a/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136-imports.xsl
+++ b/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136-imports.xsl
@@ -84,6 +84,8 @@
     <xsl:template match="xs:schema">
         <xsl:sequence select="imf:track('Processing imports',())"/>
         
+        <xsl:variable name="schema" select="."/>
+        
         <xsl:variable name="my-qualifier" select="../imvert:prefix"/>
         <xsl:variable name="my-subpath" select="../imvert:result-file-subpath"/>
         <xsl:variable name="my-fullpath" select="../imvert:result-file-fullpath"/>
@@ -114,7 +116,7 @@
         <xsl:variable name="imports" as="node()*">
             <xsl:for-each select="distinct-values($qualifiers)[not(. = $my-qualifier)]">
                
-                <xsl:sequence select="imf:create-xml-debug-comment(.,'qualifier at subpath [1]', ($my-subpath))"/>
+                <xsl:sequence select="imf:create-xml-debug-comment($schema,'qualifier at subpath [1]', ($my-subpath))"/>
 
                 <!-- determine for this prefix which schema is created -->
                 <xsl:variable name="prefix" select="."/>
diff --git a/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136-postform.xsl b/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136-postform.xsl
index e1645156b..2947b16f1 100644
--- a/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136-postform.xsl
+++ b/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136-postform.xsl
@@ -32,6 +32,7 @@
     version="2.0">
     
     <xsl:import href="../common/Imvert-common.xsl"/>
+    <xsl:import href="common-postform.xsl"/>
     
     <!-- 
         This stylesheet post-processes the XML schema collection created, 
@@ -42,6 +43,7 @@
         1/ remove @minOccurs=1 and @maxOccurs=1 when specify-xsd-occurrence=default
         2/ remove @abstract=false
         3/ redirect NE3610IDPropertyType to NEN3610ID type. This is a patch for non conforming NEN3610 schema.
+        4/ remove all non-Name characters from names
    
     -->
     <xsl:variable name="specify-xsd-occurrence-always" select="imf:get-config-xmlschemarules()/parameter[@name='specify-xsd-occurrence'] = 'always'"/>
@@ -68,13 +70,16 @@
         </xsl:if>
     </xsl:template>    
     
-    <xsl:template match="@type[.='NEN3610:NEN3610IDPropertyType']">
+    <xsl:template match="@type[.='NEN3610:NEN3610IDPropertyType']" priority="2">
         <xsl:attribute name="type" select="'NEN3610:NEN3610ID'"/>
     </xsl:template>    
     
-    
     <!-- =========== common ================== -->
     
+    <xsl:template match="@name | @type | @ref">
+        <xsl:attribute name="{name(.)}" select="imf:normalize-xsd-name(.)"/>
+    </xsl:template>
+    
     <xsl:template match="node()|@*" mode="#all">
         <xsl:copy>
             <xsl:apply-templates select="@*" mode="#current"/>
@@ -82,5 +87,4 @@
         </xsl:copy>
     </xsl:template>
     
-    
 </xsl:stylesheet>
diff --git a/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136-preform.xsl b/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136-preform.xsl
index be1d6fa8b..842a77d04 100644
--- a/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136-preform.xsl
+++ b/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136-preform.xsl
@@ -162,7 +162,7 @@
             <imvert:name original="featureMember">featureMember</imvert:name>
             <imvert:id>FM_<xsl:value-of select="generate-id(.)"/></imvert:id>
             <imvert:type-name original="{imvert:name/@original}"><xsl:value-of select="imvert:name"/></imvert:type-name>
-            <imvert:type-id><xsl:value-of select="imvert:id"/>></imvert:type-id>
+            <imvert:type-id><xsl:value-of select="imvert:id"/></imvert:type-id>
             <imvert:type-package><xsl:value-of select="../imvert:name"/></imvert:type-package>
             <imvert:min-occurs>0</imvert:min-occurs>
             <imvert:max-occurs>unbounded</imvert:max-occurs>
diff --git a/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136.xsl b/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136.xsl
index 970df7d50..55077be82 100644
--- a/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136.xsl
+++ b/src/main/resources/xsl/XsdCompiler/Imvert2XSD-ISO19136.xsl
@@ -55,14 +55,6 @@
     
     <xsl:param name="config-file-path">unknown-file</xsl:param>
    
-    <xsl:variable name="work-xsd-folder-url" select="imf:file-to-url(imf:get-config-string('system','work-xsd-folder-path'))"/>
-    <xsl:variable name="xsd-subpath" select="imf:merge-parms(imf:get-config-string('cli','xsdsubpath'))"/>
-    
-    <xsl:variable name="is-forced-nillable" select="imf:boolean(imf:get-config-string('cli','forcenillable'))"/>
-    
-    <xsl:variable name="current-datetime" select="imf:format-dateTime(imf:get-config-string('run','start'))"/>
-    <xsl:variable name="current-imvertor-version" select="imf:get-config-string('run','version')"/>
-    
     <!-- 
         Determine which type is defined in which package 
     -->
@@ -70,41 +62,20 @@
         <xsl:apply-templates select="$imvert-document//imvert:class" mode="type-in-package"/>
     </xsl:variable>
     
-    <!-- 
-        What types result in an attribute in stead of an element? 
-        This is always the case for ID values.
-        It is not possible to mix the use of types on elements and attributes. 
-        Note that Imvertor is element-oriented, not attribute-oriented.
-    -->
-    <xsl:variable name="xml-attribute-type" select="('ID')"/>
-
-    <xsl:variable 
-        name="external-schemas" 
-        select="$imvert-document//imvert:package[imvert:stereotype/@id = ('stereotype-name-external-package','stereotype-name-system-package')]" 
-        as="element(imvert:package)*"/>
-    
-    <xsl:variable 
-        name="external-schema-names" 
-        select="$external-schemas/imvert:name" 
-        as="xs:string*"/>
-    
     <xsl:variable name="base-namespace" select="/imvert:packages/imvert:base-namespace"/>
 
     <xsl:variable name="Type-suffix">Type</xsl:variable>
     <xsl:variable name="PropertyType-suffix">PropertyType</xsl:variable>
     <xsl:variable name="EnumerationType-suffix">Type</xsl:variable>
     
-    <xsl:variable name="codelist-option" select="imf:get-config-string('cli','codelistoption','UNSPECIFIED')"/>
-    <xsl:variable name="gml-version" select="imf:get-config-string('cli','gmlversion','UNSPECIFIED')"/>
-    <xsl:variable name="sf-conformance-level" select="imf:get-config-string('cli','sfconformance','UNSPECIFIED')"/>
+    <xsl:variable name="codelist-option" select="imf:get-config-string('cli','codelistoption','UNSPECIFIED')" as="xs:string"/>
+    <xsl:variable name="gml-version" select="imf:get-config-string('cli','gmlversion','UNSPECIFIED')" as="xs:string"/>
+    <xsl:variable name="sf-conformance-level" select="imf:get-config-string('cli','sfconformance','UNSPECIFIED')" as="xs:string"/>
+    <xsl:variable name="associate-by-reference" select="imf:boolean(imf:get-config-string('cli','assocbyreference','false'))" as="xs:boolean"/>
     
     <xsl:variable name="model-version" select="/imvert:packages/imvert:version"/>
     
     <xsl:variable name="namespace-composition" select="imf:get-config-xmlschemarules()/parameter[@name='namespace-composition']"/>
-
-    <xsl:variable name="strings-nonempty" select="imf:get-config-xmlschemarules()/parameter[@name='strings-nonempty']"/><!-- https://github.com/Imvertor/Imvertor-Maven/issues/52 -->
-    
-    <xsl:variable name="allow-scalar-in-union" select="imf:boolean($configuration-metamodel-file//features/feature[@name='allow-scalar-in-union'])"/>
     
     <xsl:template match="imvert:class" mode="type-in-package">
         <type 
@@ -128,73 +99,7 @@
                 <xsl:sequence select="imf:msg(.,'ERROR', 'Invalid codelist option [1] for GML version [2]',($codelist-option,$gml-version))"/> 
             </xsl:when>
             <xsl:otherwise>
-                <imvert:schemas>
-                    <xsl:sequence select="imf:create-info-element('imvert:exporter',$imvert-document/imvert:packages/imvert:exporter)"/>
-                    <xsl:sequence select="imf:create-info-element('imvert:schema-exported',$imvert-document/imvert:packages/imvert:exported)"/>
-                    <xsl:sequence select="imf:create-info-element('imvert:schema-filter-version',imf:get-svn-id-info($imvert-document/imvert:packages/imvert:filters/imvert:filter/imvert:version))"/>
-                    <xsl:sequence select="imf:create-info-element('imvert:latest-svn-revision',concat($char-dollar,'Id',$char-dollar))"/>
-                    
-                    <!-- Schemas for external packages are not generated, but added to the release manually. -->
-                    <xsl:apply-templates select="$imvert-document/imvert:packages/imvert:package[not(imvert:name = $external-schema-names)]"/>
-                    
-                    <!-- 
-                        Do we need to reference external schema's? 
-                        If so, a reference is made to the name of the external schema. 
-                    -->
-                    <xsl:variable name="externals" select="//(imvert:type-package|imvert:supertype[not(imvert:stereotype/@id = ('stereotype-name-static-generalization'))]/imvert:type-package)[.=$external-schema-names]"/>
-                    <xsl:for-each-group select="$externals" group-by=".">
-                        <xsl:for-each select="current-group()[1]"><!-- singleton imvert:type-package element--> 
-                            <xsl:variable name="external-package" select="imf:get-construct-by-id(../imvert:type-package-id)"/>
-                            <imvert:schema>
-                                <xsl:sequence select="imf:create-info-element('imvert:name',$external-package/imvert:name)"/>
-                                <xsl:sequence select="imf:create-info-element('imvert:prefix',$external-package/imvert:short-name)"/>
-                                <xsl:sequence select="imf:create-info-element('imvert:namespace',$external-package/imvert:namespace)"/>
-                                <xsl:choose>
-                                    <xsl:when test="imf:boolean($external-schemas-reference-by-url)">
-                                        <!-- TODO vervalt? -->
-                                        <xsl:sequence select="imf:create-info-element('imvert:result-file-subpath',$external-package/imvert:location)"/>
-                                    </xsl:when>
-                                    <xsl:otherwise>
-                                        <xsl:variable name="schema-subpath" select="imf:get-xsd-filesubpath($external-package)"/>
-                                        <xsl:variable name="file-fullpath" select="imf:get-xsd-filefullpath($external-package)"/>
-                                        <xsl:variable name="file-url" select="$external-package/imvert:location"/>
-                                        <xsl:sequence select="imf:create-info-element('imvert:result-file-subpath',$schema-subpath)"/>
-                                        <xsl:sequence select="imf:create-info-element('imvert:result-file-fullpath',$file-fullpath)"/>
-                                        <xsl:sequence select="imf:create-info-element('imvert:result-url',$file-url)"/>
-                                    </xsl:otherwise>
-                                </xsl:choose>
-                            </imvert:schema>
-                        </xsl:for-each>
-                    </xsl:for-each-group>
-                    
-                    <!-- add an external package that is a sentinel if not yet added -->
-                    <xsl:for-each select="$imvert-document/imvert:packages/imvert:package[imf:boolean(imvert:sentinel) and not(imvert:name = $externals)]">
-                        <xsl:variable name="external-package" select="."/>
-                        <imvert:schema>
-                            <xsl:sequence select="imf:create-info-element('imvert:name',$external-package/imvert:name)"/>
-                            <xsl:sequence select="imf:create-info-element('imvert:prefix',$external-package/imvert:short-name)"/>
-                            <xsl:sequence select="imf:create-info-element('imvert:namespace',$external-package/imvert:namespace)"/>
-                            
-                            <xsl:choose>
-                                <xsl:when test="imf:boolean($external-schemas-reference-by-url)">
-                                    <!-- TODO vervalt? -->
-                                    <xsl:comment>Referenced by URL</xsl:comment>
-                                    <xsl:sequence select="imf:create-info-element('imvert:result-file-subpath',$external-package/imvert:location)"/>
-                                </xsl:when>
-                                <xsl:otherwise>
-                                    <xsl:comment>Referenced by local path</xsl:comment>
-                                    <xsl:variable name="schema-subpath" select="imf:get-xsd-filesubpath($external-package)"/>
-                                    <xsl:variable name="file-fullpath" select="imf:get-xsd-filefullpath($external-package)"/>
-                                    <xsl:variable name="file-url" select="$external-package/imvert:location"/>
-                                    <xsl:sequence select="imf:create-info-element('imvert:result-file-subpath',$schema-subpath)"/>
-                                    <xsl:sequence select="imf:create-info-element('imvert:result-file-fullpath',$file-fullpath)"/>
-                                    <xsl:sequence select="imf:create-info-element('imvert:result-url',$file-url)"/>
-                                </xsl:otherwise>
-                            </xsl:choose>
-
-                        </imvert:schema>
-                    </xsl:for-each>
-                </imvert:schemas>
+                <xsl:sequence select="imf:template-create-schemas()"/>
             </xsl:otherwise>
         </xsl:choose>
       </xsl:template>
@@ -211,14 +116,7 @@
         <xsl:variable name="this-package-associated-types" select="$this-package-associated-classes/imvert:name" as="xs:string*"/>
         <xsl:variable name="this-package-associated-type-ids" select="$this-package-associated-classes/imvert:id" as="xs:string*"/>
         
-        <xsl:variable name="this-package-referenced-linkable-subclasses" as="node()*">
-            <xsl:for-each select="$this-package-associated-classes">
-                <xsl:sequence select="imf:get-linkable-subclasses-or-self(.)"/>
-            </xsl:for-each>
-        </xsl:variable>
-        
         <xsl:variable name="schema-version" select="imvert:version"/>
-        
         <xsl:variable name="schema-phase" select="imvert:phase"/>
         
         <!-- historical note: we removed nsim-tally, and introduced a second step: the import XSL -->
@@ -303,6 +201,7 @@
         <xsl:sequence select="imf:create-xml-debug-comment(.,'A product')"/>
         <xsl:next-match/> <!-- i.e. template that matches imvert:class --> 
     </xsl:template>
+    
     <xsl:template match="imvert:class[imvert:stereotype/@id = ('stereotype-name-featurecollection')]">
         <xsl:sequence select="imf:create-xml-debug-comment(.,'A feature collection')"/>
         
@@ -399,7 +298,7 @@
                 </xsl:for-each>
             </xs:restriction>
         </xs:simpleType>
-    </xsl:template>    
+    </xsl:template> 
     
     <xsl:template match="imvert:class[imvert:stereotype/@id = ('stereotype-name-referentielijst')]">
         <xsl:sequence select="imf:create-xml-debug-comment(.,'A referencelist')"/>
@@ -664,17 +563,28 @@
                         <!-- add the property type -->
                         <xs:complexType>
                             <xsl:attribute name="name" select="concat($type-name,$PropertyType-suffix)"/>
-                            <xs:sequence minOccurs="0">
-                                <xs:element ref="{imf:get-type($type-name,$package-name)}"/>
-                            </xs:sequence>
                             <xsl:choose>
+                                <xsl:when test="$is-objecttype and $associate-by-reference">
+                                    <!-- enforce relations targeted by reference -->
+                                    <xsl:sequence select="imf:create-xml-debug-comment(.,'Objectype, force by reference')"/>
+                                    <xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
+                                    <xs:attributeGroup ref="gml:OwnershipAttributeGroup"/>
+                                </xsl:when>
                                 <xsl:when test="$is-objecttype">
-                                    <!-- if featureType, add this -->
+                                    <!-- allow relations targeted by reference as well as inline -->
+                                    <xsl:sequence select="imf:create-xml-debug-comment(.,'Objectype')"/>
+                                    <xs:sequence minOccurs="0">
+                                        <xs:element ref="{imf:get-type($type-name,$package-name)}"/>
+                                    </xs:sequence>
                                     <xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
                                     <xs:attributeGroup ref="gml:OwnershipAttributeGroup"/>
                                 </xsl:when>
                                 <xsl:otherwise>
-                                    <!-- all other cases, skip -->
+                                    <xsl:sequence select="imf:create-xml-debug-comment(.,'Datatype')"/>
+                                    <!-- a datatype -->
+                                    <xs:sequence minOccurs="0">
+                                        <xs:element ref="{imf:get-type($type-name,$package-name)}"/>
+                                    </xs:sequence>
                                 </xsl:otherwise>
                             </xsl:choose>
                         </xs:complexType>
@@ -735,107 +645,6 @@
         <xsl:apply-templates/>
     </xsl:template>
 
-    <xsl:function name="imf:get-annotation" as="node()?">
-        <xsl:param name="this" as="node()"/>
-        <xsl:sequence select="imf:get-annotation($this,(),())"/>
-    </xsl:function>
-    <xsl:function name="imf:get-annotation" as="node()?">
-        <xsl:param name="this" as="node()"/>
-        <xsl:param name="added-documentation" as="node()*"/>
-        <xsl:param name="added-appinfo" as="node()*"/>
-        <xsl:variable name="documentation" select="($added-documentation, imf:get-documentation($this))"/>
-        <xsl:if test="$added-appinfo or $documentation">
-            <xs:annotation>
-                <xsl:sequence select="$added-appinfo"/>
-                <xsl:sequence select="$documentation"/>
-            </xs:annotation>
-        </xsl:if>
-    </xsl:function>
-    
-    <xsl:function name="imf:get-schema-info" as="node()*">
-        <xsl:param name="this" as="node()"/>
-        <xsl:sequence select="imf:create-doc-element('xs:documentation','http://www.imvertor.org/schema-info/conversion',imf:get-config-parameter('pretext-encoding'))"/>
-    </xsl:function>
-    
-    <!-- 
-        get a type name based on the type specified, that is suited for XSD 
-        
-        The type may be something like:
-        
-        Class1
-        scalar-string
-    
-        The package name is always specified but is irrelevant for scalars.
-    -->
-    <xsl:function name="imf:get-type" as="xs:string">
-        <xsl:param name="uml-type" as="xs:string"/> 
-        <xsl:param name="package-name" as="xs:string?"/> 
-        
-        <!-- check if the package is external -->
-        <xsl:variable name="external-package" select="$external-schemas[imvert:name = $package-name]"/>
-        
-        <xsl:variable name="defining-class" select="imf:get-class($uml-type,$package-name)"/>
-        <xsl:variable name="defining-package" select="$defining-class/.."/>
-        
-        <xsl:choose>
-            <xsl:when test="exists($external-package)">
-                <xsl:value-of select="concat($external-package/imvert:short-name,':',$uml-type)"/>
-            </xsl:when>
-            <xsl:when test="$package-name and empty($defining-package)">
-                <!-- this is a class that is not known. This is the case for nilreasons on scalar types, we need to create a class for that. -->  
-                <xsl:variable name="short-name" select="$document-packages[imvert:name = $package-name]/imvert:short-name"/>
-                <xsl:value-of select="concat($short-name,':',$uml-type)"/>
-            </xsl:when>
-            <xsl:otherwise>
-                
-                <xsl:variable name="defining-class" select="imf:get-class($uml-type,$package-name)"/>
-                <xsl:variable name="defining-package" select="$defining-class/.."/>
-
-                <xsl:variable name="primitive" select="$defining-class/imvert:primitive"/> <!-- e.g. BOOLEAN -->
-           
-                <xsl:variable name="uml-type-name" select="if (contains($uml-type,':')) then substring-after($uml-type,':') else $uml-type"/>
-                <xsl:variable name="primitive-type" select="substring-after($uml-type-name,'http://schema.omg.org/spec/UML/2.1/uml.xml#')"/>
-                
-                <xsl:variable name="base-type" select="
-                    if ($primitive)
-                    then $primitive
-                    else
-                        if ($primitive-type) 
-                        then $primitive-type 
-                        else 
-                            if (not($package-name) or imf:is-system-package($package-name)) 
-                            then $uml-type-name 
-                            else ()"/>
-                
-                <xsl:variable name="scalar" select="$all-scalars[@id=$base-type][last()]"/>
-                
-                <xsl:choose>
-                    <xsl:when test="$base-type"> 
-                        <xsl:variable name="xs-type" select="$scalar/type-map[@formal-lang='xs']"/>
-                        <xsl:choose>
-                            <xsl:when test="exists($scalar) and starts-with($xs-type,'#')">
-                                <xsl:value-of select="$xs-type"/>
-                            </xsl:when> 
-                            <xsl:when test="exists($scalar)">
-                                <xsl:value-of select="concat('xs:', $xs-type)"/>
-                            </xsl:when>
-                            <xsl:otherwise>
-                                <xsl:value-of select="'xs:string'"/>
-                                <xsl:sequence select="imf:msg('ERROR', 'Unknown native type: [1]', $base-type)"/>
-                            </xsl:otherwise>
-                        </xsl:choose>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:value-of select="concat($defining-package/imvert:short-name,':',$uml-type-name)"/>
-                    </xsl:otherwise>
-                </xsl:choose>
-                
-            </xsl:otherwise>
-        </xsl:choose>
-        
-        
-    </xsl:function>
-    
     <xsl:function name="imf:create-element-property" as="item()*">
         <xsl:param name="this" as="node()"/>
         
@@ -891,7 +700,7 @@
         
         <xsl:variable name="codespace" select="(imf:get-data-location($this),if ($defining-class) then imf:get-data-location($defining-class) else ())"/>
         
-        <xsl:variable name="appinfo-data-location" select="imf:get-appinfo-location($this)"/>
+        <xsl:variable name="appinfo-data-location" select="imf:get-appinfo-location($this)"/> 
         <xsl:variable name="appinfo-codelist">
             <xs:appinfo>
                 <CodeListName>
@@ -920,6 +729,8 @@
         <xsl:variable name="use-identifier-domains" select="imf:boolean(imf:get-xparm('cli/identifierdomains','no'))"/>
         <xsl:variable name="domain-value" select="imf:get-tagged-value($this,'##CFG-TV-DOMAIN')"/>
         
+
+        
         <xsl:choose>
             
             <!-- preliminary -->
@@ -936,7 +747,7 @@
                     <xsl:attribute name="minOccurs" select="$this/imvert:min-occurs"/>
                     <xsl:attribute name="maxOccurs" select="$this/imvert:max-occurs"/>
                     <xsl:sequence select="imf:create-xml-debug-comment($this,'Any type')"/>
-                    <xs:complexType>
+                    <xs:complexType mixed="true">
                         <xs:sequence>
                             <xs:any minOccurs="0" maxOccurs="unbounded">
                                 <xsl:attribute name="namespace" select="if (exists($package-name)) then $package-namespace else '##any'"/>
@@ -1087,7 +898,7 @@
                     </xsl:choose>
                 </xs:element>
             </xsl:when>
-            <xsl:when test="$type=('xs:string') and not($this/imvert:baretype='TXT')"> 
+            <xsl:when test="($type=('xs:string') and not($this/imvert:baretype='TXT')) or ($is-primitive and $this/imvert:type-name = 'xs:string')"> 
                 <xs:element>
                     <xsl:attribute name="name" select="$name"/>
                     <xsl:attribute name="minOccurs" select="$min-occurs-assoc"/>
@@ -1105,7 +916,7 @@
                             </xs:simpleType>
                         </xsl:when>
                         <xsl:otherwise>
-                            <xsl:attribute name="type" select="$type"/>
+                            <xsl:attribute name="type" select="'xs:string'"/>
                             <xsl:sequence select="imf:create-xml-debug-comment($this,'A string, mode 2')"/>
                             <xsl:sequence select="imf:get-annotation($this,$appinfo-data-location,())"/>
                         </xsl:otherwise>
@@ -1469,18 +1280,7 @@
         </xsl:choose>
     </xsl:function>
     
-    <xsl:function name="imf:create-attribute-property" as="item()*">
-        <xsl:param name="this" as="node()"/>
-  
-        <xsl:variable name="voidable" select="$this/imvert:stereotype/@id = ('stereotype-name-voidable')"/>
-        <xsl:variable name="type" select="imf:get-type($this/imvert:type-name,$this/imvert:type-package)"/>
-        <xs:attribute>
-            <xsl:attribute name="name" select="$this/imvert:name"/>
-            <xsl:attribute name="use" select="if ($this/imvert:min-occurs='0') then 'optional' else 'required'"/>
-            <xsl:attribute name="type" select="$type"/>
-            <xsl:sequence select="imf:get-annotation($this)"/>
-        </xs:attribute>
-    </xsl:function>
+
 
      
     <xsl:template match="imvert:union">
@@ -1493,15 +1293,7 @@
         <xs:union memberTypes="{string-join($membertypes,' ')}"/>
     </xsl:template>
     
-    <xsl:function name="imf:is-system-package" as="xs:boolean">
-        <xsl:param name="package-name" as="xs:string"/>
-        <xsl:copy-of select="substring-before($package-name,'_') = ('EA','Info')"/>
-    </xsl:function>
-   
-    <xsl:function name="imf:is-restriction" as="xs:boolean">
-        <xsl:param name="this" as="node()"/>
-        <xsl:sequence select="exists((imf:get-facet-pattern($this), imf:get-facet-max-length($this), imf:get-facet-total-digits($this), imf:get-facet-fraction-digits($this)))"/>
-    </xsl:function>
+
     <xsl:function name="imf:is-estimation" as="xs:boolean">
         <xsl:param name="this" as="node()"/>
         <xsl:sequence select="$this/imvert:stereotype/@id = ('stereotype-name-estimation')"/>
@@ -1515,17 +1307,9 @@
     </xsl:function>
     ?>
     
-    <xsl:function name="imf:get-restriction-basetype-name" as="xs:string">
-        <xsl:param name="this" as="node()"/> <!-- any attribute/association node. -->
-        <xsl:value-of select="concat('Basetype_',$this/ancestor::imvert:class/imvert:name,'_',$this/imvert:name)"/>
-    </xsl:function>
+
     
-    <xsl:function name="imf:create-nilreason">
-        <xsl:param name="is-conceptual-hasnilreason"/><!-- IM-477 -->
-        <xsl:if test="not($is-conceptual-hasnilreason)">
-            <xs:attribute name="nilReason" type="xs:string" use="optional"/>
-        </xsl:if>
-    </xsl:function>
+
     
     <xsl:function name="imf:create-estimation">
         <xsl:param name="is-estimation" as="xs:boolean"/>
@@ -1558,37 +1342,6 @@
         <xsl:sequence select="imf:create-doc-element('xs:appinfo','http://www.imvertor.org/xml-schema-info/generator',$current-imvertor-version)"/>
     </xsl:function>
     
-    <xsl:function name="imf:get-appinfo-location" as="node()*">
-        <xsl:param name="this" as="node()"/>
-        <xsl:sequence select="imf:create-doc-element('xs:appinfo','http://www.imvertor.org/data-info/uri',imf:get-data-location($this))"/>
-    </xsl:function>
-    
-    <xsl:function name="imf:create-doc-element" as="node()*">
-        <xsl:param name="element-name" as="xs:string"/>
-        <xsl:param name="namespace" as="xs:string"/>
-        <xsl:param name="value" as="xs:string*"/>
-        <xsl:for-each select="$value[normalize-space(.)]">
-            <xsl:element name="{$element-name}">
-                <xsl:attribute name="source" select="$namespace"/>
-                <xsl:value-of select="."/>
-            </xsl:element>
-        </xsl:for-each>
-    </xsl:function>
-    
-    <xsl:function name="imf:create-info-element" as="node()*">
-        <xsl:param name="element-name" as="xs:string"/>
-        <xsl:param name="value" as="xs:string*"/>
-        <xsl:for-each select="$value">
-            <xsl:element name="{$element-name}">
-                <xsl:value-of select="."/>
-            </xsl:element>
-        </xsl:for-each>
-    </xsl:function>
-        
-    <xsl:function name="imf:get-qname" as="xs:string">
-        <xsl:param name="class" as="node()"/>
-        <xsl:value-of select="concat($class/parent::imvert:package/imvert:short-name,':',$class/imvert:name)"/>
-    </xsl:function>
     
     <xsl:function name="imf:get-namespace" as="xs:string">
         <xsl:param name="this" as="element(imvert:package)"/> 
@@ -1609,226 +1362,11 @@
             <xsl:when test="$namespace-composition = 'versionMajorMinor'">
                 <xsl:value-of select="concat($this/imvert:namespace,'/', $schema-version-majorminor)"/>
             </xsl:when>
-            <xsl:otherwise>
+            <xsl:otherwise><!-- assume "release" -->
                 <xsl:value-of select="concat($this/imvert:namespace,'/v', imf:get-release($this))"/>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:function>
-
-    <xsl:function name="imf:create-nonempty-constraint" as="item()*">
-        <xsl:param name="type" as="xs:string?"/>
-        <xsl:if test="$type=('scalar-string', 'scalar-uri') or not($type) and imf:boolean($strings-nonempty)">
-            <xs:pattern value="\S.*"/> <!-- Note: do not use xs:minLength as this allows for a single space -->
-        </xsl:if>
-    </xsl:function>
-    
-    <!-- return the class that defines the type of the attribute or association passed. --> 
-    <xsl:function name="imf:get-defining-class" as="node()?">
-        <xsl:param name="this" as="node()"/>
-       
-        <!-- overrule name based searches, must be ID based.
-            <xsl:sequence select="$document-packages[imvert:name=$this/imvert:type-package]/imvert:class[imvert:name=$this/imvert:type-name]"/> 
-        --> 
-        <xsl:sequence select="$document-classes[imvert:id=$this/imvert:type-id]"/> 
-        
-    </xsl:function>
-
-    <!-- 
-        Return the complete subpath and filename of the xsd file to be generated.
-        Sample: subpath/my/schema/MyappMypackage_1_0_3.xsd
-    -->
-    <xsl:function name="imf:get-xsd-filesubpath" as="xs:string">
-        <xsl:param name="this" as="node()"/> <!-- a package -->
-        <xsl:choose>
-            <xsl:when test="$this/imvert:stereotype/@id = (('stereotype-name-external-package','stereotype-name-system-package'))"> 
-                <!-- 
-                    the package is external (GML, Xlink or the like). 
-                    Place reference to that external pack. 
-                    The package is copied alongside the target application package.
-                --> 
-                <xsl:value-of select="imf:get-uri-parts($this/imvert:location)/path"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select="concat($xsd-subpath, '/', imf:get-xsd-filefolder($this), '/', imf:get-xsd-filename($this))"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:function>
-  
-    <!-- 
-        return the full XSD file path of the package passed.
-    -->
-    <xsl:function name="imf:get-xsd-filefullpath" as="xs:string">
-        <xsl:param name="this" as="element()"/>
-        <xsl:variable name="schema-subpath" select="imf:get-xsd-filesubpath($this)"/>
-        <xsl:value-of select="concat($work-xsd-folder-url,'/',$schema-subpath)"/>
-    </xsl:function>
-  
-    <!-- 
-        Get the path of the xsd file. This is the part of the namespace that is behind the repository-url.
-        Example:
-        root namespace (alias) is: 
-            http://www.imvertor.org/schema
-        URL is: 
-            http://www.imvertor.org/schema/my/schema/
-        and release is: 
-            20120307
-        returns: 
-            /my/schema/v20120307
-    -->    
-    <xsl:function name="imf:get-xsd-filefolder" as="xs:string">
-        <xsl:param name="this" as="node()"/> <!-- an imvert:package -->
-        <xsl:variable name="localpath" select="substring-after($this/imvert:namespace,concat($base-namespace,'/'))"/>
-        <xsl:value-of select="concat(if (normalize-space($localpath)) then $localpath else 'unknown','/v',$this/imvert:release)"/>
-    </xsl:function>
-    
-    <!--
-        Return the file name of the XSD to be generated.
-    -->
-    <xsl:function name="imf:get-xsd-filename" as="xs:string">
-        <xsl:param name="this" as="node()"/>
-
-        <xsl:sequence select="imf:set-config-string('work','xsd-domain',$this/imvert:name,true())"/>
-        <xsl:sequence select="imf:set-config-string('work','xsd-version',replace($this/imvert:version,'\.','_'),true())"/>
-        <xsl:sequence select="imf:set-config-string('work','xsd-application',$application-package-name,true())"/>
-        
-        <xsl:value-of select="imf:merge-parms(imf:get-config-string('cli','xsdfilename'))"/>
-    </xsl:function>
-    
-    <!-- 
-        return the release number of the Model and therefore the XSD to be generated 
-    -->
-    <xsl:function name="imf:get-release" as="xs:string?">
-        <xsl:param name="this" as="node()"/>
-        <!-- 
-            Assume release of supplier, unless release specified.
-        -->
-        <xsl:variable name="release" select="$this/imvert:release"/>
-        <xsl:choose>
-            <xsl:when test="exists($release)">
-                <xsl:value-of select="$release"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:sequence select="imf:msg('ERROR', 'No release found for package: [1] ([2])',($this/imvert:name,$this/imvert:namespace))"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:function>
-    
-    
-    <!-- 
-        Return the members of sequence set1 that are not in set2. 
-        The comparison is based on the string value of the members. 
-    -->
-    <xsl:function name="imf:sequence-except-by-string-value" as="item()*">
-        <xsl:param name="set1" as="item()*"/>
-        <xsl:param name="set2" as="item()*"/>
-        <xsl:for-each select="$set1">
-            <xsl:variable name="stringvalue" select="xs:string(.)"/>
-            <xsl:if test="not($set2 = $stringvalue)">
-                <xsl:sequence select="."/>
-            </xsl:if>
-        </xsl:for-each>
-    </xsl:function>
-
-    <!-- 
-        Return this class and all classes that are substitutable for this class, that are also linkable (and therefore a reference element must be created). 
-        The class passed as rootclass may be abstract and still be linkable; linkable substitution classes must be concrete.
-   
-        This set also includes classes that realize this class in a static way.
-        These classes do not inherit any properties of the realizes class, but can take its place. 
-    -->
-    <xsl:function name="imf:get-linkable-subclasses-or-self" as="node()*">
-        <xsl:param name="rootclass" as="node()"/>
-        <xsl:sequence select="imf:get-substitutable-subclasses($rootclass,true())[imf:is-linkable(.)]"/>
-    </xsl:function>
-    
-    <!-- 
-        Return all classes that can be substituted for the class passed, and self. 
-        Do not return abstract classes. 
-    -->
-    <xsl:function name="imf:get-substitutable-subclasses" as="element()*">
-        <xsl:param name="rootclass" as="element()"/>
-        <xsl:param name="include-self" as="xs:boolean"/>
-        <xsl:variable name="substitution-classes" select="imf:get-substitution-classes($rootclass)"/>
-        <xsl:sequence select="if ($include-self) then $rootclass else ()"/>
-        <xsl:sequence select="$substitution-classes"/>
-    </xsl:function>
-    
-    <!-- 
-        Return all classes that can be substituted for the class passed, but not self.
-        Also returns abstract classes.
-    -->
-    <xsl:function name="imf:get-substitution-classes" as="node()*">
-        <xsl:param name="class" as="node()"/>
-        <xsl:variable name="class-id" select="$class/imvert:id"/>
-        <xsl:for-each select="$document-classes[imvert:substitution/imvert:supplier-id=$class-id or imvert:supertype/imvert:type-id=$class-id]">
-            <xsl:sequence select="."/>
-            <xsl:sequence select="imf:get-substitution-classes(.)"/>
-        </xsl:for-each>
-    </xsl:function>
-        
-    <!-- return all associations to this class -->
-    <xsl:function name="imf:get-references">
-        <xsl:param name="class" as="element()"/>
-        <xsl:variable name="id" select="$class/imvert:id"/>
-        <xsl:sequence select="for $a in $document-classes//imvert:association return if ($a/imvert:type-id = $id) then $a else ()"/>
-    </xsl:function>
-    
-    <xsl:function name="imf:is-abstract">
-        <xsl:param name="class"/>
-        <xsl:sequence select="imf:boolean($class/imvert:abstract)"/>        
-    </xsl:function>
-
-    <xsl:function name="imf:create-scalar-property">
-        <xsl:param name="this"/>
-        
-        <xsl:variable name="scalar-type" select="$this/imvert:type-name"/>
-        
-        <xsl:variable name="scalar" select="$all-scalars[@id = $scalar-type][last()]"/>
-        <xsl:variable name="scalar-construct-pattern" select="$scalar/type-modifier/pattern[@lang=$language]"/>
-        <xsl:variable name="scalar-construct-union" select="$scalar/type-modifier/type-map"/>
-        
-        <xsl:variable name="type-construct">
-            <xsl:choose>
-                <xsl:when test="exists($scalar-construct-pattern)">
-                    <xs:restriction base="xs:string">
-                        <xs:pattern value="{$scalar-construct-pattern}"/>
-                    </xs:restriction>
-                </xsl:when>
-                <xsl:when test="exists($scalar-construct-union)">
-                    <xs:union memberTypes="{for $t in $scalar-construct-union return concat('xs:', $t)}"/>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:sequence select="imf:msg('ERROR','Cannot create scalar type property')"/>
-                </xsl:otherwise>
-            </xsl:choose>
-        </xsl:variable>
-        
-        <xsl:sequence select="$type-construct"/>
-        
-    </xsl:function>
-    
-    <xsl:function name="imf:create-fixtype-property">
-        <xsl:param name="scalar-type" as="xs:string"/>
-        
-        <xsl:variable name="scalar" select="$all-scalars[@id = $scalar-type][last()]"/>
-        <xsl:variable name="scalar-construct-pattern" select="$scalar/type-modifier/pattern[@lang=$language]"/>
-        <xsl:variable name="scalar-construct-union" select="$scalar/type-modifier/type-map"/>
-        
-        <xsl:choose>
-            <xsl:when test="exists($scalar-construct-pattern)">
-                <xs:restriction base="xs:string">
-                    <xs:pattern value="{$scalar-construct-pattern}"/>
-                </xs:restriction>
-            </xsl:when>
-            <xsl:when test="exists($scalar-construct-union)">
-                <xs:union memberTypes="{for $t in $scalar-construct-union return concat('xs:', $t)}"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:sequence select="imf:msg('ERROR','Cannot create fixtype property')"/>
-            </xsl:otherwise>
-        </xsl:choose>
-        
-    </xsl:function>
     
     <xsl:function name="imf:compile-documentation">
         <xsl:param name="this"/>
@@ -1848,9 +1386,6 @@
         <xsl:sequence select="for $a in $association return ($a/imvert:target,$a)[1]"/>
     </xsl:function>
     
-    <xsl:function name="imf:get-id-attribute" as="element(imvert:attribute)?">
-        <xsl:param name="class" as="element(imvert:class)"/>
-        <xsl:sequence select="$class/imvert:attributes/imvert:attribute[imf:boolean(imvert:is-id)]"/>
-    </xsl:function>
+
     
 </xsl:stylesheet>
diff --git a/src/main/resources/xsl/XsdCompiler/Imvert2XSD-Kadaster-postform.xsl b/src/main/resources/xsl/XsdCompiler/Imvert2XSD-Kadaster-postform.xsl
index 8d88c8c70..5b5136240 100644
--- a/src/main/resources/xsl/XsdCompiler/Imvert2XSD-Kadaster-postform.xsl
+++ b/src/main/resources/xsl/XsdCompiler/Imvert2XSD-Kadaster-postform.xsl
@@ -32,6 +32,7 @@
     version="2.0">
     
     <xsl:import href="../common/Imvert-common.xsl"/>
+    <xsl:import href="common-postform.xsl"/>
     
     <!-- 
         This stylesheet postprocesses the complete set of schema's basis on particular settings.
@@ -39,7 +40,7 @@
         This is:
           
         1/ apply the nilreason
-          
+        2/ remove all non-Name characters from names
     -->
     
     <xsl:template match="/">
@@ -67,14 +68,18 @@
         </xsl:if>
     </xsl:template>
         
+        
     <!-- =========== common ================== -->
     
+    <xsl:template match="@name | @type | @ref">
+        <xsl:attribute name="{name(.)}" select="imf:normalize-xsd-name(.)"/>
+    </xsl:template>
+    
     <xsl:template match="node()|@*">
         <xsl:copy>
             <xsl:apply-templates select="@*"/>
             <xsl:apply-templates select="node()"/>
         </xsl:copy>
     </xsl:template>
-    
-    
+   
 </xsl:stylesheet>
diff --git a/src/main/resources/xsl/XsdCompiler/Imvert2XSD-Kadaster-preform.xsl b/src/main/resources/xsl/XsdCompiler/Imvert2XSD-Kadaster-preform.xsl
index c222b561f..258bec410 100644
--- a/src/main/resources/xsl/XsdCompiler/Imvert2XSD-Kadaster-preform.xsl
+++ b/src/main/resources/xsl/XsdCompiler/Imvert2XSD-Kadaster-preform.xsl
@@ -26,6 +26,8 @@
     xmlns:ext="http://www.imvertor.org/xsl/extensions"
     xmlns:imf="http://www.imvertor.org/xsl/functions"
     
+    xmlns:dlogger="http://www.armatiek.nl/functions/dlogger-proxy"
+    
     xmlns:ekf="http://EliotKimber/functions"
 
     exclude-result-prefixes="#all"
diff --git a/src/main/resources/xsl/XsdCompiler/Imvert2XSD-Kadaster.xsl b/src/main/resources/xsl/XsdCompiler/Imvert2XSD-Kadaster.xsl
index 1a79513b7..90e9fd708 100644
--- a/src/main/resources/xsl/XsdCompiler/Imvert2XSD-Kadaster.xsl
+++ b/src/main/resources/xsl/XsdCompiler/Imvert2XSD-Kadaster.xsl
@@ -61,32 +61,7 @@
     
     <xsl:param name="config-file-path">unknown-file</xsl:param>
    
-    <xsl:variable name="work-xsd-folder-url" select="imf:file-to-url(imf:get-config-string('system','work-xsd-folder-path'))"/>
-    <xsl:variable name="xsd-subpath" select="encode-for-uri(imf:merge-parms(imf:get-config-string('cli','xsdsubpath')))"/>
-    
-    <xsl:variable name="is-forced-nillable" select="imf:boolean(imf:get-config-string('cli','forcenillable'))"/>
-    
-    <xsl:variable name="allow-scalar-in-union" select="imf:boolean($configuration-metamodel-file//features/feature[@name='allow-scalar-in-union'])"/>
-
-    <xsl:variable name="meta-is-role-based" select="imf:boolean($configuration-metamodel-file//features/feature[@name='role-based'])"/>
-    
-    <!-- 
-        What types result in an attribute in stead of an element? 
-        This is always the case for ID values.
-        It is not possible to mix the use of types on elements and attributes. 
-        Note that Imvertor is element-oriented, not attribute-oriented.
-    -->
-    <xsl:variable name="xml-attribute-type" select="('ID')"/>
-
-    <xsl:variable 
-        name="external-schemas" 
-        select="$imvert-document//imvert:package[imvert:stereotype/@id = ('stereotype-name-external-package','stereotype-name-system-package')]" 
-        as="element(imvert:package)*"/>
-    
-    <xsl:variable 
-        name="external-schema-names" 
-        select="$external-schemas/imvert:name" 
-        as="xs:string*"/>
+    <xsl:variable name="meta-is-role-based" select="imf:boolean(imf:get-xparm('appinfo/meta-is-role-based'))"/>
     
     <xsl:variable 
         name="reference-classes" 
@@ -95,67 +70,12 @@
     
     <xsl:variable name="base-namespace" select="/imvert:packages/imvert:base-namespace"/>
     
+    <xsl:variable name="Type-suffix"><!--geen--></xsl:variable>
+    <xsl:variable name="PropertyType-suffix"><!--geen--></xsl:variable>
+    <xsl:variable name="EnumerationType-suffix"><!--geen--></xsl:variable>
+    
     <xsl:template match="/">
-        <imvert:schemas>
-            <xsl:sequence select="imf:create-info-element('imvert:exporter',$imvert-document/imvert:packages/imvert:exporter)"/>
-            <xsl:sequence select="imf:create-info-element('imvert:schema-exported',$imvert-document/imvert:packages/imvert:exported)"/>
-            <xsl:sequence select="imf:create-info-element('imvert:schema-filter-version',imf:get-svn-id-info($imvert-document/imvert:packages/imvert:filters/imvert:filter/imvert:version))"/>
-            <xsl:sequence select="imf:create-info-element('imvert:latest-svn-revision',concat($char-dollar,'Id',$char-dollar))"/>
-            
-            <!-- Schemas for external packages are not generated, but added to the release manually. -->
-            <xsl:apply-templates select="$imvert-document/imvert:packages/imvert:package[not(imvert:name = $external-schema-names)]"/>
-            
-            <!-- 
-                Do we need to reference external schema's? 
-                If so, a reference is made to the name of the external schema.
-            -->
-            <xsl:variable name="externals" select="//imvert:type-package[.=$external-schema-names]"/>
-            <xsl:for-each-group select="$externals" group-by=".">
-                <xsl:for-each select="current-group()[1]"><!-- singleton imvert:type-package element--> 
-                    <xsl:variable name="external-package" select="imf:get-construct-by-id(../imvert:type-package-id)"/>
-                    <imvert:schema>
-                        <xsl:sequence select="imf:create-info-element('imvert:name',$external-package/imvert:name)"/>
-                        <xsl:sequence select="imf:create-info-element('imvert:prefix',$external-package/imvert:short-name)"/>
-                        <xsl:sequence select="imf:create-info-element('imvert:namespace',$external-package/imvert:namespace)"/>
-                        <xsl:choose>
-                            <xsl:when test="imf:boolean($external-schemas-reference-by-url)">
-                                <xsl:comment>Referenced by URL</xsl:comment>
-                                <xsl:sequence select="imf:create-info-element('imvert:result-file-subpath',$external-package/imvert:location)"/>
-                            </xsl:when>
-                            <xsl:otherwise>
-                                <xsl:comment>Referenced by local path</xsl:comment>
-                                <xsl:variable name="schema-subpath" select="imf:get-xsd-filesubpath($external-package)"/>
-                                <xsl:variable name="file-fullpath" select="imf:get-xsd-filefullpath($external-package)"/>
-                                <xsl:sequence select="imf:create-info-element('imvert:result-file-subpath',$schema-subpath)"/>
-                                <xsl:sequence select="imf:create-info-element('imvert:result-file-fullpath',$file-fullpath)"/>
-                            </xsl:otherwise>
-                        </xsl:choose>
-                    </imvert:schema>
-                </xsl:for-each>
-            </xsl:for-each-group>
-            <!-- add an external package that is a sentinel if not yet added -->
-            <xsl:for-each select="$imvert-document/imvert:packages/imvert:package[imf:boolean(imvert:sentinel) and not(imvert:name = $externals)]">
-                <xsl:variable name="external-package" select="."/>
-                <imvert:schema>
-                    <xsl:sequence select="imf:create-info-element('imvert:name',$external-package/imvert:name)"/>
-                    <xsl:sequence select="imf:create-info-element('imvert:prefix',$external-package/imvert:short-name)"/>
-                    <xsl:sequence select="imf:create-info-element('imvert:namespace',$external-package/imvert:namespace)"/>
-                    <xsl:choose>
-                        <xsl:when test="imf:boolean($external-schemas-reference-by-url)">
-                            <xsl:comment>Referenced by URL</xsl:comment>
-                            <xsl:sequence select="imf:create-info-element('imvert:result-file-subpath',$external-package/imvert:location)"/>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:comment>Referenced by local path</xsl:comment>
-                            <xsl:variable name="schema-subpath" select="imf:get-xsd-filesubpath($external-package)"/>
-                            <xsl:variable name="file-fullpath" select="imf:get-xsd-filefullpath($external-package)"/>
-                            <xsl:sequence select="imf:create-info-element('imvert:result-file-subpath',$schema-subpath)"/>
-                            <xsl:sequence select="imf:create-info-element('imvert:result-file-fullpath',$file-fullpath)"/>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                </imvert:schema>
-            </xsl:for-each>
-        </imvert:schemas>
+        <xsl:sequence select="imf:template-create-schemas()"/>
     </xsl:template>
     
     <!-- Internal packages processed here. -->
@@ -170,29 +90,8 @@
         <xsl:variable name="this-package-associated-types" select="$this-package-associated-classes/imvert:name" as="xs:string*"/>
         <xsl:variable name="this-package-associated-type-ids" select="$this-package-associated-classes/imvert:id" as="xs:string*"/>
         
-        <xsl:variable name="this-package-referenced-linkable-subclasses" as="node()*">
-            <xsl:for-each select="$this-package-associated-classes">
-                <xsl:sequence select="imf:get-linkable-subclasses-or-self(.)"/>
-            </xsl:for-each>
-        </xsl:variable>
-        <xsl:variable name="this-package-referenced-substitutable-subclasses-or-self" as="node()*">
-            <xsl:if test="$avoid-substitutions">
-                <xsl:for-each select="$this-package-associated-classes">
-                    <xsl:sequence select="imf:get-substitutable-subclasses(.,true())"/>
-                </xsl:for-each>
-            </xsl:if>
-        </xsl:variable>
-        <xsl:variable name="this-package-referenced-substitutable-subclasses" as="node()*">
-            <xsl:if test="$avoid-substitutions">
-                <xsl:for-each select="$this-package-associated-classes">
-                    <xsl:sequence select="imf:get-substitutable-subclasses(.,false())"/>
-                </xsl:for-each>
-            </xsl:if>
-        </xsl:variable>
-        
         <xsl:variable name="schema-version" select="imvert:version"/>
         <xsl:variable name="schema-phase" select="imvert:phase"/>
-        <xsl:variable name="schema-release" select="imf:get-release(.)"/>
         
         <!-- historical note: we removed nsim-tally, and introduced a second step: the import XSL -->
         
@@ -206,6 +105,9 @@
             <xsl:sequence select="imf:create-info-element('imvert:result-file-subpath',$schema-subpath)"/>
             <xsl:sequence select="imf:create-info-element('imvert:result-file-fullpath',$schemafile)"/>
         
+            <xsl:variable name="file-url" select="imf:get-most-relevant-compiled-taggedvalue($this-package,'##CFG-TV-XSDLOCATION')"/>
+            <xsl:sequence select="imf:create-info-element('imvert:result-url',$file-url)"/>
+            
             <xs:schema>
                 <!-- schema attributes -->
                 <xsl:attribute name="targetNamespace" select="imf:get-namespace(.)"/>
@@ -263,18 +165,20 @@
         <xs:simpleType name="{imvert:name}">
             <xsl:sequence select="imf:get-annotation(.)"/>
             <xs:restriction base="xs:string">
-                <xsl:for-each select="imvert:enum">
+                <xsl:for-each select="imvert:attributes/imvert:attribute">
                     <xsl:sort select="imf:calculate-position(.)" data-type="number" order="ascending"/>
-                    <xs:enumeration value="{.}"/>
+                    <xs:enumeration value="{imvert:name/@original}">
+                        <xsl:sequence select="imf:get-annotation(.)"/>
+                    </xs:enumeration>
                 </xsl:for-each>
             </xs:restriction>
         </xs:simpleType>
-    </xsl:template>    
+    </xsl:template> 
     
     <xsl:template match="imvert:class[imvert:stereotype/@id = ('stereotype-name-codelist')]">
         <xs:simpleType name="{imvert:name}">
-            <xsl:variable name="data-location" select="imf:get-appinfo-location(.)"/>
-            <xsl:sequence select="imf:get-annotation(.,(),$data-location)"/>
+            <xsl:variable name="appinfo-data-location" select="imf:get-appinfo-location(.)"/>
+            <xsl:sequence select="imf:get-annotation(.,(),$appinfo-data-location)"/>
             <xs:restriction base="xs:string">
                 <xsl:sequence select="imf:create-datatype-property(.,'xs:string')"/>
             </xs:restriction>
@@ -412,7 +316,7 @@
         <xsl:variable name="supertype-substitutiongroup" select="$supertype/imvert:xsd-substitutiongroup"/> 
         <xsl:variable name="abstract" select="imvert:abstract"/>
         <xsl:variable name="is-includable" select="imf:boolean(imf:get-tagged-value(.,'##CFG-TV-INCLUDABLE'))"/>
-        <xsl:variable name="data-location" select="imf:get-appinfo-location(.)"/>
+        <xsl:variable name="appinfo-data-location" select="imf:get-appinfo-location(.)"/>
         <!-- all classes are element + complex type declaration; except for datatypes (<<datatype>>). -->
         <xsl:variable name="is-choice-member" select="$document-classes[imvert:stereotype/@id = ('stereotype-name-union') and imvert:attributes/imvert:attribute/imvert:type-id = $type-id]"/>
         
@@ -448,7 +352,7 @@
                         <xsl:attribute name="substitutionGroup" select="imf:get-type($supertype-name,$supertype-package-name)"/>
                     </xsl:otherwise>
                 </xsl:choose>
-                <xsl:sequence select="imf:get-annotation(.,(),$data-location)"/>
+                <xsl:sequence select="imf:get-annotation(.,(),$appinfo-data-location)"/>
             </xs:element>
         </xsl:if>
         
@@ -486,8 +390,8 @@
                         </xs:simpleContent>
                     </complex>
                 </xsl:when>
-                <xsl:when test="imvert:stereotype/@id = ('stereotype-name-union')">
-                    <!-- attributes of a NEN3610 union, i.e. a choice between classes. The choice is a specialization of a datatype -->
+                <xsl:when test="imvert:stereotype/@id = ('stereotype-name-union-datatypes','stereotype-name-union-attributes')"><!-- use case 1, 2, 3 -->
+                    <!-- A choice between classes that represent datatypes. -->
                     <xsl:variable name="atts">
                         <xsl:for-each select="imvert:attributes/imvert:attribute">
                             <xsl:sort select="imf:calculate-position(.)" data-type="number" order="ascending"/>
@@ -499,11 +403,11 @@
                             <xsl:variable name="defining-class-is-primitive" select="exists(imvert:primitive)"/>   
                             <xsl:choose>
                                 <xsl:when test="$defining-class-is-datatype or $defining-class-is-primitive">
-                                    <xsl:sequence select="imf:create-xml-debug-comment(.,'A choice member, which is a datatype')"/>
+                                    <xsl:sequence select="imf:create-xml-debug-comment(.,'A choice attribute member, which is a primitive datatype')"/>
                                     <xsl:sequence select="imf:create-element-property(.)"/>
                                 </xsl:when>
                                 <xsl:when test="empty($defining-class) and $allow-scalar-in-union">
-                                    <xsl:sequence select="imf:create-xml-debug-comment(.,'A choice member, which is a scalar type')"/>
+                                    <xsl:sequence select="imf:create-xml-debug-comment(.,'A choice attribute member, which is a scalar type')"/>
                                     <xsl:sequence select="imf:create-element-property(.)"/>
                                 </xsl:when>
                                 <xsl:when test="empty($defining-class)">
@@ -511,18 +415,18 @@
                                 </xsl:when>
                                 <xsl:when test="imf:is-linkable($defining-class) and imf:boolean($buildcollection) and exists($defining-class-subclasses)"> 
                                     <!-- insert the subtypes rather than the abstract supertype -->
-                                    <xsl:sequence select="imf:create-xml-debug-comment(.,'A choice member, linkable, abstract')"/>
+                                    <xsl:sequence select="imf:create-xml-debug-comment(.,'A choice attribute  member, linkable, abstract')"/>
                                     <xsl:for-each select="($defining-class,$defining-class-subclasses)">
                                         <xs:element ref="{imf:get-reference-class-name(.)}"/>
                                     </xsl:for-each>
                                 </xsl:when>
                                 <xsl:when test="imf:is-linkable($defining-class) and imf:boolean($buildcollection)"> 
                                     <!-- when the class is linkable, and using collections, use the reference element name -->
-                                    <xsl:sequence select="imf:create-xml-debug-comment(.,'A choice member, linkable')"/>
+                                    <xsl:sequence select="imf:create-xml-debug-comment(.,'A choice attribute member, linkable')"/>
                                     <xs:element ref="{imf:get-reference-class-name($defining-class)}"/>
                                 </xsl:when>
                                 <xsl:otherwise>
-                                    <xsl:sequence select="imf:create-xml-debug-comment(.,'A choice member')"/>
+                                    <xsl:sequence select="imf:create-xml-debug-comment(.,'A choice attribute member')"/>
                                     <xsl:variable name="minOccurs" select="if (imvert:min-occurs) then imvert:min-occurs else '1'"/>
                                     <xsl:variable name="maxOccurs" select="if (imvert:max-occurs) then imvert:max-occurs else '1'"/>
                                     <xs:element ref="{imf:get-qname($defining-class)}" minOccurs="{$minOccurs}" maxOccurs="{$maxOccurs}"/>  
@@ -535,12 +439,52 @@
                             <xs:choice>
                                 <xsl:attribute name="minOccurs" select="if (imvert:min-occurs) then imvert:min-occurs else '1'"/>
                                 <xsl:attribute name="maxOccurs" select="if (imvert:max-occurs) then imvert:max-occurs else '1'"/>
-                                <xsl:sequence select="imf:create-xml-debug-comment(.,'A number of choices')"/>
+                                <xsl:sequence select="imf:create-xml-debug-comment(.,'A number of attribute choices')"/>
                                 <xsl:sequence select="$atts"/>
                             </xs:choice>
                         </complex>
                     </xsl:if>
                 </xsl:when>
+                <xsl:when test="imvert:stereotype/@id = ('stereotype-name-union-associations')"><!-- use case 4 -->
+                    <xsl:variable name="assocs">
+                        <xsl:for-each select="imvert:associations/imvert:association">
+                            <xsl:sort select="imf:calculate-position(.)" data-type="number" order="ascending"/>
+                            <xsl:variable name="defining-class" select="imf:get-defining-class(.)"/>   
+                            <xsl:variable name="defining-class-subclasses" select="imf:get-subclasses($defining-class)"/>   
+                            
+                            <xsl:choose>
+                                <xsl:when test="imf:is-linkable($defining-class) and imf:boolean($buildcollection) and exists($defining-class-subclasses)"> 
+                                    <!-- insert the subtypes rather than the abstract supertype -->
+                                    <xsl:sequence select="imf:create-xml-debug-comment(.,'A choice association member, linkable, abstract')"/>
+                                    <xsl:for-each select="($defining-class,$defining-class-subclasses)">
+                                        <xs:element ref="{imf:get-reference-class-name(.)}"/>
+                                    </xsl:for-each>
+                                </xsl:when>
+                                <xsl:when test="imf:is-linkable($defining-class) and imf:boolean($buildcollection)"> 
+                                    <!-- when the class is linkable, and using collections, use the reference element name -->
+                                    <xsl:sequence select="imf:create-xml-debug-comment(.,'A choice association member, linkable')"/>
+                                    <xs:element ref="{imf:get-reference-class-name($defining-class)}"/>
+                                </xsl:when>
+                                <xsl:otherwise>
+                                    <xsl:sequence select="imf:create-xml-debug-comment(.,'A choice association member')"/>
+                                    <xsl:variable name="minOccurs" select="if (imvert:min-occurs) then imvert:min-occurs else '1'"/>
+                                    <xsl:variable name="maxOccurs" select="if (imvert:max-occurs) then imvert:max-occurs else '1'"/>
+                                    <xs:element ref="{imf:get-qname($defining-class)}" minOccurs="{$minOccurs}" maxOccurs="{$maxOccurs}"/>  
+                                </xsl:otherwise>
+                            </xsl:choose>
+                        </xsl:for-each>
+                    </xsl:variable>
+                    <xsl:if test="$assocs">
+                        <complex>
+                            <xs:choice>
+                                <xsl:attribute name="minOccurs" select="if (imvert:min-occurs) then imvert:min-occurs else '1'"/>
+                                <xsl:attribute name="maxOccurs" select="if (imvert:max-occurs) then imvert:max-occurs else '1'"/>
+                                <xsl:sequence select="imf:create-xml-debug-comment(.,'A number of association choices')"/>
+                                <xsl:sequence select="$assocs"/>
+                            </xs:choice>
+                        </complex>
+                    </xsl:if>
+                </xsl:when>
                 <xsl:when test="imvert:stereotype/@id = ('stereotype-name-complextype') and exists($formal-pattern)"><!-- IM-325 -->
                     <simple>
                         <xs:annotation>
@@ -684,107 +628,6 @@
     <xsl:template match="*|@*|text()">
         <xsl:apply-templates/>
     </xsl:template>
-
-    <xsl:function name="imf:get-annotation" as="node()?">
-        <xsl:param name="this" as="node()"/>
-        <xsl:sequence select="imf:get-annotation($this,(),())"/>
-    </xsl:function>
-    <xsl:function name="imf:get-annotation" as="node()?">
-        <xsl:param name="this" as="node()"/>
-        <xsl:param name="added-documentation" as="node()*"/>
-        <xsl:param name="added-appinfo" as="node()*"/>
-        <xsl:variable name="documentation" select="($added-documentation, imf:get-documentation($this))"/>
-        <xsl:if test="$added-appinfo or $documentation">
-            <xs:annotation>
-                <xsl:sequence select="$added-appinfo"/>
-                <xsl:sequence select="$documentation"/>
-            </xs:annotation>
-        </xsl:if>
-    </xsl:function>
-    
-    <xsl:function name="imf:get-schema-info" as="node()*">
-        <xsl:param name="this" as="node()"/>
-        <xsl:sequence select="imf:create-doc-element('xs:documentation','http://www.imvertor.org/schema-info/file-location',imf:get-xsd-filesubpath($this))"/>
-        <xsl:sequence select="imf:create-doc-element('xs:documentation','http://www.imvertor.org/schema-info/conversion',imf:get-config-parameter('pretext-encoding'))"/>
-    </xsl:function>
-    
-    <!-- 
-        get a type name based on the type specified, that is suited for XSD 
-        
-        The type may be somting like:
-        
-        Class1
-        scalar-string
-    
-        The package name is always specified but is irrelevant for scalars.
-    -->
-    <xsl:function name="imf:get-type" as="xs:string">
-        <xsl:param name="uml-type" as="xs:string"/> 
-        <xsl:param name="package-name" as="xs:string?"/> 
-        
-        <!-- check if the package is external -->
-        <xsl:variable name="external-package" select="$external-schemas[imvert:name = $package-name]"/>
-        
-        <xsl:variable name="defining-class" select="imf:get-class($uml-type,$package-name)"/>
-        <xsl:variable name="defining-package" select="$defining-class/.."/>
-        
-        <xsl:choose>
-            <xsl:when test="exists($external-package)">
-                <xsl:value-of select="concat($external-package/imvert:short-name,':',$uml-type)"/>
-            </xsl:when>
-            
-            <xsl:when test="$package-name and empty($defining-package)">
-                <!-- this is a class that is not known. This is the case for nilreasons on scalar types, we need to create a class for that. -->  
-                <xsl:variable name="short-name" select="$document-packages[imvert:name = $package-name]/imvert:short-name"/>
-                <xsl:value-of select="concat($short-name,':',$uml-type)"/>
-            </xsl:when>
-           
-            <xsl:otherwise>
-                
-                <xsl:variable name="primitive" select="$defining-class/imvert:primitive"/> <!-- e.g. BOOLEAN -->
-                
-                <xsl:variable name="uml-type-name" select="if (contains($uml-type,':')) then substring-after($uml-type,':') else $uml-type"/>
-                <xsl:variable name="primitive-type" select="substring-after($uml-type-name,'http://schema.omg.org/spec/UML/2.1/uml.xml#')"/>
-                
-                <xsl:variable name="base-type" select="
-                    if ($primitive)
-                    then $primitive
-                    else
-                        if ($primitive-type) 
-                        then $primitive-type 
-                        else 
-                            if (not($package-name) or imf:is-system-package($package-name)) 
-                            then $uml-type-name 
-                            else ()"/>
-                
-                <xsl:variable name="scalar" select="$all-scalars[@id=$base-type][last()]"/>
-                
-                <xsl:choose>
-                    <xsl:when test="$base-type"> 
-                        <xsl:variable name="xs-type" select="$scalar/type-map[@formal-lang='xs']"/>
-                        <xsl:choose>
-                            <xsl:when test="exists($scalar) and starts-with($xs-type,'#')">
-                                <xsl:value-of select="$xs-type"/>
-                            </xsl:when> 
-                            <xsl:when test="exists($scalar)">
-                                <xsl:value-of select="concat('xs:', $xs-type)"/>
-                            </xsl:when>
-                            <xsl:otherwise>
-                                <xsl:value-of select="'xs:string'"/>
-                                <xsl:sequence select="imf:msg('ERROR', 'Unknown native type: [1]', $base-type)"/>
-                            </xsl:otherwise>
-                        </xsl:choose>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:value-of select="concat($defining-package/imvert:short-name,':',$uml-type-name)"/>
-                    </xsl:otherwise>
-                </xsl:choose>
-                
-            </xsl:otherwise>
-        </xsl:choose>
-        
-        
-    </xsl:function>
     
     <xsl:function name="imf:create-element-property" as="item()*">
         <xsl:param name="this" as="node()"/>
@@ -833,7 +676,7 @@
         <xsl:variable name="min-occurs-assoc" select="if ($this/imvert:min-occurs='0') then '0' else '1'"/>
         <xsl:variable name="min-occurs-target" select="if ($this/imvert:min-occurs='0') then '1' else $this/imvert:min-occurs"/>
         
-        <xsl:variable name="data-location" select="imf:get-appinfo-location($this)"/>
+        <xsl:variable name="appinfo-data-location" select="imf:get-appinfo-location($this)"/>
         
         <xsl:variable name="has-key" select="$defining-class/imvert:attributes/imvert:attribute[imvert:stereotype/@id = 'stereotype-name-key']"/>
         
@@ -842,6 +685,8 @@
         <xsl:variable name="use-identifier-domains" select="imf:boolean(imf:get-xparm('cli/identifierdomains','no'))"/>
         <xsl:variable name="domain-value" select="imf:get-tagged-value($this,'##CFG-TV-DOMAIN')"/>
         
+        <xsl:variable name="space-restriction" select="imf:create-nonempty-constraint('scalar-string')"/>
+        
         <mark nillable="{$is-nillable}" nilreason="{$has-nilreason}">
             <xsl:choose>
             <!-- any type, i.e. #any -->
@@ -897,7 +742,7 @@
                     <xsl:attribute name="minOccurs" select="$min-occurs-assoc"/>
                     <xsl:attribute name="maxOccurs" select="$this/imvert:max-occurs"/>
                     <xsl:sequence select="imf:create-xml-debug-comment($this,'A postcode')"/>
-                    <xsl:sequence select="imf:get-annotation($this,$data-location,())"/>
+                    <xsl:sequence select="imf:get-annotation($this,$appinfo-data-location,())"/>
                     <xs:simpleType>
                         <xs:restriction base="xs:string">
                             <xs:pattern value="[0-9]{{4}}[A-Z]{{2}}"/>
@@ -920,7 +765,7 @@
                     <xsl:attribute name="minOccurs" select="$min-occurs-assoc"/>
                     <xsl:attribute name="maxOccurs" select="$this/imvert:max-occurs"/>
                     <xsl:sequence select="imf:create-xml-debug-comment($this,'An incomplete datetime, date or time')"/>
-                    <xsl:sequence select="imf:get-annotation($this,$data-location,())"/>
+                    <xsl:sequence select="imf:get-annotation($this,$appinfo-data-location,())"/>
                 </xs:element>
             </xsl:when>
             <xsl:when test="starts-with($type,'xs:') and $is-restriction"> <!-- any xsd primitve type such as xs:string, with local restrictions such as patterns -->
@@ -929,7 +774,7 @@
                     <xsl:attribute name="minOccurs" select="$min-occurs-assoc"/>
                     <xsl:attribute name="maxOccurs" select="$this/imvert:max-occurs"/>
                     <xsl:sequence select="imf:create-xml-debug-comment($this,'A restriction on a primitive type')"/>
-                    <xsl:sequence select="imf:get-annotation($this,$data-location,())"/>
+                    <xsl:sequence select="imf:get-annotation($this,$appinfo-data-location,())"/>
                     <xs:simpleType>
                         <xs:restriction base="{$type}">
                             <xsl:sequence select="imf:create-datatype-property($this,$type)"/>
@@ -937,21 +782,21 @@
                     </xs:simpleType>
                 </xs:element>
             </xsl:when>
-            <xsl:when test="$type=('xs:string') and not($this/imvert:baretype='TXT')"> <!-- these types could be, but may may not be empty -->
-                <xs:element>
-                    <xsl:attribute name="name" select="$name"/>
-                    <xsl:attribute name="minOccurs" select="$min-occurs-assoc"/>
-                    <xsl:attribute name="maxOccurs" select="$this/imvert:max-occurs"/>
-                    <xsl:sequence select="imf:create-xml-debug-comment($this,'A string')"/>
-                    <xsl:sequence select="imf:get-annotation($this,$data-location,())"/>
-                    <xs:simpleType>
-                        <xs:restriction base="{$type}">
-                            <xs:pattern value="\S.*"/> <!-- Note: do not use xs:minLength as this allows for a single space -->
-                        </xs:restriction>
-                    </xs:simpleType>
-                </xs:element>
-            </xsl:when>
-            <?x            
+                <xsl:when test="$type=('xs:string') and $space-restriction"> 
+                    <xs:element>
+                        <xsl:attribute name="name" select="$name"/>
+                        <xsl:attribute name="minOccurs" select="$min-occurs-assoc"/>
+                        <xsl:attribute name="maxOccurs" select="$this/imvert:max-occurs"/>
+                        <xsl:sequence select="imf:create-xml-debug-comment($this,'A string with actual content')"/>
+                        <xsl:sequence select="imf:get-annotation($this,$appinfo-data-location,())"/>
+                        <xs:simpleType>
+                            <xs:restriction base="{$type}">
+                               <xsl:sequence select="$space-restriction"/>
+                            </xs:restriction>
+                        </xs:simpleType>
+                    </xs:element>
+                </xsl:when>
+                <?x            
             <xsl:when test="starts-with($type,'xs:')"> 
                 <!-- 
                     Determine the effective type, this is the actual type such as xs:string or a generated basetype 
@@ -964,7 +809,7 @@
                     <xsl:attribute name="minOccurs" select="$min-occurs-assoc"/>
                     <xsl:attribute name="maxOccurs" select="$this/imvert:max-occurs"/>
                     <xsl:sequence select="imf:create-xml-debug-comment($this,'A voidable primitive type')"/>
-                    <xsl:sequence select="imf:get-annotation($this,$data-location,())"/>
+                    <xsl:sequence select="imf:get-annotation($this,$appinfo-data-location,())"/>
                 </xs:element>
             </xsl:when>
             x?>
@@ -994,6 +839,21 @@
                     </xs:simpleType>
                 </xs:element>
             </xsl:when>
+            <xsl:when test="$is-primitive and $this/imvert:type-name = 'xs:string'"> 
+                <!-- als het feitelijk een string betreft, dan ook de facet dat deze niet leeg mag zijn --> 
+                <xs:element>
+                    <xsl:attribute name="name" select="$name"/>
+                    <xsl:attribute name="minOccurs" select="$min-occurs-assoc"/>
+                    <xsl:attribute name="maxOccurs" select="$this/imvert:max-occurs"/>
+                    <xsl:sequence select="imf:create-xml-debug-comment($this,'A string, after mapping')"/>
+                    <xsl:sequence select="imf:get-annotation($this)"/>
+                    <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                            <xs:pattern value="\S.*"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:element>
+            </xsl:when>
             <xsl:when test="$is-primitive"> 
                 <!-- any xsd primitve type such as integer -->
                 <xs:element>
@@ -1013,7 +873,7 @@
                     <xsl:attribute name="minOccurs" select="$this/imvert:min-occurs"/>
                     <xsl:attribute name="maxOccurs" select="$this/imvert:max-occurs"/>
                     <xsl:sequence select="imf:create-xml-debug-comment($this,'An enumeration or codelist')"/>
-                    <xsl:sequence select="imf:get-annotation($this,$data-location,())"/>
+                    <xsl:sequence select="imf:get-annotation($this,$appinfo-data-location,())"/>
                 </xs:element>
             </xsl:when>
             <xsl:when test="($is-complextype or $is-conceptual-complextype)">
@@ -1024,7 +884,7 @@
                     <xsl:attribute name="minOccurs" select="$this/imvert:min-occurs"/>
                     <xsl:attribute name="maxOccurs" select="$this/imvert:max-occurs"/>
                     <xsl:sequence select="imf:create-xml-debug-comment($this,'A complex type')"/>
-                    <xsl:sequence select="imf:get-annotation($this,$data-location,())"/>
+                    <xsl:sequence select="imf:get-annotation($this,$appinfo-data-location,())"/>
                 </xs:element>
             </xsl:when>
             <xsl:when test="$is-datatype and $use-identifier-domains and $domain-value">
@@ -1033,7 +893,7 @@
                     <xsl:attribute name="minOccurs" select="$this/imvert:min-occurs"/>
                     <xsl:attribute name="maxOccurs" select="$this/imvert:max-occurs"/>
                     <xsl:sequence select="imf:create-xml-debug-comment($this,'A datatype with domain')"/>
-                    <xsl:sequence select="imf:get-annotation($this,$data-location,())"/>
+                    <xsl:sequence select="imf:get-annotation($this,$appinfo-data-location,())"/>
                     <xs:complexType>
                         <xs:simpleContent>
                             <xs:extension base="{$type}">
@@ -1050,7 +910,7 @@
                     <xsl:attribute name="minOccurs" select="$this/imvert:min-occurs"/>
                     <xsl:attribute name="maxOccurs" select="$this/imvert:max-occurs"/>
                     <xsl:sequence select="imf:create-xml-debug-comment($this,'A datatype')"/>
-                    <xsl:sequence select="imf:get-annotation($this,$data-location,())"/>
+                    <xsl:sequence select="imf:get-annotation($this,$appinfo-data-location,())"/>
                 </xs:element>
             </xsl:when>
             <xsl:when test="not($name) and $is-external">
@@ -1060,7 +920,7 @@
                     <xsl:attribute name="minOccurs" select="$this/imvert:min-occurs"/>
                     <xsl:attribute name="maxOccurs" select="$this/imvert:max-occurs"/>
                     <xsl:sequence select="imf:create-xml-debug-comment($this,'No name and the type is external')"/>
-                    <xsl:sequence select="imf:get-annotation($this,$data-location,())"/>
+                    <xsl:sequence select="imf:get-annotation($this,$appinfo-data-location,())"/>
                 </xs:element>
             </xsl:when>
             <xsl:when test="$is-choice"> 
@@ -1089,7 +949,7 @@
                     <xsl:attribute name="minOccurs" select="$min-occurs-assoc"/>
                     <xsl:attribute name="maxOccurs" select="1"/>
                     <xsl:sequence select="imf:create-xml-debug-comment($this,'An external type')"/>
-                    <xsl:sequence select="imf:get-annotation($this,$data-location,())"/>
+                    <xsl:sequence select="imf:get-annotation($this,$appinfo-data-location,())"/>
                     <!-- TODO continue: introduce correct reference / see IM-59 -->
                     <xsl:variable name="reftype" select="$type"/>
                     <xs:complexType>
@@ -1111,7 +971,7 @@
                         <xs:choice minOccurs="{$this/imvert:min-occurs}" maxOccurs="{$this/imvert:max-occurs}">
                             <xsl:variable name="sub-classes" select="($defining-class, imf:get-substitution-classes($defining-class))"/>
                             <xsl:sequence select="imf:create-xml-debug-comment($this,'An unnamed association, avoiding substitutions')"/>
-                            <xsl:sequence select="imf:get-annotation($this,$data-location,())"/>
+                            <xsl:sequence select="imf:get-annotation($this,$appinfo-data-location,())"/>
                             <xsl:for-each select="$sub-classes[not(imf:boolean(imvert:abstract))]">
                                 <xs:element ref="{imf:get-qname(.)}"/>
                             </xsl:for-each>
@@ -1123,7 +983,7 @@
                             <xsl:attribute name="minOccurs" select="$this/imvert:min-occurs"/>
                             <xsl:attribute name="maxOccurs" select="$this/imvert:max-occurs"/>
                             <xsl:sequence select="imf:create-xml-debug-comment($this,'An unnamed association')"/>
-                            <xsl:sequence select="imf:get-annotation($this,$data-location,())"/>
+                            <xsl:sequence select="imf:get-annotation($this,$appinfo-data-location,())"/>
                         </xs:element>
                     </xsl:otherwise>            
                 </xsl:choose>
@@ -1140,7 +1000,7 @@
                                 <xs:choice>
                                     <xsl:variable name="sub-classes" select="($defining-class, imf:get-substitution-classes($defining-class))"/>
                                     <xsl:sequence select="imf:create-xml-debug-comment($this,'A wrapped member, avoiding substitutions')"/>
-                                    <xsl:sequence select="imf:get-annotation($this,$data-location,())"/>
+                                    <xsl:sequence select="imf:get-annotation($this,$appinfo-data-location,())"/>
                                     <xsl:for-each select="$sub-classes[not(imf:boolean(imvert:abstract))]">
                                         <xs:element ref="{imf:get-qname(.)}"/>
                                     </xsl:for-each>
@@ -1151,7 +1011,7 @@
                             <xs:element>
                                 <xsl:attribute name="ref" select="$type"/>
                                 <xsl:sequence select="imf:create-xml-debug-comment($this,'A wrapped member')"/>
-                                <xsl:sequence select="imf:get-annotation($this,$data-location,())"/>
+                                <xsl:sequence select="imf:get-annotation($this,$appinfo-data-location,())"/>
                             </xs:element>
                         </xsl:otherwise>            
                     </xsl:choose>
@@ -1172,6 +1032,7 @@
                             We do not consider composite relations to be treated specially 
                             (and do not place a reference to X).
                         -->
+                        <xsl:sequence select="dlogger:save('$buildcollection',$buildcollection)"></xsl:sequence>
                         <xsl:for-each select="$ref-classes">
                             <!-- IM-110 alle elementen hier zijn linkable -->
                             <xsl:choose>
@@ -1210,7 +1071,7 @@
                 </xsl:variable>
                 <xsl:choose>
                     <xsl:when test="$is-composite and imf:boolean($anonymous-components) and not($is-nillable)">
-                        <xsl:sequence select="imf:get-annotation($this,$data-location,())"/>
+                        <xsl:sequence select="imf:get-annotation($this,$appinfo-data-location,())"/>
                         <xs:sequence>
                             <xsl:attribute name="minOccurs" select="$min-occurs-assoc"/>
                             <xsl:attribute name="maxOccurs" select="1"/>
@@ -1235,7 +1096,7 @@
                                     <xsl:sequence select="imf:create-xml-debug-comment($this,'An objecttype')"/>
                                 </xsl:otherwise>
                             </xsl:choose>
-                            <xsl:sequence select="imf:get-annotation($this,$data-location,())"/>
+                            <xsl:sequence select="imf:get-annotation($this,$appinfo-data-location,())"/>
                             <xs:complexType>
                                 <xsl:sequence select="$content"/>
                             </xs:complexType>                            
@@ -1245,11 +1106,12 @@
             </xsl:when>
             <xsl:otherwise>
                 <!-- TODO IM-83 STALLED, NOT IMPLEMENTED YET FOR THIS CASE -->
+                <xsl:sequence select="dlogger:save('$defining-class',$defining-class)"></xsl:sequence>
                 <xs:element>
                     <xsl:attribute name="name" select="$name"/>
                     <xsl:attribute name="minOccurs" select="$min-occurs-assoc"/>
                     <xsl:attribute name="maxOccurs" select="1"/>
-                    <xsl:sequence select="imf:get-annotation($this,$data-location,())"/>
+                    <xsl:sequence select="imf:get-annotation($this,$appinfo-data-location,())"/>
                     <xs:complexType>
                         <xsl:variable name="result">
                             <xsl:choose>
@@ -1308,19 +1170,6 @@
         </mark>
     </xsl:function>
     
-    <xsl:function name="imf:create-attribute-property" as="item()*">
-        <xsl:param name="this" as="node()"/>
-  
-        <xsl:variable name="voidable" select="$this/imvert:stereotype/@id = ('stereotype-name-voidable')"/>
-        <xsl:variable name="type" select="imf:get-type($this/imvert:type-name,$this/imvert:type-package)"/>
-        <xs:attribute>
-            <xsl:attribute name="name" select="$this/imvert:name"/>
-            <xsl:attribute name="use" select="if ($this/imvert:min-occurs='0') then 'optional' else 'required'"/>
-            <xsl:attribute name="type" select="$type"/>
-            <xsl:sequence select="imf:get-annotation($this)"/>
-        </xs:attribute>
-    </xsl:function>
-
     <xsl:template match="imvert:union">
         <xsl:variable name="membertypes" as="item()*">
             <!-- for each referenced datatype, determine the actual XSD equivalent. Produce a xs:union construct. -->
@@ -1330,17 +1179,7 @@
         </xsl:variable>
         <xs:union memberTypes="{string-join($membertypes,' ')}"/>
     </xsl:template>
-    
-    <xsl:function name="imf:is-system-package" as="xs:boolean">
-        <xsl:param name="package-name" as="xs:string"/>
-        <xsl:copy-of select="substring-before($package-name,'_') = ('EA','Info')"/>
-    </xsl:function>
-   
-    <xsl:function name="imf:is-restriction" as="xs:boolean">
-        <xsl:param name="this" as="node()"/>
-        <xsl:sequence select="exists((imf:get-facet-pattern($this), imf:get-facet-max-length($this), imf:get-facet-total-digits($this), imf:get-facet-fraction-digits($this)))"/>
-    </xsl:function>
-    
+
     <?x associates komen niet meer voor?
         
     <xsl:function name="imf:is-association-class" as="xs:boolean">
@@ -1349,18 +1188,6 @@
     </xsl:function>
     ?>
     
-    <xsl:function name="imf:get-restriction-basetype-name" as="xs:string">
-        <xsl:param name="this" as="node()"/> <!-- any attribute/association node. -->
-        <xsl:value-of select="concat('Basetype_',$this/ancestor::imvert:class/imvert:name,'_',$this/imvert:name)"/>
-    </xsl:function>
-    
-    <xsl:function name="imf:create-nilreason">
-        <xsl:param name="is-conceptual-hasnilreason"/><!-- IM-477 -->
-        <xsl:if test="not($is-conceptual-hasnilreason)">
-            <xs:attribute name="nilReason" type="xs:string" use="optional"/>
-        </xsl:if>
-    </xsl:function>
-    
     <xsl:function name="imf:get-documentation" as="node()*">
         <xsl:param name="construct" as="node()"/>
         <xsl:sequence select="imf:create-doc-element('xs:documentation','http://www.imvertor.org/schema-info/technical-documentation',
@@ -1381,39 +1208,7 @@
         <xsl:sequence select="imf:create-doc-element('xs:appinfo','http://www.imvertor.org/schema-info/owner',$owner-name)"/> 
         <!--<xsl:sequence select="imf:create-doc-element('xs:appinfo','http://www.imvertor.org/schema-info/svn',concat($char-dollar,'Id',$char-dollar))"/>-->
     </xsl:function>
-    
-    <xsl:function name="imf:get-appinfo-location" as="node()*">
-        <xsl:param name="this" as="node()"/>
-        <xsl:sequence select="imf:create-doc-element('xs:appinfo','http://www.imvertor.org/data-info/uri',imf:get-data-location($this))"/>
-    </xsl:function>
-    
-    <xsl:function name="imf:create-doc-element" as="node()*">
-        <xsl:param name="element-name" as="xs:string"/>
-        <xsl:param name="namespace" as="xs:string"/>
-        <xsl:param name="value" as="xs:string*"/>
-        <xsl:for-each select="$value[normalize-space(.)]">
-            <xsl:element name="{$element-name}">
-                <xsl:attribute name="source" select="$namespace"/>
-                <xsl:value-of select="."/>
-            </xsl:element>
-        </xsl:for-each>
-    </xsl:function>
-    
-    <xsl:function name="imf:create-info-element" as="node()*">
-        <xsl:param name="element-name" as="xs:string"/>
-        <xsl:param name="value" as="xs:string*"/>
-        <xsl:for-each select="$value">
-            <xsl:element name="{$element-name}">
-                <xsl:value-of select="."/>
-            </xsl:element>
-        </xsl:for-each>
-    </xsl:function>
         
-    <xsl:function name="imf:get-qname" as="xs:string">
-        <xsl:param name="class" as="node()"/>
-        <xsl:value-of select="concat($class/parent::imvert:package/imvert:short-name,':',$class/imvert:name)"/>
-    </xsl:function>
-    
     <xsl:function name="imf:get-namespace" as="xs:string">
         <xsl:param name="this" as="node()"/>
         <xsl:choose>
@@ -1426,106 +1221,6 @@
         </xsl:choose>
     </xsl:function>
 
-    <xsl:function name="imf:create-nonempty-constraint" as="item()*">
-        <xsl:param name="type" as="xs:string?"/>
-        <xsl:if test="$type=('scalar-string', 'scalar-uri') or not($type)">
-            <xs:pattern value="\S.*"/> <!-- Note: do not use xs:minLength as this allows for a single space -->
-        </xsl:if>
-    </xsl:function>
-    
-    <!-- return the class that defines the type of the attribute or association passed. --> 
-    <xsl:function name="imf:get-defining-class" as="node()?">
-        <xsl:param name="this" as="node()"/>
-       
-        <!-- overrule name based searches, must be ID based.
-            <xsl:sequence select="$document-packages[imvert:name=$this/imvert:type-package]/imvert:class[imvert:name=$this/imvert:type-name]"/> 
-        --> 
-        <xsl:sequence select="$document-classes[imvert:id=$this/imvert:type-id]"/> 
-        
-    </xsl:function>
-
-    <!-- 
-        Return the complete subpath and filename of the xsd file to be generated.
-        Sample: xsd-folder/subpath/my/schema/MyappMypackage_1_0_3.xsd
-        
-        xsd-folder/subpath is provided as a cli parameter cli/xsdsubpath
-    -->
-    <xsl:function name="imf:get-xsd-filesubpath" as="xs:string">
-        <xsl:param name="this" as="node()"/> <!-- a package -->
-        <xsl:choose>
-            <xsl:when test="$this/imvert:stereotype/@id = (('stereotype-name-external-package','stereotype-name-system-package'))"> 
-                <!-- 
-                    the package is external (GML, Xlink or the like). 
-                    Place reference to that external pack. 
-                    The package is copied alongside the target application package.
-                --> 
-                <xsl:value-of select="imf:get-uri-parts($this/imvert:location)/path"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select="concat($xsd-subpath, '/', imf:get-xsd-filefolder($this), '/', encode-for-uri(imf:get-xsd-filename($this)))"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:function>
-  
-    <!-- 
-        return the full XSD file path of the package passed.
-    -->
-    <xsl:function name="imf:get-xsd-filefullpath" as="xs:string">
-        <xsl:param name="this" as="element()"/>
-        <xsl:variable name="schema-subpath" select="imf:get-xsd-filesubpath($this)"/>
-        <xsl:value-of select="concat($work-xsd-folder-url,'/',$schema-subpath)"/>
-    </xsl:function>
-  
-    <!-- 
-        Get the path of the xsd file. This is the part of the namespace that is behind the repository-url.
-        Example:
-        root namespace (alias) is: 
-            http://www.imvertor.org/schema
-        URL is: 
-            http://www.imvertor.org/schema/my/schema/
-        and release is: 
-            20120307
-        returns: 
-            my/schema/v20120307
-    -->    
-    <xsl:function name="imf:get-xsd-filefolder" as="xs:string">
-        <xsl:param name="this" as="node()"/> <!-- an imvert:package -->
-        <xsl:variable name="localpath" select="substring-after($this/imvert:namespace,concat($base-namespace,'/'))"/>
-        <xsl:value-of select="concat(if (normalize-space($localpath)) then $localpath else 'unknown','/v',$this/imvert:release)"/>
-    </xsl:function>
-    
-    <!--
-        Return the file name of the XSD to be generated.
-    -->
-    <xsl:function name="imf:get-xsd-filename" as="xs:string">
-        <xsl:param name="this" as="node()"/>
-        
-        <xsl:sequence select="imf:set-config-string('work','xsd-domain',$this/imvert:name,true())"/>
-        <xsl:sequence select="imf:set-config-string('work','xsd-version',replace($this/imvert:version,'\.','_'),true())"/>
-        <xsl:sequence select="imf:set-config-string('work','xsd-application',$application-package-name,true())"/>
-        
-        <xsl:value-of select="imf:merge-parms(imf:get-config-string('cli','xsdfilename'))"/>
-    </xsl:function>
-    
-    <!-- 
-        return the release number of the Model and therefore the XSD to be generated 
-    -->
-    <xsl:function name="imf:get-release" as="xs:string?">
-        <xsl:param name="this" as="node()"/>
-        <!-- 
-            Assume release of supplier, unless release specified.
-        -->
-        <xsl:variable name="release" select="$this/imvert:release"/>
-        <xsl:choose>
-            <xsl:when test="exists($release)">
-                <xsl:value-of select="$release"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:sequence select="imf:msg('ERROR', 'No release found for package: [1] ([2])',($this/imvert:name,$this/imvert:namespace))"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:function>
-    
     <!-- 
         Get the name of the referencing element. 
         This is the reference class for internal classes (such as AbcRef), or the element itself in any external schema.
@@ -1549,150 +1244,12 @@
             </xsl:otherwise>
         </xsl:choose>
     </xsl:function>
-    
-    <!-- 
-        Return the members of sequence set1 that are not in set2. 
-        The comparison is based on the string value of the members. 
-    -->
-    <xsl:function name="imf:sequence-except-by-string-value" as="item()*">
-        <xsl:param name="set1" as="item()*"/>
-        <xsl:param name="set2" as="item()*"/>
-        <xsl:for-each select="$set1">
-            <xsl:variable name="stringvalue" select="xs:string(.)"/>
-            <xsl:if test="not($set2 = $stringvalue)">
-                <xsl:sequence select="."/>
-            </xsl:if>
-        </xsl:for-each>
-    </xsl:function>
-
-    <!-- 
-        Return this class and all classes that are substitutable for this class, that are also linkable (and therefore a reference element must be created). 
-        The class passed as rootclass may be abstract and still be linkable; linkable substitution classes must be concrete.
-   
-        This set also includes classes that realize this class in a static way.
-        These classes do not inherit any properties of the realizes class, but can take its place. 
-    -->
-    <xsl:function name="imf:get-linkable-subclasses-or-self" as="node()*">
-        <xsl:param name="rootclass" as="node()"/>
-        <xsl:sequence select="imf:get-substitutable-subclasses($rootclass,true())[imf:is-linkable(.)]"/>
-    </xsl:function>
-    
-    <!-- 
-        Return all classes that can be substituted for the class passed, and self. 
-        Do not return abstract classes. 
-    -->
-    <xsl:function name="imf:get-substitutable-subclasses" as="element()*">
-        <xsl:param name="rootclass" as="element()"/>
-        <xsl:param name="include-self" as="xs:boolean"/>
-        <xsl:variable name="substitution-classes" select="imf:get-substitution-classes($rootclass)"/>
-        <xsl:sequence select="if ($include-self) then $rootclass else ()"/>
-        <xsl:sequence select="$substitution-classes"/>
-    </xsl:function>
-    
-    <!-- 
-        Return all classes that can be substituted for the class passed, but not self.
-        Also returns abstract classes.
-    -->
-    <xsl:function name="imf:get-substitution-classes" as="node()*">
-        <xsl:param name="class" as="node()"/>
-        <xsl:variable name="class-id" select="$class/imvert:id"/>
-        <xsl:for-each select="$document-classes[imvert:substitution/imvert:supplier-id=$class-id or imvert:supertype/imvert:type-id=$class-id]">
-            <xsl:sequence select="."/>
-            <xsl:sequence select="imf:get-substitution-classes(.)"/>
-        </xsl:for-each>
-    </xsl:function>
-        
-    <xsl:function name="imf:create-xml-debug-comment" as="comment()?">
-        <xsl:param name="info-node" as="item()?"/>
-        <xsl:param name="text" as="xs:string"/>
-        <xsl:param name="parms" as="item()*"/>
-        <xsl:variable name="s" select="concat(if ($info-node) then imf:get-display-name($info-node) else concat('&quot;',$info-node,'&quot;'),' - ',imf:insert-fragments-by-index($text,$parms))"/>
-        <!--<xsl:sequence select="dlogger:save('debug',$s)"></xsl:sequence>-->
-        <xsl:if test="$debugging">
-            <xsl:comment select="$s"/>
-        </xsl:if>
-    </xsl:function>
-    
-    <xsl:function name="imf:create-xml-debug-comment" as="comment()?">
-        <xsl:param name="info-node" as="item()?"/>
-        <xsl:param name="text" as="xs:string"/>
-        <xsl:sequence select="imf:create-xml-debug-comment($info-node,$text,())"/>
-    </xsl:function>
-
-    <!-- return all associations to this class -->
-    <xsl:function name="imf:get-references">
-        <xsl:param name="class" as="element()"/>
-        <xsl:variable name="id" select="$class/imvert:id"/>
-        <xsl:sequence select="for $a in $document-classes//imvert:association return if ($a/imvert:type-id = $id) then $a else ()"/>
-    </xsl:function>
-    
-    <xsl:function name="imf:is-abstract">
-        <xsl:param name="class"/>
-        <xsl:sequence select="imf:boolean($class/imvert:abstract)"/>        
-    </xsl:function>
 
-    <xsl:function name="imf:create-scalar-property">
-        <xsl:param name="this"/>
-        
-        <xsl:variable name="scalar-type" select="$this/imvert:type-name"/>
-        
-        <xsl:variable name="scalar" select="$all-scalars[@id = $scalar-type][last()]"/>
-        <xsl:variable name="scalar-construct-pattern" select="$scalar/type-modifier/pattern[@lang=$language]"/>
-        <xsl:variable name="scalar-construct-union" select="$scalar/type-modifier/type-map"/>
-        
-        <xsl:variable name="type-construct">
-            <xsl:choose>
-                <xsl:when test="exists($scalar-construct-pattern)">
-                    <xs:restriction base="xs:string">
-                        <xs:pattern value="{$scalar-construct-pattern}"/>
-                    </xs:restriction>
-                </xsl:when>
-                <xsl:when test="exists($scalar-construct-union)">
-                    <xs:union memberTypes="{for $t in $scalar-construct-union return concat('xs:', $t)}"/>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:sequence select="imf:msg('ERROR','Cannot create scalar type property')"/>
-                </xsl:otherwise>
-            </xsl:choose>
-        </xsl:variable>
-        
-        <xsl:sequence select="$type-construct"/>
-        
-    </xsl:function>
-    
-    <xsl:function name="imf:create-fixtype-property">
-        <xsl:param name="scalar-type" as="xs:string"/>
-        
-        <xsl:variable name="scalar" select="$all-scalars[@id = $scalar-type][last()]"/>
-        <xsl:variable name="scalar-construct-pattern" select="$scalar/type-modifier/pattern[@lang=$language]"/>
-        <xsl:variable name="scalar-construct-union" select="$scalar/type-modifier/type-map"/>
-        
-        <xsl:choose>
-            <xsl:when test="exists($scalar-construct-pattern)">
-                <xs:restriction base="xs:string">
-                    <xs:pattern value="{$scalar-construct-pattern}"/>
-                </xs:restriction>
-            </xsl:when>
-            <xsl:when test="exists($scalar-construct-union)">
-                <xs:union memberTypes="{for $t in $scalar-construct-union return concat('xs:', $t)}"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:sequence select="imf:msg('ERROR','Cannot create fixtype property')"/>
-            </xsl:otherwise>
-        </xsl:choose>
-        
-    </xsl:function>
-    
     <xsl:function name="imf:add-xmlbase" as="element(xs:attribute)?">
         <xsl:param name="is-includable"/>
         <xsl:if test="$is-includable">
             <xs:attribute ref="xml:base" use="optional"/>
         </xsl:if>
     </xsl:function>
-    
-    <xsl:function name="imf:get-id-attribute" as="element(imvert:attribute)?">
-        <xsl:param name="class" as="element(imvert:class)"/>
-        <xsl:sequence select="$class/imvert:attributes/imvert:attribute[imf:boolean(imvert:is-id)]"/>
-    </xsl:function>
-    
+
 </xsl:stylesheet>
diff --git a/src/main/resources/xsl/XsdCompiler/common-postform.xsl b/src/main/resources/xsl/XsdCompiler/common-postform.xsl
new file mode 100644
index 000000000..e2f79ac54
--- /dev/null
+++ b/src/main/resources/xsl/XsdCompiler/common-postform.xsl
@@ -0,0 +1,21 @@
+<xsl:stylesheet 
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:UML="omg.org/UML1.3"
+    
+    xmlns:imvert="http://www.imvertor.org/schema/system"
+    xmlns:ext="http://www.imvertor.org/xsl/extensions"
+    xmlns:imf="http://www.imvertor.org/xsl/functions"
+    
+    xmlns:ekf="http://EliotKimber/functions"
+    
+    exclude-result-prefixes="#all"
+    version="3.0">
+    
+    <xsl:function name="imf:normalize-xsd-name" as="xs:string">
+        <xsl:param name="name" as="xs:string"/>
+        <xsl:variable name="c">(\s)|(&amp;)|(&lt;)|(&gt;)|(&apos;)|(&quot;)</xsl:variable>
+        <xsl:value-of select="string-join(for $n in tokenize($name,':') return replace($n,$c,'_'),':')"/>
+    </xsl:function>
+    
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/main/resources/xsl/XsdCompiler/common-xsd.xsl b/src/main/resources/xsl/XsdCompiler/common-xsd.xsl
index df226fd86..3224e3fbb 100644
--- a/src/main/resources/xsl/XsdCompiler/common-xsd.xsl
+++ b/src/main/resources/xsl/XsdCompiler/common-xsd.xsl
@@ -7,6 +7,115 @@
     xmlns:dlogger="http://www.armatiek.nl/functions/dlogger-proxy"
     >
     
+    <xsl:variable name="strings-nonempty" select="imf:get-config-xmlschemarules()/parameter[@name='strings-nonempty']"/><!-- https://github.com/Imvertor/Imvertor-Maven/issues/52 -->
+    <xsl:variable name="xsd-subpath" select="encode-for-uri(imf:merge-parms(imf:get-config-string('cli','xsdsubpath')))"/>
+    <xsl:variable name="work-xsd-folder-url" select="imf:file-to-url(imf:get-config-string('system','work-xsd-folder-path'))"/>
+    
+    <xsl:variable name="is-forced-nillable" select="imf:boolean(imf:get-config-string('cli','forcenillable'))"/>
+    
+    <xsl:variable name="current-datetime" select="imf:format-dateTime(imf:get-config-string('run','start'))"/>
+    <xsl:variable name="current-imvertor-version" select="imf:get-config-string('run','version')"/>
+    
+    <xsl:variable name="allow-scalar-in-union" select="imf:boolean($configuration-metamodel-file//features/feature[@name='allow-scalar-in-union'])"/>
+    
+    <!-- 
+        What types result in an attribute in stead of an element? 
+        This is always the case for ID values.
+        It is not possible to mix the use of types on elements and attributes. 
+        Note that Imvertor is element-oriented, not attribute-oriented.
+    -->
+    <xsl:variable name="xml-attribute-type" select="('ID')"/>
+    
+    <xsl:variable 
+        name="external-schemas" 
+        select="$imvert-document//imvert:package[imvert:stereotype/@id = ('stereotype-name-external-package','stereotype-name-system-package')]" 
+        as="element(imvert:package)*"/>
+    
+    <xsl:variable 
+        name="external-schema-names" 
+        select="$external-schemas/imvert:name" 
+        as="xs:string*"/>
+    
+    <xsl:function name="imf:template-create-schemas">
+        <imvert:schemas>
+            <xsl:sequence select="imf:create-info-element('imvert:exporter',$imvert-document/imvert:packages/imvert:exporter)"/>
+            <xsl:sequence select="imf:create-info-element('imvert:schema-exported',$imvert-document/imvert:packages/imvert:exported)"/>
+            <xsl:sequence select="imf:create-info-element('imvert:schema-filter-version',imf:get-svn-id-info($imvert-document/imvert:packages/imvert:filters/imvert:filter/imvert:version))"/>
+            <xsl:sequence select="imf:create-info-element('imvert:latest-svn-revision',concat($char-dollar,'Id',$char-dollar))"/>
+            
+            <!-- Schemas for external packages are not generated, but added to the release manually. -->
+            <xsl:apply-templates select="$imvert-document/imvert:packages/imvert:package[not(imvert:name = $external-schema-names)]"/>
+            
+            <!-- 
+                Do we need to reference external schema's? 
+                If so, a reference is made to the name of the external schema.
+            -->
+            <xsl:variable name="externals" select="$imvert-document//imvert:type-package[.=$external-schema-names]"/>
+            <xsl:for-each-group select="$externals" group-by=".">
+                <xsl:for-each select="current-group()[1]"><!-- singleton imvert:type-package element--> 
+                    <xsl:variable name="external-package" select="imf:get-construct-by-id(../imvert:type-package-id)"/>
+                    <imvert:schema>
+                        <xsl:sequence select="imf:create-info-element('imvert:name',$external-package/imvert:name)"/>
+                        <xsl:sequence select="imf:create-info-element('imvert:prefix',$external-package/imvert:short-name)"/>
+                        <xsl:sequence select="imf:create-info-element('imvert:namespace',$external-package/imvert:namespace)"/>
+                        <xsl:choose>
+                            <xsl:when test="imf:boolean($external-schemas-reference-by-url)">
+                                <xsl:comment>Referenced by URL</xsl:comment>
+                                <xsl:sequence select="imf:create-info-element('imvert:result-file-subpath',$external-package/imvert:location)"/>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:comment>Referenced by local path</xsl:comment>
+                                <xsl:variable name="schema-subpath" select="imf:get-xsd-filesubpath($external-package)"/>
+                                <xsl:variable name="file-fullpath" select="imf:get-xsd-filefullpath($external-package)"/>
+                                <xsl:sequence select="imf:create-info-element('imvert:result-file-subpath',$schema-subpath)"/>
+                                <xsl:sequence select="imf:create-info-element('imvert:result-file-fullpath',$file-fullpath)"/>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </imvert:schema>
+                </xsl:for-each>
+            </xsl:for-each-group>
+            <!-- add an external package that is a sentinel if not yet added -->
+            <xsl:for-each select="$imvert-document/imvert:packages/imvert:package[imf:boolean(imvert:sentinel) and not(imvert:name = $externals)]">
+                <xsl:variable name="external-package" select="."/>
+                <imvert:schema>
+                    <xsl:sequence select="imf:create-info-element('imvert:name',$external-package/imvert:name)"/>
+                    <xsl:sequence select="imf:create-info-element('imvert:prefix',$external-package/imvert:short-name)"/>
+                    <xsl:sequence select="imf:create-info-element('imvert:namespace',$external-package/imvert:namespace)"/>
+                    <xsl:choose>
+                        <xsl:when test="imf:boolean($external-schemas-reference-by-url)">
+                            <xsl:comment>Referenced by URL</xsl:comment>
+                            <xsl:sequence select="imf:create-info-element('imvert:result-file-subpath',$external-package/imvert:location)"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:comment>Referenced by local path</xsl:comment>
+                            <xsl:variable name="schema-subpath" select="imf:get-xsd-filesubpath($external-package)"/>
+                            <xsl:variable name="file-fullpath" select="imf:get-xsd-filefullpath($external-package)"/>
+                            <xsl:sequence select="imf:create-info-element('imvert:result-file-subpath',$schema-subpath)"/>
+                            <xsl:sequence select="imf:create-info-element('imvert:result-file-fullpath',$file-fullpath)"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </imvert:schema>
+            </xsl:for-each>
+        </imvert:schemas>
+    </xsl:function>
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     <xsl:function name="imf:create-datatype-property" as="node()*">
         <xsl:param name="this" as="node()"/>
         <xsl:param name="primitive-type" as="xs:string"/><!-- een xs:* qname -->
@@ -129,4 +238,393 @@
         <xsl:sequence select="$this/imvert:fraction-digits"/>
     </xsl:function>
     
-</xsl:stylesheet>
\ No newline at end of file
+    <!-- 
+        get a type name based on the type specified, that is suited for XSD 
+        
+        The type may be something like:
+        
+        Class1
+        scalar-string
+    
+        The package name is always specified but is irrelevant for scalars.
+    -->
+    <xsl:function name="imf:get-type" as="xs:string">
+        <xsl:param name="uml-type" as="xs:string"/> 
+        <xsl:param name="package-name" as="xs:string?"/> 
+        
+        <!-- check if the package is external -->
+        <xsl:variable name="external-package" select="$external-schemas[imvert:name = $package-name]"/>
+        
+        <xsl:variable name="defining-class" select="imf:get-class($uml-type,$package-name)"/>
+        <xsl:variable name="defining-package" select="$defining-class/.."/>
+        
+        <xsl:choose>
+            <xsl:when test="contains($uml-type,':')"><!-- TODO bepalen hoe het komt dat qualified names als type worden meegeleverd -->
+                <xsl:value-of select="$uml-type"/>
+            </xsl:when>
+            <xsl:when test="exists($external-package)">
+                <xsl:value-of select="concat($external-package/imvert:short-name,':',$uml-type)"/>
+            </xsl:when>
+            <xsl:when test="$package-name and empty($defining-package)">
+                <!-- this is a class that is not known. This is the case for nilreasons on scalar types, we need to create a class for that. -->  
+                <xsl:variable name="short-name" select="$document-packages[imvert:name = $package-name]/imvert:short-name"/>
+                <xsl:value-of select="concat($short-name,':',$uml-type)"/>
+            </xsl:when>
+            <xsl:otherwise>
+                
+                <xsl:variable name="primitive" select="$defining-class/imvert:primitive"/> <!-- e.g. BOOLEAN -->
+                
+                <xsl:variable name="uml-type-name" select="if (contains($uml-type,':')) then substring-after($uml-type,':') else $uml-type"/>
+                <xsl:variable name="primitive-type" select="substring-after($uml-type-name,'http://schema.omg.org/spec/UML/2.1/uml.xml#')"/>
+                
+                <xsl:variable name="base-type" select="
+                    if ($primitive)
+                    then $primitive
+                    else
+                    if ($primitive-type) 
+                    then $primitive-type 
+                    else 
+                    if (not($package-name) or imf:is-system-package($package-name)) 
+                    then $uml-type-name 
+                    else ()"/>
+                
+                <xsl:variable name="scalar" select="$all-scalars[@id=$base-type][last()]"/>
+                
+                <xsl:choose>
+                    <xsl:when test="$base-type"> 
+                        <xsl:variable name="xs-type" select="$scalar/type-map[@formal-lang='xs']"/>
+                        <xsl:choose>
+                            <xsl:when test="exists($scalar) and starts-with($xs-type,'#')">
+                                <xsl:value-of select="$xs-type"/>
+                            </xsl:when> 
+                            <xsl:when test="exists($scalar)">
+                                <xsl:value-of select="concat('xs:', $xs-type)"/>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:value-of select="'xs:string'"/>
+                                <xsl:sequence select="imf:msg('ERROR', 'Unknown native type: [1]', $base-type)"/>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="concat($defining-package/imvert:short-name,':',$uml-type-name)"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+                
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:function>
+
+    <xsl:function name="imf:create-attribute-property" as="item()*">
+        <xsl:param name="this" as="node()"/>
+        
+        <xsl:variable name="voidable" select="$this/imvert:stereotype/@id = ('stereotype-name-voidable')"/>
+        <xsl:variable name="type" select="imf:get-type($this/imvert:type-name,$this/imvert:type-package)"/>
+        <xs:attribute>
+            <xsl:attribute name="name" select="$this/imvert:name"/>
+            <xsl:attribute name="use" select="if ($this/imvert:min-occurs='0') then 'optional' else 'required'"/>
+            <xsl:attribute name="type" select="$type"/>
+            <xsl:sequence select="imf:get-annotation($this)"/>
+        </xs:attribute>
+    </xsl:function>
+    
+    <xsl:function name="imf:create-doc-element" as="node()*">
+        <xsl:param name="element-name" as="xs:string"/>
+        <xsl:param name="namespace" as="xs:string"/>
+        <xsl:param name="value" as="xs:string*"/>
+        <xsl:for-each select="$value[normalize-space(.)]">
+            <xsl:element name="{$element-name}">
+                <xsl:attribute name="source" select="$namespace"/>
+                <xsl:value-of select="."/>
+            </xsl:element>
+        </xsl:for-each>
+    </xsl:function>
+    
+    <xsl:function name="imf:create-info-element" as="node()*">
+        <xsl:param name="element-name" as="xs:string"/>
+        <xsl:param name="value" as="xs:string*"/>
+        <xsl:for-each select="$value">
+            <xsl:element name="{$element-name}">
+                <xsl:value-of select="."/>
+            </xsl:element>
+        </xsl:for-each>
+    </xsl:function>
+
+    <xsl:function name="imf:create-fixtype-property">
+        <xsl:param name="scalar-type" as="xs:string"/>
+        
+        <xsl:variable name="scalar" select="$all-scalars[@id = $scalar-type][last()]"/>
+        <xsl:variable name="scalar-construct-pattern" select="$scalar/type-modifier/pattern[@lang=$language]"/>
+        <xsl:variable name="scalar-construct-union" select="$scalar/type-modifier/type-map"/>
+        
+        <xsl:choose>
+            <xsl:when test="exists($scalar-construct-pattern)">
+                <xs:restriction base="xs:string">
+                    <xs:pattern value="{$scalar-construct-pattern}"/>
+                </xs:restriction>
+            </xsl:when>
+            <xsl:when test="exists($scalar-construct-union)">
+                <xs:union memberTypes="{for $t in $scalar-construct-union return concat('xs:', $t)}"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:sequence select="imf:msg('ERROR','Cannot create fixtype property')"/>
+            </xsl:otherwise>
+        </xsl:choose>
+        
+    </xsl:function>
+    
+    <xsl:function name="imf:create-nilreason">
+        <xsl:param name="is-conceptual-hasnilreason"/><!-- IM-477 -->
+        <xsl:if test="not($is-conceptual-hasnilreason)">
+            <xs:attribute name="nilReason" type="xs:string" use="optional"/>
+        </xsl:if>
+    </xsl:function>
+
+    <xsl:function name="imf:create-nonempty-constraint" as="item()*">
+        <xsl:param name="type" as="xs:string?"/>
+        <xsl:if test="$type=('scalar-string', 'scalar-uri') or not($type) and imf:boolean($strings-nonempty)">
+            <xs:pattern value="\S.*"/> <!-- Note: do not use xs:minLength as this allows for a single space -->
+        </xsl:if>
+    </xsl:function>
+ 
+    <xsl:function name="imf:create-scalar-property">
+        <xsl:param name="this"/>
+        
+        <xsl:variable name="scalar-type" select="$this/imvert:type-name"/>
+        
+        <xsl:variable name="scalar" select="$all-scalars[@id = $scalar-type][last()]"/>
+        <xsl:variable name="scalar-construct-pattern" select="$scalar/type-modifier/pattern[@lang=$language]"/>
+        <xsl:variable name="scalar-construct-union" select="$scalar/type-modifier/type-map"/>
+        
+        <xsl:variable name="type-construct">
+            <xsl:choose>
+                <xsl:when test="exists($scalar-construct-pattern)">
+                    <xs:restriction base="xs:string">
+                        <xs:pattern value="{$scalar-construct-pattern}"/>
+                    </xs:restriction>
+                </xsl:when>
+                <xsl:when test="exists($scalar-construct-union)">
+                    <xs:union memberTypes="{for $t in $scalar-construct-union return concat('xs:', $t)}"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:sequence select="imf:msg('ERROR','Cannot create scalar type property')"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        
+        <xsl:sequence select="$type-construct"/>
+        
+    </xsl:function>
+    
+    <xsl:function name="imf:get-annotation" as="node()?">
+        <xsl:param name="this" as="node()"/>
+        <xsl:sequence select="imf:get-annotation($this,(),())"/>
+    </xsl:function>
+    <xsl:function name="imf:get-annotation" as="node()?">
+        <xsl:param name="this" as="node()"/>
+        <xsl:param name="added-documentation" as="node()*"/>
+        <xsl:param name="added-appinfo" as="node()*"/>
+        <xsl:variable name="documentation" select="($added-documentation, imf:get-documentation($this))"/>
+        <xsl:if test="$added-appinfo or $documentation">
+            <xs:annotation>
+                <xsl:sequence select="$added-appinfo"/>
+                <xsl:sequence select="$documentation"/>
+            </xs:annotation>
+        </xsl:if>
+    </xsl:function>
+    
+    <xsl:function name="imf:get-appinfo-location" as="node()*">
+        <xsl:param name="this" as="node()"/>
+        <xsl:sequence select="imf:create-doc-element('xs:appinfo','http://www.imvertor.org/data-info/uri',imf:get-data-location($this))"/>
+    </xsl:function>
+    
+    <!-- return the class that defines the type of the attribute or association passed. --> 
+    <xsl:function name="imf:get-defining-class" as="node()?">
+        <xsl:param name="this" as="node()"/>
+        
+        <!-- overrule name based searches, must be ID based.
+            <xsl:sequence select="$document-packages[imvert:name=$this/imvert:type-package]/imvert:class[imvert:name=$this/imvert:type-name]"/> 
+        --> 
+        <xsl:sequence select="$document-classes[imvert:id=$this/imvert:type-id]"/> 
+        
+    </xsl:function>
+    
+    <xsl:function name="imf:get-id-attribute" as="element(imvert:attribute)?">
+        <xsl:param name="class" as="element(imvert:class)"/>
+        <xsl:sequence select="$class/imvert:attributes/imvert:attribute[imf:boolean(imvert:is-id)]"/>
+    </xsl:function>
+    
+    <!-- 
+        Return this class and all classes that are substitutable for this class, that are also linkable (and therefore a reference element must be created). 
+        The class passed as rootclass may be abstract and still be linkable; linkable substitution classes must be concrete.
+   
+        This set also includes classes that realize this class in a static way.
+        These classes do not inherit any properties of the realizes class, but can take its place. 
+    -->
+    <xsl:function name="imf:get-linkable-subclasses-or-self" as="node()*">
+        <xsl:param name="rootclass" as="node()"/>
+        <xsl:sequence select="imf:get-substitutable-subclasses($rootclass,true())[imf:is-linkable(.)]"/>
+    </xsl:function>
+    
+    <xsl:function name="imf:get-qname" as="xs:string">
+        <xsl:param name="class" as="node()"/>
+        <xsl:value-of select="concat($class/parent::imvert:package/imvert:short-name,':',$class/imvert:name)"/>
+    </xsl:function>
+    
+    <!-- return all associations to this class -->
+    <xsl:function name="imf:get-references">
+        <xsl:param name="class" as="element()"/>
+        <xsl:variable name="id" select="$class/imvert:id"/>
+        <xsl:sequence select="for $a in $document-classes//imvert:association return if ($a/imvert:type-id = $id) then $a else ()"/>
+    </xsl:function>
+    
+    <!-- 
+        return the release number of the Model and therefore the XSD to be generated 
+    -->
+    <xsl:function name="imf:get-release" as="xs:string?">
+        <xsl:param name="this" as="node()"/>
+        <!-- 
+            Assume release of supplier, unless release specified.
+        -->
+        <xsl:variable name="release" select="$this/imvert:release"/>
+        <xsl:choose>
+            <xsl:when test="exists($release)">
+                <xsl:value-of select="$release"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:sequence select="imf:msg('ERROR', 'No release found for package: [1] ([2])',($this/imvert:name,$this/imvert:namespace))"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:function>
+    
+    <xsl:function name="imf:get-restriction-basetype-name" as="xs:string">
+        <xsl:param name="this" as="node()"/> <!-- any attribute/association node. -->
+        <xsl:value-of select="concat('Basetype_',$this/ancestor::imvert:class/imvert:name,'_',$this/imvert:name)"/>
+    </xsl:function>
+    
+    <xsl:function name="imf:get-schema-info" as="node()*">
+        <xsl:param name="this" as="node()"/>
+        <xsl:sequence select="imf:create-doc-element('xs:documentation','http://www.imvertor.org/schema-info/file-location',imf:get-xsd-filesubpath($this))"/>
+        <xsl:sequence select="imf:create-doc-element('xs:documentation','http://www.imvertor.org/schema-info/conversion',imf:get-config-parameter('pretext-encoding'))"/>
+    </xsl:function>
+    
+    <!-- 
+        Return all classes that can be substituted for the class passed, and self. 
+        Do not return abstract classes. 
+    -->
+    <xsl:function name="imf:get-substitutable-subclasses" as="element()*">
+        <xsl:param name="rootclass" as="element()"/>
+        <xsl:param name="include-self" as="xs:boolean"/>
+        <xsl:variable name="substitution-classes" select="imf:get-substitution-classes($rootclass)"/>
+        <xsl:sequence select="if ($include-self) then $rootclass else ()"/>
+        <xsl:sequence select="$substitution-classes"/>
+    </xsl:function>
+    
+    <!-- 
+        Return all classes that can be substituted for the class passed, but not self.
+        Also returns abstract classes.
+    -->
+    <xsl:function name="imf:get-substitution-classes" as="node()*">
+        <xsl:param name="class" as="node()"/>
+        <xsl:variable name="class-id" select="$class/imvert:id"/>
+        <xsl:for-each select="$document-classes[imvert:substitution/imvert:supplier-id=$class-id or imvert:supertype/imvert:type-id=$class-id]">
+            <xsl:sequence select="."/>
+            <xsl:sequence select="imf:get-substitution-classes(.)"/>
+        </xsl:for-each>
+    </xsl:function>
+    
+    <!-- 
+        return the full XSD file path of the package passed.
+    -->
+    <xsl:function name="imf:get-xsd-filefullpath" as="xs:string">
+        <xsl:param name="this" as="element()"/>
+        <xsl:variable name="schema-subpath" select="imf:get-xsd-filesubpath($this)"/>
+        <xsl:value-of select="concat($work-xsd-folder-url,'/',$schema-subpath)"/>
+    </xsl:function>
+    
+    <!-- 
+        Get the path of the xsd file. This is the part of the namespace that is behind the repository-url.
+        Example:
+        root namespace (alias) is: 
+            http://www.imvertor.org/schema
+        URL is: 
+            http://www.imvertor.org/schema/my/schema/
+        and release is: 
+            20120307
+        returns: 
+            /my/schema/v20120307
+    -->    
+    <xsl:function name="imf:get-xsd-filefolder" as="xs:string">
+        <xsl:param name="this" as="node()"/> <!-- an imvert:package -->
+        <xsl:variable name="localpath" select="substring-after($this/imvert:namespace,concat($base-namespace,'/'))"/>
+        <xsl:value-of select="concat(if (normalize-space($localpath)) then $localpath else 'unknown','/v',$this/imvert:release)"/>
+    </xsl:function>
+    
+    <!--
+        Return the file name of the XSD to be generated.
+    -->
+    <xsl:function name="imf:get-xsd-filename" as="xs:string">
+        <xsl:param name="this" as="node()"/>
+        
+        <xsl:sequence select="imf:set-config-string('work','xsd-domain',$this/imvert:name,true())"/>
+        <xsl:sequence select="imf:set-config-string('work','xsd-version',replace($this/imvert:version,'\.','_'),true())"/>
+        <xsl:sequence select="imf:set-config-string('work','xsd-application',$application-package-name,true())"/>
+        
+        <xsl:value-of select="imf:merge-parms(imf:get-config-string('cli','xsdfilename'))"/>
+    </xsl:function>
+    
+    <!-- 
+        Return the complete subpath and filename of the xsd file to be generated.
+        Sample: xsd-folder/subpath/my/schema/MyappMypackage_1_0_3.xsd
+        
+        xsd-folder/subpath is provided as a cli parameter cli/xsdsubpath
+    -->
+    <xsl:function name="imf:get-xsd-filesubpath" as="xs:string">
+        <xsl:param name="this" as="node()"/> <!-- a package -->
+        <xsl:choose>
+            <xsl:when test="$this/imvert:stereotype/@id = (('stereotype-name-external-package','stereotype-name-system-package'))"> 
+                <!-- 
+                    the package is external (GML, Xlink or the like). 
+                    Place reference to that external pack. 
+                    The package is copied alongside the target application package.
+                --> 
+                <xsl:value-of select="imf:get-uri-parts($this/imvert:location)/path"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="concat($xsd-subpath, '/', imf:get-xsd-filefolder($this), '/', encode-for-uri(imf:get-xsd-filename($this)))"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:function>
+    
+    <xsl:function name="imf:is-abstract">
+        <xsl:param name="class"/>
+        <xsl:sequence select="imf:boolean($class/imvert:abstract)"/>        
+    </xsl:function>
+    
+    <xsl:function name="imf:is-restriction" as="xs:boolean">
+        <xsl:param name="this" as="node()"/>
+        <xsl:sequence select="exists((imf:get-facet-pattern($this), imf:get-facet-max-length($this), imf:get-facet-total-digits($this), imf:get-facet-fraction-digits($this)))"/>
+    </xsl:function>
+    
+    <xsl:function name="imf:is-system-package" as="xs:boolean">
+        <xsl:param name="package-name" as="xs:string"/>
+        <xsl:copy-of select="substring-before($package-name,'_') = ('EA','Info')"/>
+    </xsl:function>
+    
+    <!-- 
+        Return the members of sequence set1 that are not in set2. 
+        The comparison is based on the string value of the members. 
+    -->
+    <xsl:function name="imf:sequence-except-by-string-value" as="item()*">
+        <xsl:param name="set1" as="item()*"/>
+        <xsl:param name="set2" as="item()*"/>
+        <xsl:for-each select="$set1">
+            <xsl:variable name="stringvalue" select="xs:string(.)"/>
+            <xsl:if test="not($set2 = $stringvalue)">
+                <xsl:sequence select="."/>
+            </xsl:if>
+        </xsl:for-each>
+    </xsl:function>
+    
+</xsl:stylesheet>
+
diff --git a/src/main/resources/xsl/common/Imvert-common-debug.xsl b/src/main/resources/xsl/common/Imvert-common-debug.xsl
index 61613bcaa..0b5a71c42 100644
--- a/src/main/resources/xsl/common/Imvert-common-debug.xsl
+++ b/src/main/resources/xsl/common/Imvert-common-debug.xsl
@@ -71,7 +71,7 @@
     </xsl:function>
     
     <xsl:function name="imf:create-xml-debug-comment" as="comment()?">
-        <xsl:param name="info-node" as="item()?"/>
+        <xsl:param name="info-node" as="node()?"/>
         <xsl:param name="text" as="xs:string"/>
         <xsl:param name="parms" as="item()*"/>
         <xsl:if test="$debugging">
@@ -80,7 +80,7 @@
     </xsl:function>
     
     <xsl:function name="imf:create-xml-debug-comment" as="comment()?">
-        <xsl:param name="info-node" as="item()?"/>
+        <xsl:param name="info-node" as="node()?"/>
         <xsl:param name="text" as="xs:string"/>
         <xsl:sequence select="imf:create-xml-debug-comment($info-node,$text,())"/>
     </xsl:function>
diff --git a/src/main/resources/xsl/common/Imvert-common.xsl b/src/main/resources/xsl/common/Imvert-common.xsl
index 4c824271b..fc9738136 100644
--- a/src/main/resources/xsl/common/Imvert-common.xsl
+++ b/src/main/resources/xsl/common/Imvert-common.xsl
@@ -129,7 +129,7 @@
          there are no assciations that has this class as the target (lonely), and
          no supertype is linkable (sad).
          
-         Also, we assume that a class is not linkable when it has no identifier (anonymous)
+         Also, we assume that a class is not linkable when it has no "identifier" attribute (UML is-id) (anonymous)
          or when the identifier is nillable/voidable (id-voidable).
     -->
     <xsl:function name="imf:is-linkable" as="xs:boolean">
@@ -148,6 +148,15 @@
         <xsl:variable name="is-not-id-voidable" select="not($id-attribute-inherited/imvert:stereotype/@id = ('stereotype-name-voidable'))"/>
         <xsl:variable name="is-not-id-tv-voidable" select="if ($id-attribute-inherited) then not(imf:boolean(imf:get-tagged-value($id-attribute-inherited,'##CFG-TV-VOIDABLE'))) else true()"/>
         
+        <?debug
+        <xsl:sequence select="dlogger:save('$L ' || imf:get-display-name($class),
+            imf:insert-fragments-by-index(
+                '$is-objecttype [1] and ($is-not-static [2] or $is-not-lonely [3] or $is-not-sad [4]) and $is-not-anonymous [5] and ($is-not-id-voidable [6] and $is-not-id-tv-voidable [7])',
+                ($is-objecttype,$is-not-static,$is-not-lonely,$is-not-sad,$is-not-anonymous,$is-not-id-voidable,$is-not-id-tv-voidable)
+             )
+         )"/>
+        debug?>
+        
         <xsl:sequence select="$is-objecttype and ($is-not-static or $is-not-lonely or $is-not-sad) and $is-not-anonymous and ($is-not-id-voidable and $is-not-id-tv-voidable)"/>
     </xsl:function>