From e1ecd0628249b244de01c6f8259f36deeb7f5681 Mon Sep 17 00:00:00 2001
From: Mark Iantorno <markiantorno@gmail.com>
Date: Mon, 19 Oct 2020 16:39:22 -0400
Subject: [PATCH] Validator 2 (#366)

* changes to accomodate front end gui for validator wrapper

* removing debug code
---
 .../validation/ValidationMessage.java         |  70 +++---
 org.hl7.fhir.validation.cli/pom.xml           |   2 +-
 .../hl7/fhir/validation/ValidationEngine.java |  68 +-----
 .../{Validator.java => ValidatorCli.java}     |  27 +--
 .../fhir/validation/cli/RestEndpoints.java    |  30 ---
 .../hl7/fhir/validation/cli/ValidatorGui.java |  63 ------
 .../cli/controller/CliContextController.java  |  32 ---
 .../cli/controller/UIController.java          |  13 --
 .../cli/controller/ValidationController.java  |  39 ----
 .../services/StandAloneValidatorFetcher.java  |   4 +-
 .../cli/services/ValidationService.java       |  36 ++-
 .../validation/cli/utils/AsteriskFilter.java  |   2 +-
 .../hl7/fhir/validation/cli/utils/Common.java |   2 +-
 .../fhir/validation/cli/utils/Display.java    |  14 +-
 .../fhir/validation/cli/utils/EngineMode.java |  10 +-
 .../hl7/fhir/validation/cli/utils/Params.java |   8 +-
 .../validation/cli/utils/ProfileLoader.java   |  43 ++++
 .../cli/utils/QuestionnaireMode.java          |   6 +-
 .../validation/cli/utils/SchemaValidator.java |  33 +++
 .../cli/utils/VersionSourceInformation.java   |   2 +-
 .../{ => cli/utils}/VersionUtil.java          |  58 ++---
 .../resources/public/assets/fhir-logo-www.png | Bin 13319 -> 0 bytes
 .../public/assets/json-svgrepo-com.svg        |  72 ------
 .../public/assets/xml-svgrepo-com.svg         |  51 -----
 .../src/main/resources/public/cliwindow.html  |  56 -----
 .../main/resources/public/enums/EngineMode.js |  10 -
 .../main/resources/public/enums/FhirFormat.js |  17 --
 .../resources/public/enums/IssueSeverity.js   |  14 --
 .../src/main/resources/public/enums/Locale.js |  30 ---
 .../resources/public/enums/SnomedVersion.js   |  38 ----
 .../src/main/resources/public/index.html      |  99 ---------
 .../src/main/resources/public/main.js         | 206 ------------------
 .../main/resources/public/model/CliContext.js |  34 ---
 .../main/resources/public/model/FileInfo.js   |  13 --
 .../resources/public/model/ValidationIssue.js |   6 -
 .../public/model/ValidationOutcome.js         |   8 -
 .../public/model/ValidationRequest.js         |   8 -
 .../public/model/ValidationResponse.js        |   7 -
 .../src/main/resources/public/style.css       |  94 --------
 .../validation/tests/CDAValidationTest.java   |   4 +-
 .../validation/tests/TransformationTests.java |   4 +-
 41 files changed, 202 insertions(+), 1131 deletions(-)
 rename org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/{Validator.java => ValidatorCli.java} (89%)
 delete mode 100644 org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/RestEndpoints.java
 delete mode 100644 org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/ValidatorGui.java
 delete mode 100644 org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/controller/CliContextController.java
 delete mode 100644 org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/controller/UIController.java
 delete mode 100644 org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/controller/ValidationController.java
 create mode 100644 org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/ProfileLoader.java
 create mode 100644 org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/SchemaValidator.java
 rename org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/{ => cli/utils}/VersionUtil.java (98%)
 delete mode 100644 org.hl7.fhir.validation/src/main/resources/public/assets/fhir-logo-www.png
 delete mode 100644 org.hl7.fhir.validation/src/main/resources/public/assets/json-svgrepo-com.svg
 delete mode 100644 org.hl7.fhir.validation/src/main/resources/public/assets/xml-svgrepo-com.svg
 delete mode 100644 org.hl7.fhir.validation/src/main/resources/public/cliwindow.html
 delete mode 100644 org.hl7.fhir.validation/src/main/resources/public/enums/EngineMode.js
 delete mode 100644 org.hl7.fhir.validation/src/main/resources/public/enums/FhirFormat.js
 delete mode 100644 org.hl7.fhir.validation/src/main/resources/public/enums/IssueSeverity.js
 delete mode 100644 org.hl7.fhir.validation/src/main/resources/public/enums/Locale.js
 delete mode 100644 org.hl7.fhir.validation/src/main/resources/public/enums/SnomedVersion.js
 delete mode 100644 org.hl7.fhir.validation/src/main/resources/public/index.html
 delete mode 100644 org.hl7.fhir.validation/src/main/resources/public/main.js
 delete mode 100644 org.hl7.fhir.validation/src/main/resources/public/model/CliContext.js
 delete mode 100644 org.hl7.fhir.validation/src/main/resources/public/model/FileInfo.js
 delete mode 100644 org.hl7.fhir.validation/src/main/resources/public/model/ValidationIssue.js
 delete mode 100644 org.hl7.fhir.validation/src/main/resources/public/model/ValidationOutcome.js
 delete mode 100644 org.hl7.fhir.validation/src/main/resources/public/model/ValidationRequest.js
 delete mode 100644 org.hl7.fhir.validation/src/main/resources/public/model/ValidationResponse.js
 delete mode 100644 org.hl7.fhir.validation/src/main/resources/public/style.css

diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/validation/ValidationMessage.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/validation/ValidationMessage.java
index f6348978c..74990d315 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/validation/ValidationMessage.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/validation/ValidationMessage.java
@@ -1,33 +1,33 @@
 package org.hl7.fhir.utilities.validation;
 
-/*
-  Copyright (c) 2011+, HL7, Inc.
-  All rights reserved.
-  
-  Redistribution and use in source and binary forms, with or without modification, 
-  are permitted provided that the following conditions are met:
-    
-   * Redistributions of source code must retain the above copyright notice, this 
-     list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above copyright notice, 
-     this list of conditions and the following disclaimer in the documentation 
-     and/or other materials provided with the distribution.
-   * Neither the name of HL7 nor the names of its contributors may be used to 
-     endorse or promote products derived from this software without specific 
-     prior written permission.
-  
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
-  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
-  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
-  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-  POSSIBILITY OF SUCH DAMAGE.
-  
- */
+/*
+  Copyright (c) 2011+, HL7, Inc.
+  All rights reserved.
+  
+  Redistribution and use in source and binary forms, with or without modification, 
+  are permitted provided that the following conditions are met:
+    
+   * Redistributions of source code must retain the above copyright notice, this 
+     list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above copyright notice, 
+     this list of conditions and the following disclaimer in the documentation 
+     and/or other materials provided with the distribution.
+   * Neither the name of HL7 nor the names of its contributors may be used to 
+     endorse or promote products derived from this software without specific 
+     prior written permission.
+  
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
+  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+  POSSIBILITY OF SUCH DAMAGE.
+  
+ */
 
 
 
@@ -581,20 +581,6 @@ public class ValidationMessage implements Comparator<ValidationMessage>, Compara
       throw new Error("A type must be provided");
   }
 
-//  public ValidationMessage(Source source, IssueType type, String message, IssueSeverity level) {
-//    super();
-//    this.line = -1;
-//    this.col = -1;
-//    if (message == null)
-//      throw new Error("message is null");
-//    this.message = message;
-//    this.level = level;
-//    this.source = source;
-//    this.type = type;
-//    if (type == null)
-//      throw new Error("A type must be provided");
-//  }
-
   private IssueSeverity determineLevel(String path) {
     if (isGrandfathered(path))
       return IssueSeverity.WARNING;
diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml
index aa6635af8..8362c8676 100644
--- a/org.hl7.fhir.validation.cli/pom.xml
+++ b/org.hl7.fhir.validation.cli/pom.xml
@@ -88,7 +88,7 @@
                     <archive>
                         <manifest>
                             <addClasspath>true</addClasspath>
-                            <mainClass>org.hl7.fhir.validation.Validator</mainClass>
+                            <mainClass>org.hl7.fhir.validation.ValidatorCli</mainClass>
                         </manifest>
                     </archive>
                 </configuration>
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java
index 3d0dea8c8..648f57520 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java
@@ -109,10 +109,7 @@ import org.hl7.fhir.utilities.xhtml.XhtmlComposer;
 import org.hl7.fhir.validation.BaseValidator.ValidationControl;
 import org.hl7.fhir.validation.cli.model.ScanOutputItem;
 import org.hl7.fhir.validation.cli.services.StandAloneValidatorFetcher.IPackageInstaller;
-import org.hl7.fhir.validation.cli.utils.AsteriskFilter;
-import org.hl7.fhir.validation.cli.utils.Common;
-import org.hl7.fhir.validation.cli.utils.QuestionnaireMode;
-import org.hl7.fhir.validation.cli.utils.VersionSourceInformation;
+import org.hl7.fhir.validation.cli.utils.*;
 import org.hl7.fhir.validation.instance.InstanceValidator;
 import org.xml.sax.SAXException;
 
@@ -402,35 +399,6 @@ public class ValidationEngine implements IValidatorResourceFetcher, IPackageInst
     return ep;
   }
 
-  private byte[] loadProfileSource(String src) throws FHIRException, FileNotFoundException, IOException {
-    if (Utilities.noString(src)) {
-      throw new FHIRException("Profile Source '" + src + "' could not be processed");
-    } else if (Common.isNetworkPath(src)) {
-      return loadProfileFromUrl(src);
-    } else if (new File(src).exists()) {
-      return loadProfileFromFile(src);
-    } else {
-      throw new FHIRException("Definitions Source '"+src+"' could not be processed");
-    }
-  }
-
-  private byte[] loadProfileFromUrl(String src) throws FHIRException {
-    try {
-      URL url = new URL(src+"?nocache=" + System.currentTimeMillis());
-      URLConnection c = url.openConnection();
-      return IOUtils.toByteArray(c.getInputStream());
-    } catch (Exception e) {
-      throw new FHIRException("Unable to find definitions at URL '"+src+"': "+e.getMessage(), e);
-  }
-    }
-
-  private byte[] loadProfileFromFile(String src) throws FileNotFoundException, IOException {
-    File f = new File(src);
-    if (f.isDirectory())
-      throw new IOException("You must provide a file name, not a directory name");
-    return TextFile.fileToBytes(src);
-  }
-
   /** explore should be true if we're trying to load an -ig parameter, and false if we're loading source
    * @throws IOException **/
 
@@ -907,7 +875,7 @@ public class ValidationEngine implements IValidatorResourceFetcher, IPackageInst
     if (context.hasResource(ImplementationGuide.class, src))
       return;
 
-    byte[] source = loadProfileSource(src);
+    byte[] source = ProfileLoader.loadProfileSource(src);
     FhirFormat fmt = FormatUtilities.determineFormat(source);
     Resource r = FormatUtilities.makeParser(fmt).parse(source);
     context.cacheResource(r);
@@ -1196,10 +1164,6 @@ public class ValidationEngine implements IValidatorResourceFetcher, IPackageInst
     return res;
   }
 
-  private Resource resolve(Reference reference) {
-    return null;
-  }
-
   private String getGlobal(ImplementationGuide ig, String rt) {
     for (ImplementationGuideGlobalComponent igg : ig.getGlobal()) {
       if (rt.equals(igg.getType()))
@@ -1316,15 +1280,11 @@ public class ValidationEngine implements IValidatorResourceFetcher, IPackageInst
     return messagesToOutcome(messages);
   }
 
+
   public OperationOutcome validate(String location, byte[] source, FhirFormat cntType, List<String> profiles) throws FHIRException, IOException, EOperationOutcome, SAXException {
     List<ValidationMessage> messages = new ArrayList<ValidationMessage>();
     if (doNative) {
-      if (cntType == FhirFormat.JSON)
-        validateJsonSchema(location, messages);
-      if (cntType == FhirFormat.XML)
-        validateXmlSchema(location, messages);
-      if (cntType == FhirFormat.TURTLE)
-        validateSHEX(location, messages);
+      SchemaValidator.validateSchema(location, cntType, messages);
     }
     InstanceValidator validator = getValidator();
     validator.validate(null, messages, new ByteArrayInputStream(source), cntType, asSdList(profiles));
@@ -1337,12 +1297,7 @@ public class ValidationEngine implements IValidatorResourceFetcher, IPackageInst
   public OperationOutcome validate(String location, byte[] source, FhirFormat cntType, List<String> profiles, IdStatus resourceIdRule, boolean anyExtensionsAllowed, BestPracticeWarningLevel bpWarnings, CheckDisplayOption displayOption) throws FHIRException, IOException, EOperationOutcome, SAXException {
     List<ValidationMessage> messages = new ArrayList<ValidationMessage>();
     if (doNative) {
-      if (cntType == FhirFormat.JSON)
-        validateJsonSchema(location, messages);
-      if (cntType == FhirFormat.XML)
-        validateXmlSchema(location, messages);
-      if (cntType == FhirFormat.TURTLE)
-        validateSHEX(location, messages);
+      SchemaValidator.validateSchema(location, cntType, messages);
     }
     InstanceValidator validator = getValidator();
     validator.setResourceIdRule(resourceIdRule);
@@ -1352,19 +1307,6 @@ public class ValidationEngine implements IValidatorResourceFetcher, IPackageInst
     return messagesToOutcome(messages);
   }
 
-
-  private void validateSHEX(String location, List<ValidationMessage> messages) {
-    messages.add(new ValidationMessage(Source.InstanceValidator, IssueType.INFORMATIONAL, location, "SHEX Validation is not done yet", IssueSeverity.INFORMATION));
-  }
-
-  private void validateXmlSchema(String location, List<ValidationMessage> messages) throws FileNotFoundException, IOException, SAXException {
-    messages.add(new ValidationMessage(Source.InstanceValidator, IssueType.INFORMATIONAL, location, "XML Schema Validation is not done yet", IssueSeverity.INFORMATION));
-  }
-
-  private void validateJsonSchema(String location, List<ValidationMessage> messages) {
-    messages.add(new ValidationMessage(Source.InstanceValidator, IssueType.INFORMATIONAL, location, "JSON Schema Validation is not done yet", IssueSeverity.INFORMATION));
-  }
-
   private List<ValidationMessage> filterMessages(List<ValidationMessage> messages) {
     List<ValidationMessage> filteredValidation = new ArrayList<ValidationMessage>();
     for (ValidationMessage e : messages) {
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/Validator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorCli.java
similarity index 89%
rename from org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/Validator.java
rename to org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorCli.java
index 521cb7cf1..45dd6f34b 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/Validator.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorCli.java
@@ -82,7 +82,7 @@ import java.io.File;
  *
  * @author Grahame
  */
-public class Validator {
+public class ValidatorCli {
 
   public static final String HTTP_PROXY_HOST = "http.proxyHost";
   public static final String HTTP_PROXY_PORT = "http.proxyPort";
@@ -140,7 +140,7 @@ public class Validator {
   private static void doLeftRightComparison(String[] args, CliContext cliContext, TimeTracker tt) throws Exception {
     Display.printCliArgumentsAndInfo(args);
     if (cliContext.getSv() == null) {
-      cliContext.setSv(determineVersion(cliContext));
+      cliContext.setSv(ValidationService.determineVersion(cliContext));
     }
     String v = VersionUtilities.getCurrentVersion(cliContext.getSv());
     String definitions = VersionUtilities.packageForVersion(v) + "#" + v;
@@ -150,7 +150,7 @@ public class Validator {
 
   private static void doValidation(TimeTracker tt, TimeTracker.Session tts, CliContext cliContext) throws Exception {
     if (cliContext.getSv() == null) {
-      cliContext.setSv(determineVersion(cliContext));
+      cliContext.setSv(ValidationService.determineVersion(cliContext));
     }
     System.out.println("Loading");
     // Comment this out because definitions filename doesn't necessarily contain version (and many not even be 14 characters long).
@@ -196,25 +196,4 @@ public class Validator {
     }
     System.out.println("Done. " + tt.report());
   }
-
-  public static String determineVersion(CliContext cliContext) throws Exception {
-    if (cliContext.getMode() != EngineMode.VALIDATION) {
-      return "current";
-    }
-    System.out.println("Scanning for versions (no -version parameter):");
-    VersionSourceInformation versions = ValidationService.scanForVersions(cliContext);
-    for (String s : versions.getReport()) {
-      System.out.println("  " + s);
-    }
-    if (versions.isEmpty()) {
-      System.out.println("-> Using Default version '" + VersionUtilities.CURRENT_VERSION + "'");
-      return "current";
-    }
-    if (versions.size() == 1) {
-      System.out.println("-> use version " + versions.version());
-      return versions.version();
-    }
-    throw new Exception("-> Multiple versions found. Specify a particular version using the -version parameter");
-  }
-
 }
\ No newline at end of file
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/RestEndpoints.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/RestEndpoints.java
deleted file mode 100644
index 8762f6177..000000000
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/RestEndpoints.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.hl7.fhir.validation.cli;
-
-import org.hl7.fhir.validation.ValidationEngine;
-import org.hl7.fhir.validation.cli.controller.CliContextController;
-import org.hl7.fhir.validation.cli.controller.UIController;
-import org.hl7.fhir.validation.cli.controller.ValidationController;
-import org.hl7.fhir.validation.cli.model.CliContext;
-
-import io.javalin.Javalin;
-
-public class RestEndpoints {
-
-  public UIController myUIController;
-  public CliContextController myCliContextController;
-  public ValidationController myValidationController;
-
-  public void initRestEndpoints(Javalin app, CliContext cliContext, ValidationEngine validationEngine) {
-
-    myUIController = new UIController();
-    myCliContextController = new CliContextController(cliContext);
-    myValidationController = new ValidationController(validationEngine);
-
-    app.get("/home", myUIController.renderLandingPage);
-
-    app.get("/context", myCliContextController::handleGetCurrentCliContext);
-    app.post("/context", myCliContextController::handleSetCurrentCliContext);
-
-    app.post("/validate", myValidationController::handleValidationRequest);
-  }
-}
\ No newline at end of file
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/ValidatorGui.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/ValidatorGui.java
deleted file mode 100644
index 4e190008f..000000000
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/ValidatorGui.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.hl7.fhir.validation.cli;
-
-import java.awt.Desktop;
-import java.net.URI;
-
-import org.hl7.fhir.utilities.VersionUtilities;
-import org.hl7.fhir.validation.ValidationEngine;
-import org.hl7.fhir.validation.cli.model.CliContext;
-import org.hl7.fhir.validation.cli.utils.Common;
-
-import io.javalin.Javalin;
-
-public class ValidatorGui {
-
-  private static final int GUI_FRONTEND_PORT = 8081;
-  private static final String PAGE_ADDRESS = "http://localhost:" + GUI_FRONTEND_PORT + "/home";
-  private static final String WEB_APP_FILE_LOCATION = "/public";
-  private static Javalin app;
-
-  private ValidatorGui(){}
-
-  /**
-   * N.B. this entry point, is only for testing. Please start from command line using the argument {@code -gui} for
-   * actual use.
-   */
-  public static void main(String[] args) throws Exception {
-    CliContext cliContext = new CliContext();
-    String v = Common.getVersion(args);
-    String definitions = VersionUtilities.packageForVersion(v) + "#" + v;
-    ValidationEngine validationEngine = Common.getValidationEngine(v, definitions, cliContext.getTxLog(), null);
-    start(new CliContext(), validationEngine, false);
-  }
-
-  public static int getPort() {
-    return GUI_FRONTEND_PORT;
-  }
-
-  public static void start(CliContext currentContext, ValidationEngine validationEngine, boolean bootBrowser) {
-    app = Javalin.create();
-    new RestEndpoints().initRestEndpoints(app, currentContext, validationEngine);
-    app.config.addStaticFiles(WEB_APP_FILE_LOCATION);
-    app.start(GUI_FRONTEND_PORT);
-    if (bootBrowser) {
-      openBrowser();
-    }
-  }
-
-  public static void openBrowser() {
-    if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
-      try {
-        Desktop.getDesktop().browse(new URI(PAGE_ADDRESS));
-      } catch (Exception e) {
-        System.out.println("Error opening web browser to validator GUI.\nYou can try to open the page manually at:: "
-          + PAGE_ADDRESS + "\nError:: " + e.getMessage());
-      }
-    }
-  }
-
-  public static void stop() {
-    app.stop();
-  }
-
-}
\ No newline at end of file
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/controller/CliContextController.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/controller/CliContextController.java
deleted file mode 100644
index cac9194ba..000000000
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/controller/CliContextController.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.hl7.fhir.validation.cli.controller;
-
-import org.apache.http.HttpStatus;
-import org.hl7.fhir.validation.cli.model.CliContext;
-import org.jetbrains.annotations.NotNull;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import io.javalin.http.Context;
-
-public class CliContextController {
-
-  private final String JSON_MIME_TYPE = "application/json";
-
-  private CliContext myCliContext;
-
-  public CliContextController(CliContext cliContext) {
-    this.myCliContext = cliContext;
-  }
-
-  public void handleGetCurrentCliContext(@NotNull Context ctx) throws JsonProcessingException {
-    ObjectMapper Obj = new ObjectMapper();
-    String jsonStr = Obj.writeValueAsString(myCliContext);
-    ctx.result(jsonStr).contentType(JSON_MIME_TYPE).status(HttpStatus.SC_OK);
-  }
-
-  public void handleSetCurrentCliContext(@NotNull Context ctx) {
-    myCliContext = ctx.bodyAsClass(CliContext.class);
-    ctx.status(HttpStatus.SC_OK);
-  }
-}
\ No newline at end of file
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/controller/UIController.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/controller/UIController.java
deleted file mode 100644
index 6354dd368..000000000
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/controller/UIController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.hl7.fhir.validation.cli.controller;
-
-import io.javalin.http.Handler;
-
-public class UIController {
-
-  public UIController() {}
-
-  public Handler renderLandingPage = ctx -> {
-    ctx.render("/public/index.html");
-  };
-
-}
\ No newline at end of file
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/controller/ValidationController.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/controller/ValidationController.java
deleted file mode 100644
index 1edb0c9b0..000000000
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/controller/ValidationController.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.hl7.fhir.validation.cli.controller;
-
-import org.apache.http.HttpStatus;
-import org.hl7.fhir.validation.ValidationEngine;
-import org.hl7.fhir.validation.cli.model.ValidationRequest;
-import org.hl7.fhir.validation.cli.model.ValidationResponse;
-import org.hl7.fhir.validation.cli.services.ValidationService;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import io.javalin.http.Context;
-
-public class ValidationController {
-
-  private ValidationEngine myValidationEngine;
-
-  public ValidationController(ValidationEngine validationEngine) {
-    this.myValidationEngine = validationEngine;
-  }
-
-  public void handleValidationRequest(Context ctx) {
-    ValidationRequest request = ctx.bodyAsClass(ValidationRequest.class);
-    ValidationResponse response = null;
-    try {
-      response = ValidationService.validateSources(request, myValidationEngine);
-      ObjectMapper Obj = new ObjectMapper();
-      /*
-       * TODO
-       * Write file contents to temp files to pass to validator instead of creating our own endpoint.
-       * Create File => new temp file
-       * Use Option => DeleteOnShutdown
-       */
-      String jsonStr = Obj.writeValueAsString(response);
-      ctx.status(200).json(jsonStr);
-    } catch (Exception e) {
-      ctx.status(HttpStatus.SC_INTERNAL_SERVER_ERROR).result(e.getLocalizedMessage());
-    }
-  }
-}
\ No newline at end of file
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/services/StandAloneValidatorFetcher.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/services/StandAloneValidatorFetcher.java
index 6b40f1e31..904ec8dca 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/services/StandAloneValidatorFetcher.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/services/StandAloneValidatorFetcher.java
@@ -21,8 +21,8 @@ import org.hl7.fhir.utilities.npm.NpmPackage;
 public class StandAloneValidatorFetcher implements IValidatorResourceFetcher {
 
   public interface IPackageInstaller {
-    public boolean packageExists(String id, String ver) throws IOException, FHIRException;
-    public void loadPackage(String id, String ver) throws IOException, FHIRException;
+    boolean packageExists(String id, String ver) throws IOException, FHIRException;
+    void loadPackage(String id, String ver) throws IOException, FHIRException;
   }
 
   private BasePackageCacheManager pcm;
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/services/ValidationService.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/services/ValidationService.java
index 0004cd102..6d4aa8acc 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/services/ValidationService.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/services/ValidationService.java
@@ -24,22 +24,22 @@ import org.hl7.fhir.r5.utils.ToolingExtensions;
 import org.hl7.fhir.utilities.TextFile;
 import org.hl7.fhir.utilities.TimeTracker;
 import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.utilities.VersionUtilities;
 import org.hl7.fhir.utilities.validation.ValidationMessage;
 import org.hl7.fhir.validation.ValidationEngine;
 import org.hl7.fhir.validation.cli.model.*;
+import org.hl7.fhir.validation.cli.utils.EngineMode;
 import org.hl7.fhir.validation.cli.utils.VersionSourceInformation;
 
 public class ValidationService {
 
-  /*
-   * TEMPORARY METHOD
-   */
-  public static void validateFileInfo(FileInfo f) {
-    System.out.println("success");
-  }
+  public static ValidationResponse validateSources(ValidationRequest request) throws Exception {
+    if (request.getCliContext().getSv() == null) {
+      request.getCliContext().setSv(ValidationService.determineVersion(request.getCliContext()));
+    }
+    String definitions = VersionUtilities.packageForVersion(request.getCliContext().getSv()) + "#" + VersionUtilities.getCurrentVersion(request.getCliContext().getSv());
+    ValidationEngine validator = ValidationService.getValidator(request.getCliContext(), definitions, new TimeTracker());
 
-
-  public static ValidationResponse validateSources(ValidationRequest request, ValidationEngine validator) throws Exception {
     if (request.getCliContext().getProfiles().size() > 0) {
       System.out.println("  .. validate " + request.listSourceFiles() + " against " + request.getCliContext().getProfiles().toString());
     } else {
@@ -280,4 +280,24 @@ public class ValidationService {
     }
     return "  " + issue.getSeverity().getDisplay() + " @ " + loc + " : " + issue.getDetails().getText();
   }
+
+  public static String determineVersion(CliContext cliContext) throws Exception {
+    if (cliContext.getMode() != EngineMode.VALIDATION) {
+      return "current";
+    }
+    System.out.println("Scanning for versions (no -version parameter):");
+    VersionSourceInformation versions = ValidationService.scanForVersions(cliContext);
+    for (String s : versions.getReport()) {
+      System.out.println("  " + s);
+    }
+    if (versions.isEmpty()) {
+      System.out.println("-> Using Default version '" + VersionUtilities.CURRENT_VERSION + "'");
+      return "current";
+    }
+    if (versions.size() == 1) {
+      System.out.println("-> use version " + versions.version());
+      return versions.version();
+    }
+    throw new Exception("-> Multiple versions found. Specify a particular version using the -version parameter");
+  }
 }
\ No newline at end of file
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/AsteriskFilter.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/AsteriskFilter.java
index c2786e98d..432485cc0 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/AsteriskFilter.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/AsteriskFilter.java
@@ -17,7 +17,7 @@ public class AsteriskFilter implements FilenameFilter {
     for (int i = 0; i < expression.length(); i++) {
       if (Character.isAlphabetic(expression.codePointAt(i)) || Character.isDigit(expression.codePointAt(i)))
         regex = regex + expression.charAt(i);
-      else if (expression.charAt(i)=='*')
+      else if (expression.charAt(i) == '*')
         regex = regex + ".*";
       else
         regex = regex + "\\" + expression.charAt(i);
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/Common.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/Common.java
index 1fa047690..0e8be95e0 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/Common.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/Common.java
@@ -89,7 +89,7 @@ public class Common {
     System.out.println("Loading (v = " + version + ", tx server -> " + txServer + ")");
     ValidationEngine ve = new ValidationEngine(definitions, FhirPublication.fromCode(version), version, tt);
     ve.connectToTSServer(txServer, txLog, FhirPublication.fromCode(version));
-    return ve; 
+    return ve;
   }
 
   public static boolean isNetworkPath(String path) {
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/Display.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/Display.java
index bf16fd4da..2f8637f65 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/Display.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/Display.java
@@ -1,19 +1,15 @@
 package org.hl7.fhir.validation.cli.utils;
 
+import org.apache.commons.io.FileUtils;
+import org.hl7.fhir.utilities.npm.FilesystemPackageCacheManager;
+import org.hl7.fhir.utilities.npm.ToolsVersion;
+
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.hl7.fhir.r5.model.Constants;
-import org.hl7.fhir.utilities.VersionUtilities;
-import org.hl7.fhir.utilities.npm.FilesystemPackageCacheManager;
-import org.hl7.fhir.utilities.npm.ToolsVersion;
-import org.hl7.fhir.validation.VersionUtil;
-
 /**
  * Class for displaying output to the cli user.
- *
+ * <p>
  * TODO - Clean this up for localization
  */
 public class Display {
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/EngineMode.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/EngineMode.java
index 7c5835f9c..604003d71 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/EngineMode.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/EngineMode.java
@@ -1,4 +1,12 @@
 package org.hl7.fhir.validation.cli.utils;
+
 public enum EngineMode {
-  VALIDATION, TRANSFORM, NARRATIVE, SNAPSHOT, SCAN, CONVERT, FHIRPATH, VERSION
+  VALIDATION,
+  TRANSFORM,
+  NARRATIVE,
+  SNAPSHOT,
+  SCAN,
+  CONVERT,
+  FHIRPATH,
+  VERSION
 }
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/Params.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/Params.java
index 6417254e7..3790f511f 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/Params.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/Params.java
@@ -1,13 +1,13 @@
 package org.hl7.fhir.validation.cli.utils;
 
-import java.io.File;
-import java.util.Arrays;
-import java.util.Locale;
-
 import org.hl7.fhir.r5.utils.IResourceValidator.BundleValidationRule;
 import org.hl7.fhir.utilities.VersionUtilities;
 import org.hl7.fhir.validation.cli.model.CliContext;
 
+import java.io.File;
+import java.util.Arrays;
+import java.util.Locale;
+
 public class Params {
 
   public static final String VERSION = "-version";
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/ProfileLoader.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/ProfileLoader.java
new file mode 100644
index 000000000..e1587c918
--- /dev/null
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/ProfileLoader.java
@@ -0,0 +1,43 @@
+package org.hl7.fhir.validation.cli.utils;
+
+import org.apache.commons.io.IOUtils;
+import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.utilities.TextFile;
+import org.hl7.fhir.utilities.Utilities;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLConnection;
+
+public class ProfileLoader {
+  public static byte[] loadProfileSource(String src) throws FHIRException, IOException {
+    if (Utilities.noString(src)) {
+      throw new FHIRException("Profile Source '" + src + "' could not be processed");
+    } else if (Common.isNetworkPath(src)) {
+      return loadProfileFromUrl(src);
+    } else if (new File(src).exists()) {
+      return loadProfileFromFile(src);
+    } else {
+      throw new FHIRException("Definitions Source '" + src + "' could not be processed");
+    }
+  }
+
+  private static byte[] loadProfileFromUrl(String src) throws FHIRException {
+    try {
+      URL url = new URL(src + "?nocache=" + System.currentTimeMillis());
+      URLConnection c = url.openConnection();
+      return IOUtils.toByteArray(c.getInputStream());
+    } catch (Exception e) {
+      throw new FHIRException("Unable to find definitions at URL '" + src + "': " + e.getMessage(), e);
+    }
+  }
+
+  private static byte[] loadProfileFromFile(String src) throws IOException {
+    File f = new File(src);
+    if (f.isDirectory())
+      throw new IOException("You must provide a file name, not a directory name");
+    return TextFile.fileToBytes(src);
+  }
+
+}
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/QuestionnaireMode.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/QuestionnaireMode.java
index ef13bfbc0..06af19748 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/QuestionnaireMode.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/QuestionnaireMode.java
@@ -1,3 +1,7 @@
 package org.hl7.fhir.validation.cli.utils;
 
-public enum QuestionnaireMode { NONE, CHECK, REQUIRED }
+public enum QuestionnaireMode {
+  NONE,
+  CHECK,
+  REQUIRED
+}
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/SchemaValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/SchemaValidator.java
new file mode 100644
index 000000000..4d8c6ad2c
--- /dev/null
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/SchemaValidator.java
@@ -0,0 +1,33 @@
+package org.hl7.fhir.validation.cli.utils;
+
+import org.hl7.fhir.r5.elementmodel.Manager;
+import org.hl7.fhir.utilities.validation.ValidationMessage;
+import org.xml.sax.SAXException;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.List;
+
+public class SchemaValidator {
+
+  public static void validateSchema(String location, Manager.FhirFormat cntType, List<ValidationMessage> messages) throws IOException, SAXException {
+    if (cntType == Manager.FhirFormat.JSON)
+      validateJsonSchema(location, messages);
+    if (cntType == Manager.FhirFormat.XML)
+      validateXmlSchema(location, messages);
+    if (cntType == Manager.FhirFormat.TURTLE)
+      validateSHEX(location, messages);
+  }
+
+  private static void validateSHEX(String location, List<ValidationMessage> messages) {
+    messages.add(new ValidationMessage(ValidationMessage.Source.InstanceValidator, ValidationMessage.IssueType.INFORMATIONAL, location, "SHEX Validation is not done yet", ValidationMessage.IssueSeverity.INFORMATION));
+  }
+
+  private static void validateXmlSchema(String location, List<ValidationMessage> messages) throws FileNotFoundException, IOException, SAXException {
+    messages.add(new ValidationMessage(ValidationMessage.Source.InstanceValidator, ValidationMessage.IssueType.INFORMATIONAL, location, "XML Schema Validation is not done yet", ValidationMessage.IssueSeverity.INFORMATION));
+  }
+
+  private static void validateJsonSchema(String location, List<ValidationMessage> messages) {
+    messages.add(new ValidationMessage(ValidationMessage.Source.InstanceValidator, ValidationMessage.IssueType.INFORMATIONAL, location, "JSON Schema Validation is not done yet", ValidationMessage.IssueSeverity.INFORMATION));
+  }
+}
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/VersionSourceInformation.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/VersionSourceInformation.java
index c7baf0163..9e886375f 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/VersionSourceInformation.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/VersionSourceInformation.java
@@ -13,7 +13,7 @@ public class VersionSourceInformation {
 
   public void see(String version, String src) {
     version = VersionUtilities.getMajMin(version);
-    report.add(src+": "+version);
+    report.add(src + ": " + version);
     if (!versions.contains(version)) {
       versions.add(version);
       Collections.sort(versions);
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/VersionUtil.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/VersionUtil.java
similarity index 98%
rename from org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/VersionUtil.java
rename to org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/VersionUtil.java
index 798359660..9df9e75d9 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/VersionUtil.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/VersionUtil.java
@@ -1,36 +1,36 @@
-package org.hl7.fhir.validation;
+package org.hl7.fhir.validation.cli.utils;
 
 import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
 import static org.apache.commons.lang3.StringUtils.left;
 
-/*
-  Copyright (c) 2011+, HL7, Inc.
-  All rights reserved.
-  
-  Redistribution and use in source and binary forms, with or without modification, 
-  are permitted provided that the following conditions are met:
-    
-   * Redistributions of source code must retain the above copyright notice, this 
-     list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above copyright notice, 
-     this list of conditions and the following disclaimer in the documentation 
-     and/or other materials provided with the distribution.
-   * Neither the name of HL7 nor the names of its contributors may be used to 
-     endorse or promote products derived from this software without specific 
-     prior written permission.
-  
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
-  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
-  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
-  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-  POSSIBILITY OF SUCH DAMAGE.
-  
- */
+/*
+  Copyright (c) 2011+, HL7, Inc.
+  All rights reserved.
+  
+  Redistribution and use in source and binary forms, with or without modification, 
+  are permitted provided that the following conditions are met:
+    
+   * Redistributions of source code must retain the above copyright notice, this 
+     list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above copyright notice, 
+     this list of conditions and the following disclaimer in the documentation 
+     and/or other materials provided with the distribution.
+   * Neither the name of HL7 nor the names of its contributors may be used to 
+     endorse or promote products derived from this software without specific 
+     prior written permission.
+  
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
+  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+  POSSIBILITY OF SUCH DAMAGE.
+  
+ */
 
 
 import java.io.InputStream;
diff --git a/org.hl7.fhir.validation/src/main/resources/public/assets/fhir-logo-www.png b/org.hl7.fhir.validation/src/main/resources/public/assets/fhir-logo-www.png
deleted file mode 100644
index 90cb7dc8197a2e72709b34224367060eb9e7fdd2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13319
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
HHsSvdCq0js

diff --git a/org.hl7.fhir.validation/src/main/resources/public/assets/json-svgrepo-com.svg b/org.hl7.fhir.validation/src/main/resources/public/assets/json-svgrepo-com.svg
deleted file mode 100644
index 5643327d1..000000000
--- a/org.hl7.fhir.validation/src/main/resources/public/assets/json-svgrepo-com.svg
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 58 58" style="enable-background:new 0 0 58 58;" xml:space="preserve">
-<g>
-	<path d="M33.655,45.988c-0.232-0.31-0.497-0.533-0.793-0.67s-0.608-0.205-0.937-0.205c-0.337,0-0.658,0.063-0.964,0.191
-		s-0.579,0.344-0.82,0.649s-0.431,0.699-0.567,1.183c-0.137,0.483-0.21,1.075-0.219,1.777c0.009,0.684,0.08,1.267,0.212,1.75
-		s0.314,0.877,0.547,1.183s0.497,0.528,0.793,0.67s0.608,0.212,0.937,0.212c0.337,0,0.658-0.066,0.964-0.198s0.579-0.349,0.82-0.649
-		s0.431-0.695,0.567-1.183s0.21-1.082,0.219-1.784c-0.009-0.684-0.08-1.265-0.212-1.743S33.888,46.298,33.655,45.988z"/>
-	<path d="M51.5,39V13.978c0-0.766-0.092-1.333-0.55-1.792L39.313,0.55C38.964,0.201,38.48,0,37.985,0H8.963
-		C7.777,0,6.5,0.916,6.5,2.926V39H51.5z M29.5,33c0,0.552-0.447,1-1,1s-1-0.448-1-1v-3c0-0.552,0.447-1,1-1s1,0.448,1,1V33z
-		 M37.5,3.391c0-0.458,0.553-0.687,0.877-0.363l10.095,10.095C48.796,13.447,48.567,14,48.109,14H37.5V3.391z M36.5,24v-4
-		c0-0.551-0.448-1-1-1c-0.553,0-1-0.448-1-1s0.447-1,1-1c1.654,0,3,1.346,3,3v4c0,1.103,0.897,2,2,2c0.553,0,1,0.448,1,1
-		s-0.447,1-1,1c-1.103,0-2,0.897-2,2v4c0,1.654-1.346,3-3,3c-0.553,0-1-0.448-1-1s0.447-1,1-1c0.552,0,1-0.449,1-1v-4
-		c0-1.2,0.542-2.266,1.382-3C37.042,26.266,36.5,25.2,36.5,24z M28.5,22c0.828,0,1.5,0.672,1.5,1.5S29.328,25,28.5,25
-		c-0.828,0-1.5-0.672-1.5-1.5S27.672,22,28.5,22z M16.5,26c1.103,0,2-0.897,2-2v-4c0-1.654,1.346-3,3-3c0.553,0,1,0.448,1,1
-		s-0.447,1-1,1c-0.552,0-1,0.449-1,1v4c0,1.2-0.542,2.266-1.382,3c0.84,0.734,1.382,1.8,1.382,3v4c0,0.551,0.448,1,1,1
-		c0.553,0,1,0.448,1,1s-0.447,1-1,1c-1.654,0-3-1.346-3-3v-4c0-1.103-0.897-2-2-2c-0.553,0-1-0.448-1-1S15.947,26,16.5,26z"/>
-	<path d="M6.5,41v15c0,1.009,1.22,2,2.463,2h40.074c1.243,0,2.463-0.991,2.463-2V41H6.5z M18.021,51.566
-		c0,0.474-0.087,0.873-0.26,1.196s-0.405,0.583-0.697,0.779s-0.627,0.333-1.005,0.41c-0.378,0.077-0.768,0.116-1.169,0.116
-		c-0.2,0-0.436-0.021-0.704-0.062s-0.547-0.104-0.834-0.191s-0.563-0.185-0.827-0.294s-0.487-0.232-0.67-0.369l0.697-1.107
-		c0.091,0.063,0.221,0.13,0.39,0.198s0.354,0.132,0.554,0.191s0.41,0.111,0.629,0.157s0.424,0.068,0.615,0.068
-		c0.483,0,0.868-0.094,1.155-0.28s0.439-0.504,0.458-0.95v-7.711h1.668V51.566z M25.958,52.298c-0.15,0.342-0.362,0.643-0.636,0.902
-		s-0.61,0.467-1.012,0.622s-0.856,0.232-1.367,0.232c-0.219,0-0.444-0.012-0.677-0.034s-0.467-0.062-0.704-0.116
-		c-0.237-0.055-0.463-0.13-0.677-0.226s-0.398-0.212-0.554-0.349l0.287-1.176c0.128,0.073,0.289,0.144,0.485,0.212
-		s0.398,0.132,0.608,0.191s0.419,0.107,0.629,0.144s0.405,0.055,0.588,0.055c0.556,0,0.982-0.13,1.278-0.39s0.444-0.645,0.444-1.155
-		c0-0.31-0.104-0.574-0.314-0.793s-0.472-0.417-0.786-0.595s-0.654-0.355-1.019-0.533s-0.706-0.388-1.025-0.629
-		s-0.583-0.526-0.793-0.854s-0.314-0.738-0.314-1.23c0-0.446,0.082-0.843,0.246-1.189s0.385-0.641,0.663-0.882
-		s0.602-0.426,0.971-0.554s0.759-0.191,1.169-0.191c0.419,0,0.843,0.039,1.271,0.116s0.774,0.203,1.039,0.376
-		c-0.055,0.118-0.118,0.248-0.191,0.39s-0.142,0.273-0.205,0.396s-0.118,0.226-0.164,0.308s-0.073,0.128-0.082,0.137
-		c-0.055-0.027-0.116-0.063-0.185-0.109s-0.166-0.091-0.294-0.137s-0.296-0.077-0.506-0.096s-0.479-0.014-0.807,0.014
-		c-0.183,0.019-0.355,0.07-0.52,0.157s-0.31,0.193-0.438,0.321s-0.228,0.271-0.301,0.431s-0.109,0.313-0.109,0.458
-		c0,0.364,0.104,0.658,0.314,0.882s0.47,0.419,0.779,0.588s0.647,0.333,1.012,0.492s0.704,0.354,1.019,0.581
-		s0.576,0.513,0.786,0.854s0.314,0.781,0.314,1.319C26.184,51.603,26.108,51.956,25.958,52.298z M35.761,51.156
-		c-0.214,0.647-0.511,1.185-0.889,1.613s-0.82,0.752-1.326,0.971s-1.06,0.328-1.661,0.328s-1.155-0.109-1.661-0.328
-		s-0.948-0.542-1.326-0.971s-0.675-0.966-0.889-1.613s-0.321-1.395-0.321-2.242s0.107-1.593,0.321-2.235s0.511-1.178,0.889-1.606
-		s0.82-0.754,1.326-0.978s1.06-0.335,1.661-0.335s1.155,0.111,1.661,0.335s0.948,0.549,1.326,0.978s0.675,0.964,0.889,1.606
-		s0.321,1.388,0.321,2.235S35.975,50.509,35.761,51.156z M45.68,54h-1.668l-3.951-6.945V54h-1.668V43.924h1.668l3.951,6.945v-6.945
-		h1.668V54z"/>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
diff --git a/org.hl7.fhir.validation/src/main/resources/public/assets/xml-svgrepo-com.svg b/org.hl7.fhir.validation/src/main/resources/public/assets/xml-svgrepo-com.svg
deleted file mode 100644
index d0b7a4375..000000000
--- a/org.hl7.fhir.validation/src/main/resources/public/assets/xml-svgrepo-com.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 58 58" style="enable-background:new 0 0 58 58;" xml:space="preserve">
-<g>
-	<path d="M51.5,39V13.978c0-0.766-0.092-1.333-0.55-1.792L39.313,0.55C38.964,0.201,38.48,0,37.985,0H8.963
-		C7.777,0,6.5,0.916,6.5,2.926V39H51.5z M37.5,3.391c0-0.458,0.553-0.687,0.877-0.363l10.095,10.095
-		C48.796,13.447,48.567,14,48.109,14H37.5V3.391z M33.793,18.707c-0.391-0.391-0.391-1.023,0-1.414s1.023-0.391,1.414,0l6,6
-		c0.391,0.391,0.391,1.023,0,1.414l-6,6C35.012,30.902,34.756,31,34.5,31s-0.512-0.098-0.707-0.293
-		c-0.391-0.391-0.391-1.023,0-1.414L39.086,24L33.793,18.707z M24.557,31.667l6-17c0.185-0.521,0.753-0.795,1.276-0.61
-		c0.521,0.184,0.794,0.755,0.61,1.276l-6,17C26.298,32.744,25.912,33,25.5,33c-0.11,0-0.223-0.019-0.333-0.058
-		C24.646,32.759,24.373,32.188,24.557,31.667z M15.793,23.293l6-6c0.391-0.391,1.023-0.391,1.414,0s0.391,1.023,0,1.414L17.914,24
-		l5.293,5.293c0.391,0.391,0.391,1.023,0,1.414C23.012,30.902,22.756,31,22.5,31s-0.512-0.098-0.707-0.293l-6-6
-		C15.402,24.316,15.402,23.684,15.793,23.293z"/>
-	<path d="M6.5,41v15c0,1.009,1.22,2,2.463,2h40.074c1.243,0,2.463-0.991,2.463-2V41H6.5z M22.936,54h-1.9l-1.6-3.801h-0.137
-		L17.576,54h-1.9l2.557-4.895l-2.721-5.182h1.873l1.777,4.102h0.137l1.928-4.102H23.1l-2.721,5.182L22.936,54z M34.666,54h-1.668
-		v-6.932l-2.256,5.605h-1.449l-2.27-5.605V54h-1.668V43.924h1.668l2.994,6.891l2.98-6.891h1.668V54z M43.498,54h-6.303V43.924h1.668
-		v8.832h4.635V54z"/>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
diff --git a/org.hl7.fhir.validation/src/main/resources/public/cliwindow.html b/org.hl7.fhir.validation/src/main/resources/public/cliwindow.html
deleted file mode 100644
index 607f775e6..000000000
--- a/org.hl7.fhir.validation/src/main/resources/public/cliwindow.html
+++ /dev/null
@@ -1,56 +0,0 @@
-    <!--aside id="sidebar">
-      <div class="">
-        <label>Validation Options</label>
-        <ul>
-            <li><input type="checkbox" id="doNative">doNative</li>
-            <li><input type="checkbox" id="anyExtensionAllowed">anyExtensionAllowed</li>
-            <li><input type="checkbox" id="hintAboutNonMustSupport">hintAboutNonMustSupport</li>
-            <li><input type="checkbox" id="recursive">recursive</li>
-            <li><input type="checkbox" id="doDebug">doDebug</li>
-            <li><input type="checkbox" id="assumeValidRestReferences">assumeValidRestReferences</li>
-            <li><input type="checkbox" name="canDoNative" id="canDoNative">canDoNative</li>
-
-            <li>
-              <label>Map</label>
-              <input type="text" name="map" placeholder="enter map">
-            </li>
-            <li>
-              <label>Output</label>
-              <input type="text" name="output" placeholder="enter output">
-            </li>
-            <li>
-              <label>txServer</label>
-              <input type="text" name="txServer" placeholder="enter txServer">
-            </li>
-            <li>
-              <label>sv</label>
-              <input type="text" name="sv" placeholder="enter sv">
-            </li>
-            <li>
-              <label>txLog</label>
-              <input type="text" name="txLog" placeholder="enter txLog">
-            </li>
-            <li>
-              <label>mapLog</label>
-              <input type="text" name="mapLog" placeholder="enter mapLog">
-            </li>
-            <li>
-              <label>lang</label>
-              <input type="text" name="lang" placeholder="enter lang">
-            </li>
-            <li>
-              <label>fhirpath</label>
-              <input type="text" name="fhirpath" placeholder="enter fhirpath">
-            </li>
-            <li>
-              <label>snomedCT</label>
-              <input type="text" name="snomedCT" placeholder="enter snomedCT">
-            </li>
-            <li>
-              <label>targetVer</label>
-              <input type="text" name="targetVer" placeholder="enter targetVer">
-            </li>
-        </ul>
-        <input id='test_button' class="btn" type="submit" value="Submit">
-      </div>
-    </aside-->
diff --git a/org.hl7.fhir.validation/src/main/resources/public/enums/EngineMode.js b/org.hl7.fhir.validation/src/main/resources/public/enums/EngineMode.js
deleted file mode 100644
index 63b88cdec..000000000
--- a/org.hl7.fhir.validation/src/main/resources/public/enums/EngineMode.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export const EngineMode {
-  VALIDATION,
-  TRANSFORM,
-  NARRATIVE,
-  SNAPSHOT,
-  SCAN,
-  CONVERT, 
-  FHIRPATH,
-  VERSION
-}
diff --git a/org.hl7.fhir.validation/src/main/resources/public/enums/FhirFormat.js b/org.hl7.fhir.validation/src/main/resources/public/enums/FhirFormat.js
deleted file mode 100644
index c7df35004..000000000
--- a/org.hl7.fhir.validation/src/main/resources/public/enums/FhirFormat.js
+++ /dev/null
@@ -1,17 +0,0 @@
-export const FhirFormat = {
-  XML: {
-    extension:'xml'
-  },
-  JSON: {
-    extension:'json'
-  },
-  TURTLE: {
-    extension:'ttl'
-  },
-  TEXT: {
-    extension:'txt'
-  },
-  VBAR: {
-    extension:'hl7'
-  },
-}
diff --git a/org.hl7.fhir.validation/src/main/resources/public/enums/IssueSeverity.js b/org.hl7.fhir.validation/src/main/resources/public/enums/IssueSeverity.js
deleted file mode 100644
index 89665077f..000000000
--- a/org.hl7.fhir.validation/src/main/resources/public/enums/IssueSeverity.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export const IssueSeverity = {
-  FATAL: {
-    code: 'Fatal'
-  },
-  ERROR: {
-    code: 'Error'
-  },
-  WARNING: {
-    code: 'Warning'
-  },
-  INFORMATION: {
-    code: 'Information'
-  }
-}
diff --git a/org.hl7.fhir.validation/src/main/resources/public/enums/Locale.js b/org.hl7.fhir.validation/src/main/resources/public/enums/Locale.js
deleted file mode 100644
index e3195a1d8..000000000
--- a/org.hl7.fhir.validation/src/main/resources/public/enums/Locale.js
+++ /dev/null
@@ -1,30 +0,0 @@
-export const Locale = {
-  ENGLISH: {
-    code: 'en',
-    value: 'English'
-  },
-  FRENCH: {
-    code: 'fr',
-    value: 'French'
-  },
-  GERMAN: {
-    code: 'de',
-    value: 'German'
-  },
-  ITALIAN: {
-    code: 'it',
-    value: 'Italian'
-  },
-  JAPANESE: {
-    code: 'ja',
-    value: 'Japanese'
-  },
-  KOREAN: {
-    code: 'ko',
-    value: 'Korean'
-  },
-  CHINESE: {
-    code: 'zh',
-    value: 'Chinese'
-  }
-}
diff --git a/org.hl7.fhir.validation/src/main/resources/public/enums/SnomedVersion.js b/org.hl7.fhir.validation/src/main/resources/public/enums/SnomedVersion.js
deleted file mode 100644
index 3f82d797f..000000000
--- a/org.hl7.fhir.validation/src/main/resources/public/enums/SnomedVersion.js
+++ /dev/null
@@ -1,38 +0,0 @@
-export const SnomedVersion = {
-  INTL: {
-    value: "intl",
-    code: "900000000000207008"
-  },
-  US: {
-    value: "us",
-    code: "731000124108"
-  },
-  UK: {
-    value: "uk",
-    code: "999000041000000102"
-  },
-  AU: {
-    value: "au",
-    code: "32506021000036107"
-  },
-  CA: {
-    value: "ca",
-    code: "20611000087101"
-  },
-  NL: {
-    value: "nl",
-    code: "11000146104"
-  },
-  SE: {
-    value: "se",
-    code: "45991000052106"
-  },
-  ES: {
-    value: "es",
-    code: "449081005"
-  },
-  DK: {
-    value: "dk",
-    code: "554471000005108"
-  }
-}
diff --git a/org.hl7.fhir.validation/src/main/resources/public/index.html b/org.hl7.fhir.validation/src/main/resources/public/index.html
deleted file mode 100644
index e698edd74..000000000
--- a/org.hl7.fhir.validation/src/main/resources/public/index.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<html lang="en"><head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <meta name="description" content="">
-  <meta name="author" content="Mark Iantorno">
-  <meta name="generator" content="Jekyll v3.8.6">
-  <title>FHIR HL7 Resrouce Validator GUI</title>
-
-  <!-- Bootstrap core CSS -->
-  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
-
-  <link rel="canonical" href="https://getbootstrap.com/docs/4.4/examples/offcanvas/">
-  <!-- Favicons -->
-  <meta name="theme-color" content="#563d7c">
-
-  <style>
-    .bd-placeholder-img {
-      font-size: 1.125rem;
-      text-anchor: middle;
-      -webkit-user-select: none;
-      -moz-user-select: none;
-      -ms-user-select: none;
-      user-select: none;
-    }
-
-    @media (min-width: 768px) {
-      .bd-placeholder-img-lg {
-        font-size: 3.5rem;
-      }
-    }
-  </style>
-  <!-- Custom styles for this template -->
-  <link href="style.css" rel="stylesheet">
-</head>
-<body class="bg-light">
-  <main role="main" class="container">
-    <div class="d-flex align-items-center p-3 my-3 text-white-50 bg-secondary rounded shadow-sm">
-      <img class="mr-3" src="./assets/fhir-logo-www.png" alt="" height="48">
-      <div class="lh-100">
-        <h6 class="mb-0 text-white lh-100">FHIR Core Validator</h6>
-        <small class="text-white">Experimental</small>
-      </div>
-    </div>
-
-    <div class="my-3 p-3 bg-white rounded shadow-sm">
-      <div class="d-flex border-bottom border-gray justify-content-between align-items-center w-100">
-        <h6 class="pb-2 mb-0">Files to Validate</h6>
-        <button id="validate_button" class="btn btn-secondary mb-1">Validate</button>
-      </div>
-
-      <div class="accordion" id="accordionExample">
-        <ul id="file_entry_file_list" class="list-group border">
-        </ul>
-      </div>
-
-      <div class="bd-callout bd-callout-info">
-        <small class="d-block text-right mt-3">
-          <input type="file" style="display:none;" id="files" name="files[]" multiple="" >
-          <button type="button" class="btn btn-secondary" onclick="document.getElementById('files').click()">Add Files</button>
-        </small>
-      </div>
-
-      <template id="file_entry_template">
-        <li class="list-unstyled">
-          <div class="card">
-            <div class="card-header" id="headingOne">
-              <div class="d-flex">
-                <div class="d-flex align-items-center">
-                  <img id="file_entry_type_icon" class="bd-placeholder-img mr-2 rounded" src="./assets/json-svgrepo-com.svg" width="32" height="32" preserveaspectratio="xMidYMid slice">
-                  <button id="file_entry_name_field" class="btn btn-link" type="button" data-toggle="collapse" data-target="#file_entry_collapse_section" aria-expanded="true" aria-controls="file_entry_collapse_section">
-                    Collapsible Group Item #1
-                  </button>
-                </div>
-                <div class="ml-auto d-flex">
-                  <svg id="file_entry_delete_button" class="delete_button align-self-center" height="24" viewBox="0 0 24 24" width="24">
-                    <path d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zm2.46-7.12l1.41-1.41L12 12.59l2.12-2.12 1.41 1.41L13.41 14l2.12 2.12-1.41 1.41L12 15.41l-2.12 2.12-1.41-1.41L10.59 14l-2.13-2.12zM15.5 4l-1-1h-5l-1 1H5v2h14V4z"></path>
-                  </svg>
-                </div>
-              </div>
-            </div>
-
-            <div id="file_entry_collapse_section" class="collapse" aria-labelledby="headingOne" data-parent="#accordionExample">
-              <div class="card-body">
-                <ul id="file_entry_outcome_list" class="list-group">
-                </ul>
-              </div>
-            </div>
-          </div>
-        </li>
-      </template>
-    </div>
-  </main>
-  <script type="module" src="./main.js"></script>
-
-  <!-- jQuery first, then Popper.js, then Bootstrap JS -->
-  <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
-  <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
-</body></html>
diff --git a/org.hl7.fhir.validation/src/main/resources/public/main.js b/org.hl7.fhir.validation/src/main/resources/public/main.js
deleted file mode 100644
index 76ddbc1d1..000000000
--- a/org.hl7.fhir.validation/src/main/resources/public/main.js
+++ /dev/null
@@ -1,206 +0,0 @@
-import {CliContext} from './model/CliContext.js';
-import {ValidationRequest} from './model/ValidationRequest.js';
-import {FileInfo} from './model/FileInfo.js';
-import {FhirFormat} from './enums/FhirFormat.js';
-import {IssueSeverity} from './enums/IssueSeverity.js';
-
-/*
-  <Constants>
-*/
-
-// Icon Constants
-const jsonIcon = './assets/json-svgrepo-com.svg';
-const xmlIcon = './assets/xml-svgrepo-com.svg';
-
-// HTML classes
-const CLASS_LIST_ITEM_PLAIN = "list-group-item";
-const CLASS_LIST_ITEM_FATAL = "list-group-item list-group-item-dark";
-const CLASS_LIST_ITEM_ERROR = "list-group-item list-group-item-danger";
-const CLASS_LIST_ITEM_WARNING = "list-group-item list-group-item-warning";
-const CLASS_LIST_ITEM_INFORMATION = "list-group-item list-group-item-info";
-
-// HTML IDs
-const ID_FILE_ENTRY_TEMPLATE = '#file_entry_template';
-const ID_FILE_ENTRY_NAME = 'file_entry_name_field';
-const ID_FILE_ENTRY_ICON = 'file_entry_type_icon';
-const ID_FILE_ENTRY_DELETE_BUTTON = 'file_entry_delete_button';
-const ID_FILE_ENTRY_FILE_LIST = 'file_entry_file_list';
-const ID_FILE_ENTRY_OUTCOME_LIST = 'file_entry_outcome_list';
-const ID_FILE_ENTRY_COLLAPSE_SECTION = 'file_entry_collapse_section';
-
-/*
-  </Constants>
-*/
-
-// Data Fields
-const cli = new CliContext();
-const filesToValidate = [];
-
-document.getElementById('validate_button').addEventListener("click", validateCurrentFiles);
-document.getElementById('files').addEventListener('change', handleFileSelect, false);
-
-// File reading
-function handleFileSelect(evt) {
-  var files = evt.target.files;
-  var output = [];
-  for (var i = 0, f; f = files[i]; i++) {
-    generateFileEntry(f);
-    // Check for proper file type here
-    console.log(f.type);
-  }
-}
-
-function generateFileEntry(file) {
-  var fr = new FileReader();
-  fr.onload = function(e) {
-    // TODO there may be timing issues here
-    filesToValidate.push(new FileInfo(file.name, e.target.result, file.type));
-    document.getElementById(ID_FILE_ENTRY_FILE_LIST).appendChild(generateNewFileListItemFromTemplate(file, filesToValidate.length - 1));
-  };
-  fr.readAsText(file);
-}
-
-// File List Template Generation
-
-function generateNewFileListItemFromTemplate(file, index) {
-  var template = document.querySelector(ID_FILE_ENTRY_TEMPLATE);
-  var clone = template.content.cloneNode(true);
-
-  // Add file name
-  clone.getElementById(ID_FILE_ENTRY_NAME).textContent = file.name;
-
-  // Add appropriate icon for filetype
-  if (file.type.includes(FhirFormat.JSON.extension)) {
-    clone.getElementById(ID_FILE_ENTRY_ICON).src = jsonIcon;
-  } else if (file.type.includes(FhirFormat.XML.extension)) {
-    clone.getElementById(ID_FILE_ENTRY_ICON).src = xmlIcon;
-  }
-
-  clone.getElementById(ID_FILE_ENTRY_COLLAPSE_SECTION).setAttribute("id", (ID_FILE_ENTRY_COLLAPSE_SECTION + index));
-  clone.getElementById(ID_FILE_ENTRY_NAME).setAttribute("aria-controls", (ID_FILE_ENTRY_COLLAPSE_SECTION + index));
-  clone.getElementById(ID_FILE_ENTRY_NAME).setAttribute("data-target", ('#' + ID_FILE_ENTRY_COLLAPSE_SECTION + index));
-
-  // Add delete listener
-  clone.getElementById(ID_FILE_ENTRY_DELETE_BUTTON).addEventListener("click", handleDeleteOnFileList);
-
-  return clone;
-}
-
-function addIssueToFileEntryList(index, severity, details) {
-  var ul = document.getElementById(ID_FILE_ENTRY_FILE_LIST);
-  var listItems = ul.children;
-  var fileEntry = listItems[index];
-  console.log(fileEntry);
-  var listOfIssues = fileEntry.querySelector('#' + ID_FILE_ENTRY_OUTCOME_LIST);
-  var issueItem = createIssueListItem(severity, details);
-  listOfIssues.appendChild(issueItem);
-}
-
-function createIssueListItem(severity, details) {
-  var newIssue = document.createElement('li');
-  switch(severity) {
-    case IssueSeverity.FATAL.code:
-      newIssue.setAttribute("class", CLASS_LIST_ITEM_FATAL);
-      break;
-    case IssueSeverity.ERROR.code:
-      newIssue.setAttribute("class", CLASS_LIST_ITEM_ERROR);
-      break;
-    case IssueSeverity.WARNING.code:
-      newIssue.setAttribute("class", CLASS_LIST_ITEM_WARNING);
-      break;
-    case IssueSeverity.INFORMATION.code:
-      newIssue.setAttribute("class", CLASS_LIST_ITEM_INFORMATION);
-      break;
-    default:
-      console.error('Passed in bad severity: ' + severity);
-  }
-  newIssue.innerHTML = details;
-  return newIssue;
-}
-
-function handleDeleteOnFileList(e) {
-  var li = e.target.closest('li');
-  var nodes = Array.from( li.closest('ul').children );
-  var index = nodes.indexOf( li );
-  nodes[index].remove();
-  filesToValidate.splice((index - 1), 1);
-  console.log('Index -> ' + index);
-  console.log(filesToValidate);
-}
-
-// Validation
-function validateCurrentFiles() {
-    sendFilesToValidate(filesToValidate);
-}
-
-function sendFilesToValidate(arrayOfFileInfo) {
-  var req = new ValidationRequest();
-  req.filesToValidate = arrayOfFileInfo;
-
-  var xhr = new XMLHttpRequest();
-  xhr.open("POST", 'http://localhost:8080/' + 'validate', true);
-  xhr.setRequestHeader('Content-Type', 'application/json');
-  xhr.send(JSON.stringify(req));
-
-  xhr.onload = function () {
-      const response = '{"outcomes": [{"fileInfo": {"fileName": "account-example.canonical.json", "fileType": "JSON"}, "issues": [{"severity": "Error", "details": "\"null\""}, {"severity": "Error", "details": "Profile http://hl7.org/fhir/StructureDefinition/Account, Element: minimum required = 1, but only found 0"}]}, {"fileInfo": {"fileName": "account-example(example).xml", "fileType": "XML"}, "issues": []}]}';
-      var test = xhr.responseText;
-      processValidationResponse(JSON.parse(JSON.parse(xhr.responseText)));
-  };
-}
-
-function processValidationResponse(validationResponse) {
-  console.log(validationResponse);
-  console.log(validationResponse.length);
-  console.log(validationResponse.outcomes);
-  console.log(validationResponse.outcomes.length);
-
-  for (var i = 0; i < validationResponse.outcomes.length; i++) {
-    console.log(validationResponse.outcomes[i]);
-    var fileInfo = validationResponse.outcomes[i].fileInfo;
-    var issues = validationResponse.outcomes[i].issues;
-    issues.forEach(issue => {
-      console.log(issue);
-      addIssueToFileEntryList(i, issue.severity, issue.details);
-    });
-  }
-
-}
-
-
-
-
-// window.onload = function loadCliContext() {
-//   var xhr = new XMLHttpRequest();
-//   xhr.open("GET", 'http://localhost:8080/currentContext');
-//   xhr.send();
-//   xhr.onreadystatechange = function() {
-//     if (this.readyState == 4 && this.status == 200) {
-//       console.log(xhr.responseText);
-//     }
-//   }
-// }
-
-// /*
-//   Escape JSON
-// */
-// var escapeJSON = exports.escapeJSON = function(json) {
-//   var escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
-//   var meta = {    // table of character substitutions
-//               '\b': '\\b',
-//               '\t': '\\t',
-//               '\n': '\\n',
-//               '\f': '\\f',
-//               '\r': '\\r',
-//               '"' : '\\"',
-//               '\\': '\\\\'
-//             };
-//
-//   escapable.lastIndex = 0;
-//   return escapable.test(json) ? '"' + json.replace(escapable, function (a) {
-//       var c = meta[a];
-//       return (typeof c === 'string') ? c
-//         : '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
-//   }) + '"' : '"' + json + '"';
-//
-// };
diff --git a/org.hl7.fhir.validation/src/main/resources/public/model/CliContext.js b/org.hl7.fhir.validation/src/main/resources/public/model/CliContext.js
deleted file mode 100644
index 673637cd9..000000000
--- a/org.hl7.fhir.validation/src/main/resources/public/model/CliContext.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import {SnomedVersion} from '../enums/SnomedVersion.js';
-import {Locale} from '../enums/Locale.js';
-
-export class CliContext {
-    constructor(){
-        this.doNative = false;
-        this.anyExtensionsAllowed = true;
-        this.hintAboutNonMustSupport = false;
-        this.recursive = false;
-        this.doDebug = false;
-        this.assumeValidRestReferences = false;
-        this.canDoNative = false;
-
-        this.map = null;
-        this.output = null;
-        this.txServer = "http://tx.fhir.org";
-        this.sv = "current";
-        this.txLog = null;
-        this.mapLog = null;
-        this.lang = null;
-        this.fhirpath = null;
-        this.snomedCT = SnomedVersion.ES.value;
-        this.targetVer = null;
-
-        this.igs = [];
-        this.questionnaires = [];
-        this.profiles = [];
-        this.sources = [];
-
-        this.locale = Locale.ENGLISH.value;
-
-        this.locations = new Map();
-    }
-}
diff --git a/org.hl7.fhir.validation/src/main/resources/public/model/FileInfo.js b/org.hl7.fhir.validation/src/main/resources/public/model/FileInfo.js
deleted file mode 100644
index d853c1e44..000000000
--- a/org.hl7.fhir.validation/src/main/resources/public/model/FileInfo.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import {FhirFormat} from '../enums/FhirFormat.js';
-
-export class FileInfo {
-    constructor(fileName, fileContent, type){
-        this.fileName = fileName;
-        this.fileContent = fileContent;
-        if (type.includes('json')) {
-          this.fileType = FhirFormat.JSON.extension;
-        } else if (type.includes('xml')) {
-          this.fileType = FhirFormat.XML.extension;
-        }
-    }
-}
diff --git a/org.hl7.fhir.validation/src/main/resources/public/model/ValidationIssue.js b/org.hl7.fhir.validation/src/main/resources/public/model/ValidationIssue.js
deleted file mode 100644
index 0ce182359..000000000
--- a/org.hl7.fhir.validation/src/main/resources/public/model/ValidationIssue.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export class ValidationIssue {
-    constructor(){
-        this.severity = "";
-        this.details = "";
-    }
-}
diff --git a/org.hl7.fhir.validation/src/main/resources/public/model/ValidationOutcome.js b/org.hl7.fhir.validation/src/main/resources/public/model/ValidationOutcome.js
deleted file mode 100644
index 77f5e41d0..000000000
--- a/org.hl7.fhir.validation/src/main/resources/public/model/ValidationOutcome.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import {FileInfo} from './FileInfo.js';
-
-export class ValidationOutcome {
-    constructor(){
-        this.fileInfo = null;
-        this.issues = [];
-    }
-}
diff --git a/org.hl7.fhir.validation/src/main/resources/public/model/ValidationRequest.js b/org.hl7.fhir.validation/src/main/resources/public/model/ValidationRequest.js
deleted file mode 100644
index 85b7559bb..000000000
--- a/org.hl7.fhir.validation/src/main/resources/public/model/ValidationRequest.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import {CliContext} from './CliContext.js';
-
-export class ValidationRequest {
-    constructor(){
-        this.cliContext = new CliContext();
-        this.filesToValidate = [];
-    }
-}
diff --git a/org.hl7.fhir.validation/src/main/resources/public/model/ValidationResponse.js b/org.hl7.fhir.validation/src/main/resources/public/model/ValidationResponse.js
deleted file mode 100644
index d128d3e30..000000000
--- a/org.hl7.fhir.validation/src/main/resources/public/model/ValidationResponse.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import {ValidationOutcome} from './ValidationOutcome.js';
-
-export class ValidationResponse {
-  constructor() {
-      this.outcomes = [];
-  }
-}
diff --git a/org.hl7.fhir.validation/src/main/resources/public/style.css b/org.hl7.fhir.validation/src/main/resources/public/style.css
deleted file mode 100644
index 1cba70413..000000000
--- a/org.hl7.fhir.validation/src/main/resources/public/style.css
+++ /dev/null
@@ -1,94 +0,0 @@
-/* */
-.container{
-  width:80%;
-  margin:auto;
-  overflow: hidden;
-}
-
-#main{
-  float: left;
-  width: 70%;
-}
-
-#sidebar{
-  float: right;
-  width: 30%;
-}
-
-
-html,
-body {
-  overflow-x: hidden; /* Prevent scroll on narrow devices */
-}
-
-body {
-  padding-top: 56px;
-}
-
-@media (max-width: 991.98px) {
-  .offcanvas-collapse {
-    position: fixed;
-    top: 56px; /* Height of navbar */
-    bottom: 0;
-    left: 100%;
-    width: 100%;
-    padding-right: 1rem;
-    padding-left: 1rem;
-    overflow-y: auto;
-    visibility: hidden;
-    background-color: #343a40;
-    transition: visibility .3s ease-in-out, -webkit-transform .3s ease-in-out;
-    transition: transform .3s ease-in-out, visibility .3s ease-in-out;
-    transition: transform .3s ease-in-out, visibility .3s ease-in-out, -webkit-transform .3s ease-in-out;
-  }
-  .offcanvas-collapse.open {
-    visibility: visible;
-    -webkit-transform: translateX(-100%);
-    transform: translateX(-100%);
-  }
-}
-
-.nav-scroller {
-  position: relative;
-  z-index: 2;
-  height: 2.75rem;
-  overflow-y: hidden;
-}
-
-.nav-scroller .nav {
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-wrap: nowrap;
-  flex-wrap: nowrap;
-  padding-bottom: 1rem;
-  margin-top: -1px;
-  overflow-x: auto;
-  color: rgba(255, 255, 255, .75);
-  text-align: center;
-  white-space: nowrap;
-  -webkit-overflow-scrolling: touch;
-}
-
-.nav-underline .nav-link {
-  padding-top: .75rem;
-  padding-bottom: .75rem;
-  font-size: .875rem;
-  color: #6c757d;
-}
-
-.nav-underline .nav-link:hover {
-  color: #007bff;
-}
-
-.nav-underline .active {
-  font-weight: 500;
-  color: #343a40;
-}
-
-.text-white-50 { color: rgba(255, 255, 255, .5); }
-
-.bg-purple { background-color: #6f42c1; }
-
-.lh-100 { line-height: 1; }
-.lh-125 { line-height: 1.25; }
-.lh-150 { line-height: 1.5; }
diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/CDAValidationTest.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/CDAValidationTest.java
index 00d58ab2e..39a41cf26 100644
--- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/CDAValidationTest.java
+++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/CDAValidationTest.java
@@ -2,7 +2,7 @@ package org.hl7.fhir.validation.tests;
 
 import org.hl7.fhir.r4.context.SimpleWorkerContext;
 import org.hl7.fhir.r5.test.utils.TestingUtilities;
-import org.hl7.fhir.validation.Validator;
+import org.hl7.fhir.validation.ValidatorCli;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
@@ -13,7 +13,7 @@ public class CDAValidationTest {
 
   @Test
   public void test() throws Exception {
-    Validator.main(new String[] {TestingUtilities.loadTestResource("ccda.xml"), "-ig", "hl7.fhir.cda"});
+    ValidatorCli.main(new String[] {TestingUtilities.loadTestResource("ccda.xml"), "-ig", "hl7.fhir.cda"});
   }
 
 }
\ No newline at end of file
diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/TransformationTests.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/TransformationTests.java
index 81ae0cdc4..9fcd45a25 100644
--- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/TransformationTests.java
+++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/TransformationTests.java
@@ -4,7 +4,7 @@ import java.io.File;
 
 import org.hl7.fhir.r4.test.utils.TestingUtilities;
 import org.hl7.fhir.utilities.Utilities;
-import org.hl7.fhir.validation.Validator;
+import org.hl7.fhir.validation.ValidatorCli;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
@@ -18,7 +18,7 @@ public class TransformationTests {
     String output = Utilities.path("[tmp]", "cda-bundle.txt");
     String log = Utilities.path("[tmp]", "transform-log.txt");
     
-    Validator.main(new String[] {input, "-transform", "http://hl7.org/fhir/cda/mapping/ccdaDocumentToFhir", "-ig", "hl7.fhir.cda", "-ig", mappings, "-output", output, "-log", log});
+    ValidatorCli.main(new String[] {input, "-transform", "http://hl7.org/fhir/cda/mapping/ccdaDocumentToFhir", "-ig", "hl7.fhir.cda", "-ig", mappings, "-output", output, "-log", log});
     checkFile(output);
     checkFile(log);
   }