Move evaluator.cli to cqf-fhir-cr-cli (#336)

* Move evaluator.cli to cqf-fhir-cr-cli * Update root pom file
cqframework · Aug 31, 2023 · e94af3f · e94af3f
1 parent 8f4ff72
commit e94af3f
Show file tree

Hide file tree

Showing 1,438 changed files with 32 additions and 1,444 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -63,7 +63,7 @@
       "type": "java",
       "name": "Debug (EXM 124)",
       "request": "launch",
-      "mainClass": "org.opencds.cqf.cql.evaluator.cli.Main",
+      "mainClass": "org.opencds.cqf.fhir.cr.cli.Main",
       "projectName": "evaluator.cli",
       "args": [
         "--lu",
@@ -82,7 +82,7 @@
       "type": "java",
       "name": "Debug (EXM 130)",
       "request": "launch",
-      "mainClass": "org.opencds.cqf.cql.evaluator.cli.Main",
+      "mainClass": "org.opencds.cqf.fhir.cr.cli.Main",
       "projectName": "evaluator.cli",
       "args": [
         "--lu",
@@ -101,7 +101,7 @@
       "type": "java",
       "name": "Debug (EXM 130 R4)",
       "request": "launch",
-      "mainClass": "org.opencds.cqf.cql.evaluator.cli.Main",
+      "mainClass": "org.opencds.cqf.fhir.cr.cli.Main",
       "projectName": "evaluator.cli",
       "args": [
         "--lu",
@@ -120,7 +120,7 @@
       "type": "java",
       "name": "Debug (EXM 105 R4)",
       "request": "launch",
-      "mainClass": "org.opencds.cqf.cql.evaluator.cli.Main",
+      "mainClass": "org.opencds.cqf.fhir.cr.cli.Main",
       "projectName": "evaluator.cli",
       "args": [
         "--lu",
@@ -139,7 +139,7 @@
       "type": "java",
       "name": "Debug (EXM 104)",
       "request": "launch",
-      "mainClass": "org.opencds.cqf.cql.evaluator.cli.Main",
+      "mainClass": "org.opencds.cqf.fhir.cr.cli.Main",
       "projectName": "evaluator.cli",
       "args": [
         "--lu",
@@ -158,7 +158,7 @@
       "type": "java",
       "name": "Debug (EXM 104 R4)",
       "request": "launch",
-      "mainClass": "org.opencds.cqf.cql.evaluator.cli.Main",
+      "mainClass": "org.opencds.cqf.fhir.cr.cli.Main",
       "projectName": "evaluator.cli",
       "args": [
         "--lu",
@@ -177,7 +177,7 @@
       "type": "java",
       "name": "Debug (EXM 104 R401)",
       "request": "launch",
-      "mainClass": "org.opencds.cqf.cql.evaluator.cli.Main",
+      "mainClass": "org.opencds.cqf.fhir.cr.cli.Main",
       "projectName": "evaluator.cli",
       "args": [
         "--fv",
@@ -198,7 +198,7 @@
       "type": "java",
       "name": "Debug (APHL - Reportable)",
       "request": "launch",
-      "mainClass": "org.opencds.cqf.cql.evaluator.cli.Main",
+      "mainClass": "org.opencds.cqf.fhir.cr.cli.Main",
       "projectName": "evaluator.cli",
       "args": [
         "--fv",

diff --git a/cqf-fhir-bom/pom.xml b/cqf-fhir-bom/pom.xml
@@ -56,6 +56,11 @@
         <artifactId>cqf-fhir-cr</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.opencds.cqf.fhir</groupId>
+        <artifactId>cqf-fhir-cr-cli</artifactId>
+        <version>${project.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 </project>
diff --git a/evaluator.cli/pom.xml → cqf-fhir-cr-cli/pom.xml b/evaluator.cli/pom.xml → cqf-fhir-cr-cli/pom.xml
@@ -3,13 +3,11 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.opencds.cqf.cql</groupId>
-  <artifactId>evaluator.cli</artifactId>
+  <groupId>org.opencds.cqf.fhir</groupId>
+  <artifactId>cqf-fhir-cr-cli</artifactId>
   <version>3.0.0-PRE6-SNAPSHOT</version>
-  <packaging>jar</packaging>
-
-  <name>evaluator.cli</name>
-  <url>https://github.com/cqframework/clinical-reasoning/tree/master</url>
+  <name>FHIR Clinical Reasoning (CLI)</name>
+  <description>CLI for running FHIR Clincial Reasoning operations</description>
 
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
@@ -18,8 +16,6 @@
     <relativePath>../cqf-fhir/pom.xml</relativePath>
   </parent>
 
-  <description>CQL Evaluator - CLI</description>
-
   <dependencies>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
@@ -123,7 +119,7 @@
             </execution>
           </executions>
           <configuration>
-            <mainClass>org.opencds.cqf.cql.evaluator.cli.Main</mainClass>
+            <mainClass>org.opencds.cqf.fhir.cr.cli.Main</mainClass>
           </configuration>
         </plugin>
         <plugin>

diff --git a/...g/opencds/cqf/cql/evaluator/cli/Main.java → ...ava/org/opencds/cqf/fhir/cr/cli/Main.java b/...g/opencds/cqf/cql/evaluator/cli/Main.java → ...ava/org/opencds/cqf/fhir/cr/cli/Main.java
@@ -1,8 +1,8 @@
-package org.opencds.cqf.cql.evaluator.cli;
+package org.opencds.cqf.fhir.cr.cli;
 
 import java.util.Objects;
 
-import org.opencds.cqf.cql.evaluator.cli.command.CliCommand;
+import org.opencds.cqf.fhir.cr.cli.command.CliCommand;
 
 import picocli.CommandLine;
 

diff --git a/...evaluator/cli/command/ArgFileCommand.java → ...f/fhir/cr/cli/command/ArgFileCommand.java b/...evaluator/cli/command/ArgFileCommand.java → ...f/fhir/cr/cli/command/ArgFileCommand.java
@@ -1,11 +1,11 @@
-package org.opencds.cqf.cql.evaluator.cli.command;
+package org.opencds.cqf.fhir.cr.cli.command;
 
 import java.io.File;
 import java.nio.file.Files;
 import java.util.List;
 import java.util.concurrent.Callable;
 
-import org.opencds.cqf.cql.evaluator.cli.Main;
+import org.opencds.cqf.fhir.cr.cli.Main;
 
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Parameters;

diff --git a/...cql/evaluator/cli/command/CliCommand.java → ...s/cqf/fhir/cr/cli/command/CliCommand.java b/...cql/evaluator/cli/command/CliCommand.java → ...s/cqf/fhir/cr/cli/command/CliCommand.java
@@ -1,6 +1,6 @@
-package org.opencds.cqf.cql.evaluator.cli.command;
+package org.opencds.cqf.fhir.cr.cli.command;
 
-import org.opencds.cqf.cql.evaluator.cli.version.VersionProvider;
+import org.opencds.cqf.fhir.cr.cli.version.VersionProvider;
 
 import picocli.CommandLine.Command;
 

diff --git a/...cql/evaluator/cli/command/CqlCommand.java → ...s/cqf/fhir/cr/cli/command/CqlCommand.java b/...cql/evaluator/cli/command/CqlCommand.java → ...s/cqf/fhir/cr/cli/command/CqlCommand.java
@@ -1,4 +1,4 @@
-package org.opencds.cqf.cql.evaluator.cli.command;
+package org.opencds.cqf.fhir.cr.cli.command;
 
 import java.util.List;
 import java.util.Map;

diff --git a/...valuator/cli/version/VersionProvider.java → .../fhir/cr/cli/version/VersionProvider.java b/...valuator/cli/version/VersionProvider.java → .../fhir/cr/cli/version/VersionProvider.java
@@ -1,4 +1,4 @@
-package org.opencds.cqf.cql.evaluator.cli.version;
+package org.opencds.cqf.fhir.cr.cli.version;
 
 import picocli.CommandLine.IVersionProvider;
 

diff --git a/...rc/main/resources/simplelogger.properties → ...rc/main/resources/simplelogger.properties b/...rc/main/resources/simplelogger.properties → ...rc/main/resources/simplelogger.properties
diff --git a/...pencds/cqf/cql/evaluator/cli/CliTest.java → .../org/opencds/cqf/fhir/cr/cli/CliTest.java b/...pencds/cqf/cql/evaluator/cli/CliTest.java → .../org/opencds/cqf/fhir/cr/cli/CliTest.java
@@ -1,4 +1,4 @@
-package org.opencds.cqf.cql.evaluator.cli;
+package org.opencds.cqf.fhir.cr.cli;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;

diff --git a/...r.cli/src/test/resources/argfile/args.txt → ...r-cli/src/test/resources/argfile/args.txt b/...r.cli/src/test/resources/argfile/args.txt → ...r-cli/src/test/resources/argfile/args.txt
diff --git a/.../src/test/resources/cql/Hello Patient.cql → .../src/test/resources/cql/Hello Patient.cql b/.../src/test/resources/cql/Hello Patient.cql → .../src/test/resources/cql/Hello Patient.cql
diff --git a/...ata/patients/12345/Encounter/12345-1.json → ...ata/patients/12345/Encounter/12345-1.json b/...ata/patients/12345/Encounter/12345-1.json → ...ata/patients/12345/Encounter/12345-1.json
diff --git a/...cli/src/test/resources/dstu3/TestFHIR.cql → ...cli/src/test/resources/dstu3/TestFHIR.cql b/...cli/src/test/resources/dstu3/TestFHIR.cql → ...cli/src/test/resources/dstu3/TestFHIR.cql
diff --git a/...t/resources/dstu3/TestFHIRWithHelpers.cql → ...t/resources/dstu3/TestFHIRWithHelpers.cql b/...t/resources/dstu3/TestFHIRWithHelpers.cql → ...t/resources/dstu3/TestFHIRWithHelpers.cql
diff --git a/...rc/test/resources/dstu3/TestValueSet.json → ...rc/test/resources/dstu3/TestValueSet.json b/...rc/test/resources/dstu3/TestValueSet.json → ...rc/test/resources/dstu3/TestValueSet.json
diff --git a/...tolerance/AllergyIntolerance-example.json → ...tolerance/AllergyIntolerance-example.json b/...tolerance/AllergyIntolerance-example.json → ...tolerance/AllergyIntolerance-example.json
diff --git a/...xample/CarePlan/CarePlan-colonoscopy.json → ...xample/CarePlan/CarePlan-colonoscopy.json b/...xample/CarePlan/CarePlan-colonoscopy.json → ...xample/CarePlan/CarePlan-colonoscopy.json
diff --git a/...u3/example/CareTeam/CareTeam-example.json → ...u3/example/CareTeam/CareTeam-example.json b/...u3/example/CareTeam/CareTeam-example.json → ...u3/example/CareTeam/CareTeam-example.json
diff --git a/.../example/Condition/Condition-example.json → .../example/Condition/Condition-example.json b/.../example/Condition/Condition-example.json → .../example/Condition/Condition-example.json
diff --git a/...stu3/example/Condition/Condition-hc1.json → ...stu3/example/Condition/Condition-hc1.json b/...stu3/example/Condition/Condition-hc1.json → ...stu3/example/Condition/Condition-hc1.json
diff --git a/...es/dstu3/example/Device/Device-udi-1.json → ...es/dstu3/example/Device/Device-udi-1.json b/...es/dstu3/example/Device/Device-udi-1.json → ...es/dstu3/example/Device/Device-udi-1.json
diff --git a/...iagnosticReport/DiagnosticReport-cbc.json → ...iagnosticReport/DiagnosticReport-cbc.json b/...iagnosticReport/DiagnosticReport-cbc.json → ...iagnosticReport/DiagnosticReport-cbc.json
diff --git a/...ort/DiagnosticReport-metabolic-panel.json → ...ort/DiagnosticReport-metabolic-panel.json b/...ort/DiagnosticReport-metabolic-panel.json → ...ort/DiagnosticReport-metabolic-panel.json
diff --git a/...icReport/DiagnosticReport-urinalysis.json → ...icReport/DiagnosticReport-urinalysis.json b/...icReport/DiagnosticReport-urinalysis.json → ...icReport/DiagnosticReport-urinalysis.json
diff --git a/...ce/DocumentReference-episode-summary.json → ...ce/DocumentReference-episode-summary.json b/...ce/DocumentReference-episode-summary.json → ...ce/DocumentReference-episode-summary.json
diff --git a/...tu3/example/Encounter/Encounter-1036.json → ...tu3/example/Encounter/Encounter-1036.json b/...tu3/example/Encounter/Encounter-1036.json → ...tu3/example/Encounter/Encounter-1036.json
diff --git a/...xample/Encounter/Encounter-example-1.json → ...xample/Encounter/Encounter-example-1.json b/...xample/Encounter/Encounter-example-1.json → ...xample/Encounter/Encounter-example-1.json
diff --git a/...urces/dstu3/example/Goal/Goal-goal-1.json → ...urces/dstu3/example/Goal/Goal-goal-1.json b/...urces/dstu3/example/Goal/Goal-goal-1.json → ...urces/dstu3/example/Goal/Goal-goal-1.json
diff --git a/...mple/Immunization/Immunization-imm-1.json → ...mple/Immunization/Immunization-imm-1.json b/...mple/Immunization/Immunization-imm-1.json → ...mple/Immunization/Immunization-imm-1.json
diff --git a/...u3/example/Location/Location-hl7east.json → ...u3/example/Location/Location-hl7east.json b/...u3/example/Location/Location-hl7east.json → ...u3/example/Location/Location-hl7east.json
diff --git a/...le/Medication/Medication-uscore-med1.json → ...le/Medication/Medication-uscore-med1.json b/...le/Medication/Medication-uscore-med1.json → ...le/Medication/Medication-uscore-med1.json
diff --git a/...le/Medication/Medication-uscore-med2.json → ...le/Medication/Medication-uscore-med2.json b/...le/Medication/Medication-uscore-med2.json → ...le/Medication/Medication-uscore-med2.json
diff --git a/...Request/MedicationRequest-uscore-mo1.json → ...Request/MedicationRequest-uscore-mo1.json b/...Request/MedicationRequest-uscore-mo1.json → ...Request/MedicationRequest-uscore-mo1.json
diff --git a/...Request/MedicationRequest-uscore-mo2.json → ...Request/MedicationRequest-uscore-mo2.json b/...Request/MedicationRequest-uscore-mo2.json → ...Request/MedicationRequest-uscore-mo2.json
diff --git a/...ement/MedicationStatement-uscore-ms1.json → ...ement/MedicationStatement-uscore-ms1.json b/...ement/MedicationStatement-uscore-ms1.json → ...ement/MedicationStatement-uscore-ms1.json
diff --git a/...ement/MedicationStatement-uscore-ms2.json → ...ement/MedicationStatement-uscore-ms2.json b/...ement/MedicationStatement-uscore-ms2.json → ...ement/MedicationStatement-uscore-ms2.json
diff --git a/...bservation/Observation-blood-glucose.json → ...bservation/Observation-blood-glucose.json b/...bservation/Observation-blood-glucose.json → ...bservation/Observation-blood-glucose.json
diff --git a/...servation/Observation-blood-pressure.json → ...servation/Observation-blood-pressure.json b/...servation/Observation-blood-pressure.json → ...servation/Observation-blood-pressure.json
diff --git a/.../example/Observation/Observation-bmi.json → .../example/Observation/Observation-bmi.json b/.../example/Observation/Observation-bmi.json → .../example/Observation/Observation-bmi.json
diff --git a/...servation/Observation-bp-data-absent.json → ...servation/Observation-bp-data-absent.json b/...servation/Observation-bp-data-absent.json → ...servation/Observation-bp-data-absent.json
diff --git a/.../example/Observation/Observation-bun.json → .../example/Observation/Observation-bun.json b/.../example/Observation/Observation-bun.json → .../example/Observation/Observation-bun.json
diff --git a/...Observation/Observation-erythrocytes.json → ...Observation/Observation-erythrocytes.json b/...Observation/Observation-erythrocytes.json → ...Observation/Observation-erythrocytes.json
diff --git a/...ation/Observation-head-circumference.json → ...ation/Observation-head-circumference.json b/...ation/Observation-head-circumference.json → ...ation/Observation-head-circumference.json
diff --git a/...e/Observation/Observation-heart-rate.json → ...e/Observation/Observation-heart-rate.json b/...e/Observation/Observation-heart-rate.json → ...e/Observation/Observation-heart-rate.json
diff --git a/...ample/Observation/Observation-height.json → ...ample/Observation/Observation-height.json b/...ample/Observation/Observation-height.json → ...ample/Observation/Observation-height.json
diff --git a/...e/Observation/Observation-hemoglobin.json → ...e/Observation/Observation-hemoglobin.json b/...e/Observation/Observation-hemoglobin.json → ...e/Observation/Observation-hemoglobin.json
diff --git a/...ample/Observation/Observation-length.json → ...ample/Observation/Observation-length.json b/...ample/Observation/Observation-length.json → ...ample/Observation/Observation-length.json
diff --git a/...example/Observation/Observation-mchc.json → ...example/Observation/Observation-mchc.json b/...example/Observation/Observation-mchc.json → ...example/Observation/Observation-mchc.json
diff --git a/.../Observation/Observation-neutrophils.json → .../Observation/Observation-neutrophils.json b/.../Observation/Observation-neutrophils.json → .../Observation/Observation-neutrophils.json
diff --git a/...vation/Observation-oxygen-saturation.json → ...vation/Observation-oxygen-saturation.json b/...vation/Observation-oxygen-saturation.json → ...vation/Observation-oxygen-saturation.json
diff --git a/...rvation/Observation-respiratory-rate.json → ...rvation/Observation-respiratory-rate.json b/...rvation/Observation-respiratory-rate.json → ...rvation/Observation-respiratory-rate.json
diff --git a/...bservation/Observation-serum-calcium.json → ...bservation/Observation-serum-calcium.json b/...bservation/Observation-serum-calcium.json → ...bservation/Observation-serum-calcium.json
diff --git a/...servation/Observation-serum-chloride.json → ...servation/Observation-serum-chloride.json b/...servation/Observation-serum-chloride.json → ...servation/Observation-serum-chloride.json
diff --git a/...le/Observation/Observation-serum-co2.json → ...le/Observation/Observation-serum-co2.json b/...le/Observation/Observation-serum-co2.json → ...le/Observation/Observation-serum-co2.json
diff --git a/...rvation/Observation-serum-creatinine.json → ...rvation/Observation-serum-creatinine.json b/...rvation/Observation-serum-creatinine.json → ...rvation/Observation-serum-creatinine.json
diff --git a/...ervation/Observation-serum-potassium.json → ...ervation/Observation-serum-potassium.json b/...ervation/Observation-serum-potassium.json → ...ervation/Observation-serum-potassium.json
diff --git a/...Observation/Observation-serum-sodium.json → ...Observation/Observation-serum-sodium.json b/...Observation/Observation-serum-sodium.json → ...Observation/Observation-serum-sodium.json
diff --git a/...on/Observation-serum-total-bilirubin.json → ...on/Observation-serum-total-bilirubin.json b/...on/Observation-serum-total-bilirubin.json → ...on/Observation-serum-total-bilirubin.json
diff --git a/...ervation/Observation-some-day-smoker.json → ...ervation/Observation-some-day-smoker.json b/...ervation/Observation-some-day-smoker.json → ...ervation/Observation-some-day-smoker.json
diff --git a/.../Observation/Observation-temperature.json → .../Observation/Observation-temperature.json b/.../Observation/Observation-temperature.json → .../Observation/Observation-temperature.json
diff --git a/...servation/Observation-urine-bacteria.json → ...servation/Observation-urine-bacteria.json b/...servation/Observation-urine-bacteria.json → ...servation/Observation-urine-bacteria.json
diff --git a/...ervation/Observation-urine-bilirubin.json → ...ervation/Observation-urine-bilirubin.json b/...ervation/Observation-urine-bilirubin.json → ...ervation/Observation-urine-bilirubin.json
diff --git a/.../Observation/Observation-urine-cells.json → .../Observation/Observation-urine-cells.json b/.../Observation/Observation-urine-cells.json → .../Observation/Observation-urine-cells.json
diff --git a/...bservation/Observation-urine-clarity.json → ...bservation/Observation-urine-clarity.json b/...bservation/Observation-urine-clarity.json → ...bservation/Observation-urine-clarity.json
diff --git a/.../Observation/Observation-urine-color.json → .../Observation/Observation-urine-color.json b/.../Observation/Observation-urine-color.json → .../Observation/Observation-urine-color.json
diff --git a/...ervation/Observation-urine-epi-cells.json → ...ervation/Observation-urine-epi-cells.json b/...ervation/Observation-urine-epi-cells.json → ...ervation/Observation-urine-epi-cells.json
diff --git a/...bservation/Observation-urine-glucose.json → ...bservation/Observation-urine-glucose.json b/...bservation/Observation-urine-glucose.json → ...bservation/Observation-urine-glucose.json
diff --git a/...rvation/Observation-urine-hemoglobin.json → ...rvation/Observation-urine-hemoglobin.json b/...rvation/Observation-urine-hemoglobin.json → ...rvation/Observation-urine-hemoglobin.json
diff --git a/...Observation/Observation-urine-ketone.json → ...Observation/Observation-urine-ketone.json b/...Observation/Observation-urine-ketone.json → ...Observation/Observation-urine-ketone.json
diff --git a/...Observation-urine-leukocyte-esterase.json → ...Observation-urine-leukocyte-esterase.json b/...Observation-urine-leukocyte-esterase.json → ...Observation-urine-leukocyte-esterase.json
diff --git a/...bservation/Observation-urine-nitrite.json → ...bservation/Observation-urine-nitrite.json b/...bservation/Observation-urine-nitrite.json → ...bservation/Observation-urine-nitrite.json
diff --git a/...ple/Observation/Observation-urine-ph.json → ...ple/Observation/Observation-urine-ph.json b/...ple/Observation/Observation-urine-ph.json → ...ple/Observation/Observation-urine-ph.json
diff --git a/...bservation/Observation-urine-protein.json → ...bservation/Observation-urine-protein.json b/...bservation/Observation-urine-protein.json → ...bservation/Observation-urine-protein.json
diff --git a/...e/Observation/Observation-urine-rbcs.json → ...e/Observation/Observation-urine-rbcs.json b/...e/Observation/Observation-urine-rbcs.json → ...e/Observation/Observation-urine-rbcs.json
diff --git a/...servation/Observation-urine-sediment.json → ...servation/Observation-urine-sediment.json b/...servation/Observation-urine-sediment.json → ...servation/Observation-urine-sediment.json
diff --git a/...e/Observation/Observation-urine-wbcs.json → ...e/Observation/Observation-urine-wbcs.json b/...e/Observation/Observation-urine-wbcs.json → ...e/Observation/Observation-urine-wbcs.json
diff --git a/...Observation/Observation-urobilinogen.json → ...Observation/Observation-urobilinogen.json b/...Observation/Observation-urobilinogen.json → ...Observation/Observation-urobilinogen.json
diff --git a/.../example/Observation/Observation-usg.json → .../example/Observation/Observation-usg.json b/.../example/Observation/Observation-usg.json → .../example/Observation/Observation-usg.json
diff --git a/...Observation/Observation-vitals-panel.json → ...Observation/Observation-vitals-panel.json b/...Observation/Observation-vitals-panel.json → ...Observation/Observation-vitals-panel.json
diff --git a/...ample/Observation/Observation-weight.json → ...ample/Observation/Observation-weight.json b/...ample/Observation/Observation-weight.json → ...ample/Observation/Observation-weight.json
diff --git a/...e/Organization/Organization-acme-lab.json → ...e/Organization/Organization-acme-lab.json b/...e/Organization/Organization-acme-lab.json → ...e/Organization/Organization-acme-lab.json
diff --git a/.../Organization-example-organization-2.json → .../Organization-example-organization-2.json b/.../Organization-example-organization-2.json → .../Organization-example-organization-2.json
diff --git a/...n/Organization-saint-luke-w-endpoint.json → ...n/Organization-saint-luke-w-endpoint.json b/...n/Organization-saint-luke-w-endpoint.json → ...n/Organization-saint-luke-w-endpoint.json
diff --git a/...stu3/example/Patient/Patient-example.json → ...stu3/example/Patient/Patient-example.json b/...stu3/example/Patient/Patient-example.json → ...stu3/example/Patient/Patient-example.json
diff --git a/...titioner/Practitioner-practitioner-1.json → ...titioner/Practitioner-practitioner-1.json b/...titioner/Practitioner-practitioner-1.json → ...titioner/Practitioner-practitioner-1.json
diff --git a/...titioner/Practitioner-practitioner-2.json → ...titioner/Practitioner-practitioner-2.json b/...titioner/Practitioner-practitioner-2.json → ...titioner/Practitioner-practitioner-2.json
diff --git a/...u3/example/Procedure/Procedure-rehab.json → ...u3/example/Procedure/Procedure-rehab.json b/...u3/example/Procedure/Procedure-rehab.json → ...u3/example/Procedure/Procedure-rehab.json
diff --git a/.../example/ValueSet-detailed-ethnicity.json → .../example/ValueSet-detailed-ethnicity.json b/.../example/ValueSet-detailed-ethnicity.json → .../example/ValueSet-detailed-ethnicity.json
diff --git a/...dstu3/example/ValueSet-detailed-race.json → ...dstu3/example/ValueSet-detailed-race.json b/...dstu3/example/ValueSet-detailed-race.json → ...dstu3/example/ValueSet-detailed-race.json
diff --git a/...mple/ValueSet-omb-ethnicity-category.json → ...mple/ValueSet-omb-ethnicity-category.json b/...mple/ValueSet-omb-ethnicity-category.json → ...mple/ValueSet-omb-ethnicity-category.json
diff --git a/...3/example/ValueSet-omb-race-category.json → ...3/example/ValueSet-omb-race-category.json b/...3/example/ValueSet-omb-race-category.json → ...3/example/ValueSet-omb-race-category.json
diff --git a/...tu3/example/ValueSet-simple-language.json → ...tu3/example/ValueSet-simple-language.json b/...tu3/example/ValueSet-simple-language.json → ...tu3/example/ValueSet-simple-language.json
diff --git a/...eSystem/CodeSystem-careplan-category.json → ...eSystem/CodeSystem-careplan-category.json b/...eSystem/CodeSystem-careplan-category.json → ...eSystem/CodeSystem-careplan-category.json
diff --git a/...abulary/CodeSystem/CodeSystem-cdcrec.json → ...abulary/CodeSystem/CodeSystem-cdcrec.json b/...abulary/CodeSystem/CodeSystem-cdcrec.json → ...abulary/CodeSystem/CodeSystem-cdcrec.json
diff --git a/...System/CodeSystem-condition-category.json → ...System/CodeSystem-condition-category.json b/...System/CodeSystem-condition-category.json → ...System/CodeSystem-condition-category.json
diff --git a/...y/ValueSet/ValueSet-us-core-birthsex.json → ...y/ValueSet/ValueSet-us-core-birthsex.json b/...y/ValueSet/ValueSet-us-core-birthsex.json → ...y/ValueSet/ValueSet-us-core-birthsex.json
diff --git a/...eSet-us-core-careteam-provider-roles.json → ...eSet-us-core-careteam-provider-roles.json b/...eSet-us-core-careteam-provider-roles.json → ...eSet-us-core-careteam-provider-roles.json
diff --git a/.../ValueSet-us-core-condition-category.json → .../ValueSet-us-core-condition-category.json b/.../ValueSet-us-core-condition-category.json → .../ValueSet-us-core-condition-category.json
diff --git a/...bulary/ValueSet/ValueSet-us-core-cvx.json → ...bulary/ValueSet/ValueSet-us-core-cvx.json b/...bulary/ValueSet/ValueSet-us-core-cvx.json → ...bulary/ValueSet/ValueSet-us-core-cvx.json
diff --git a/...eSet/ValueSet-us-core-encounter-type.json → ...eSet/ValueSet-us-core-encounter-type.json b/...eSet/ValueSet-us-core-encounter-type.json → ...eSet/ValueSet-us-core-encounter-type.json
diff --git a/...et/ValueSet-us-core-medication-codes.json → ...et/ValueSet-us-core-medication-codes.json b/...et/ValueSet-us-core-medication-codes.json → ...et/ValueSet-us-core-medication-codes.json
diff --git a/...et/ValueSet-us-core-narrative-status.json → ...et/ValueSet-us-core-narrative-status.json b/...et/ValueSet-us-core-narrative-status.json → ...et/ValueSet-us-core-narrative-status.json
diff --git a/...t/ValueSet-us-core-ndc-vaccine-codes.json → ...t/ValueSet-us-core-ndc-vaccine-codes.json b/...t/ValueSet-us-core-ndc-vaccine-codes.json → ...t/ValueSet-us-core-ndc-vaccine-codes.json
diff --git a/...s-core-observation-ccdasmokingstatus.json → ...s-core-observation-ccdasmokingstatus.json b/...s-core-observation-ccdasmokingstatus.json → ...s-core-observation-ccdasmokingstatus.json
diff --git a/...eSet-us-core-observation-value-codes.json → ...eSet-us-core-observation-value-codes.json b/...eSet-us-core-observation-value-codes.json → ...eSet-us-core-observation-value-codes.json
diff --git a/...ry/ValueSet/ValueSet-us-core-problem.json → ...ry/ValueSet/ValueSet-us-core-problem.json b/...ry/ValueSet/ValueSet-us-core-problem.json → ...ry/ValueSet/ValueSet-us-core-problem.json
diff --git a/...eSet/ValueSet-us-core-procedure-code.json → ...eSet/ValueSet-us-core-procedure-code.json b/...eSet/ValueSet-us-core-procedure-code.json → ...eSet/ValueSet-us-core-procedure-code.json
diff --git a/.../ValueSet-us-core-procedure-icd10pcs.json → .../ValueSet-us-core-procedure-icd10pcs.json b/.../ValueSet-us-core-procedure-icd10pcs.json → .../ValueSet-us-core-procedure-icd10pcs.json
diff --git a/...ueSet/ValueSet-us-core-provider-role.json → ...ueSet/ValueSet-us-core-provider-role.json b/...ueSet/ValueSet-us-core-provider-role.json → ...ueSet/ValueSet-us-core-provider-role.json
diff --git a/.../ValueSet-us-core-provider-specialty.json → .../ValueSet-us-core-provider-specialty.json b/.../ValueSet-us-core-provider-specialty.json → .../ValueSet-us-core-provider-specialty.json
diff --git a/...Set/ValueSet-us-core-substance-ndfrt.json → ...Set/ValueSet-us-core-substance-ndfrt.json b/...Set/ValueSet-us-core-substance-ndfrt.json → ...Set/ValueSet-us-core-substance-ndfrt.json
diff --git a/...et/ValueSet-us-core-substance-rxnorm.json → ...et/ValueSet-us-core-substance-rxnorm.json b/...et/ValueSet-us-core-substance-rxnorm.json → ...et/ValueSet-us-core-substance-rxnorm.json
diff --git a/...ueSet/ValueSet-us-core-substance-sct.json → ...ueSet/ValueSet-us-core-substance-sct.json b/...ueSet/ValueSet-us-core-substance-sct.json → ...ueSet/ValueSet-us-core-substance-sct.json
diff --git a/.../ValueSet/ValueSet-us-core-substance.json → .../ValueSet/ValueSet-us-core-substance.json b/.../ValueSet/ValueSet-us-core-substance.json → .../ValueSet/ValueSet-us-core-substance.json
diff --git a/...ary/ValueSet/valueset-marital-status.json → ...ary/ValueSet/valueset-marital-status.json b/...ary/ValueSet/valueset-marital-status.json → ...ary/ValueSet/valueset-marital-status.json
diff --git a/...est/resources/options/FluentFunctions.cql → ...est/resources/options/FluentFunctions.cql b/...est/resources/options/FluentFunctions.cql → ...est/resources/options/FluentFunctions.cql
diff --git a/...c/test/resources/options/cql-options.json → ...c/test/resources/options/cql-options.json b/...c/test/resources/options/cql-options.json → ...c/test/resources/options/cql-options.json
diff --git a/...ions/example/Patient/Patient-example.json → ...ions/example/Patient/Patient-example.json b/...ions/example/Patient/Patient-example.json → ...ions/example/Patient/Patient-example.json
diff --git a/...ocabulary/ValueSet/ValueSet-birthsex.json → ...ocabulary/ValueSet/ValueSet-birthsex.json b/...ocabulary/ValueSet/ValueSet-birthsex.json → ...ocabulary/ValueSet/ValueSet-birthsex.json
diff --git a/...ValueSet/ValueSet-detailed-ethnicity.json → ...ValueSet/ValueSet-detailed-ethnicity.json b/...ValueSet/ValueSet-detailed-ethnicity.json → ...ValueSet/ValueSet-detailed-ethnicity.json
diff --git a/...lary/ValueSet/ValueSet-detailed-race.json → ...lary/ValueSet/ValueSet-detailed-race.json b/...lary/ValueSet/ValueSet-detailed-race.json → ...lary/ValueSet/ValueSet-detailed-race.json
diff --git a/...eSet/ValueSet-omb-ethnicity-category.json → ...eSet/ValueSet-omb-ethnicity-category.json b/...eSet/ValueSet-omb-ethnicity-category.json → ...eSet/ValueSet-omb-ethnicity-category.json
diff --git a/.../ValueSet/ValueSet-omb-race-category.json → .../ValueSet/ValueSet-omb-race-category.json b/.../ValueSet/ValueSet-omb-race-category.json → .../ValueSet/ValueSet-omb-race-category.json
diff --git a/...ary/ValueSet/valueset-marital-status.json → ...ary/ValueSet/valueset-marital-status.json b/...ary/ValueSet/valueset-marital-status.json → ...ary/ValueSet/valueset-marital-status.json
diff --git a/...ources/optionsFailure/FluentFunctions.cql → ...ources/optionsFailure/FluentFunctions.cql b/...ources/optionsFailure/FluentFunctions.cql → ...ources/optionsFailure/FluentFunctions.cql
diff --git a/...resources/optionsFailure/cql-options.json → ...resources/optionsFailure/cql-options.json b/...resources/optionsFailure/cql-options.json → ...resources/optionsFailure/cql-options.json
diff --git a/...lure/example/Patient/Patient-example.json → ...lure/example/Patient/Patient-example.json b/...lure/example/Patient/Patient-example.json → ...lure/example/Patient/Patient-example.json
diff --git a/...ocabulary/ValueSet/ValueSet-birthsex.json → ...ocabulary/ValueSet/ValueSet-birthsex.json b/...ocabulary/ValueSet/ValueSet-birthsex.json → ...ocabulary/ValueSet/ValueSet-birthsex.json
diff --git a/...ValueSet/ValueSet-detailed-ethnicity.json → ...ValueSet/ValueSet-detailed-ethnicity.json b/...ValueSet/ValueSet-detailed-ethnicity.json → ...ValueSet/ValueSet-detailed-ethnicity.json
diff --git a/...lary/ValueSet/ValueSet-detailed-race.json → ...lary/ValueSet/ValueSet-detailed-race.json b/...lary/ValueSet/ValueSet-detailed-race.json → ...lary/ValueSet/ValueSet-detailed-race.json
diff --git a/...eSet/ValueSet-omb-ethnicity-category.json → ...eSet/ValueSet-omb-ethnicity-category.json b/...eSet/ValueSet-omb-ethnicity-category.json → ...eSet/ValueSet-omb-ethnicity-category.json
diff --git a/.../ValueSet/ValueSet-omb-race-category.json → .../ValueSet/ValueSet-omb-race-category.json b/.../ValueSet/ValueSet-omb-race-category.json → .../ValueSet/ValueSet-omb-race-category.json
diff --git a/...ary/ValueSet/valueset-marital-status.json → ...ary/ValueSet/valueset-marital-status.json b/...ary/ValueSet/valueset-marital-status.json → ...ary/ValueSet/valueset-marital-status.json
diff --git a/...tOutpatientEncounters_QICore4-2.0.000.cql → ...tOutpatientEncounters_QICore4-2.0.000.cql b/...tOutpatientEncounters_QICore4-2.0.000.cql → ...tOutpatientEncounters_QICore4-2.0.000.cql
diff --git a/...ssandFrailtyExclusion_QICore4-5.0.000.cql → ...ssandFrailtyExclusion_QICore4-5.0.000.cql b/...ssandFrailtyExclusion_QICore4-5.0.000.cql → ...ssandFrailtyExclusion_QICore4-5.0.000.cql
diff --git a/...sources/qicore/EXM124_QICore4-8.2.000.cql → ...sources/qicore/EXM124_QICore4-8.2.000.cql b/...sources/qicore/EXM124_QICore4-8.2.000.cql → ...sources/qicore/EXM124_QICore4-8.2.000.cql
diff --git a/...sources/qicore/EXM165_QICore4-8.5.000.cql → ...sources/qicore/EXM165_QICore4-8.5.000.cql b/...sources/qicore/EXM165_QICore4-8.5.000.cql → ...sources/qicore/EXM165_QICore4-8.5.000.cql
diff --git a/...ources/qicore/Hospice_QICore4-2.0.000.cql → ...ources/qicore/Hospice_QICore4-2.0.000.cql b/...ources/qicore/Hospice_QICore4-2.0.000.cql → ...ources/qicore/Hospice_QICore4-2.0.000.cql
diff --git a/...GlobalCommonFunctions_QICore4-5.0.000.cql → ...GlobalCommonFunctions_QICore4-5.0.000.cql b/...GlobalCommonFunctions_QICore4-5.0.000.cql → ...GlobalCommonFunctions_QICore4-5.0.000.cql
diff --git a/...upplementalDataElements_QICore4-2.0.0.cql → ...upplementalDataElements_QICore4-2.0.0.cql b/...upplementalDataElements_QICore4-2.0.0.cql → ...upplementalDataElements_QICore4-2.0.0.cql
diff --git a/...ces/qicore/TJCOverall_QICore4-5.0.000.cql → ...ces/qicore/TJCOverall_QICore4-5.0.000.cql b/...ces/qicore/TJCOverall_QICore4-5.0.000.cql → ...ces/qicore/TJCOverall_QICore4-5.0.000.cql
diff --git a/.../src/test/resources/qicore/TestQICore.cql → .../src/test/resources/qicore/TestQICore.cql b/.../src/test/resources/qicore/TestQICore.cql → .../src/test/resources/qicore/TestQICore.cql
diff --git a/...sources/qicore/VTEICU_QICore4-4.0.000.cql → ...sources/qicore/VTEICU_QICore4-4.0.000.cql b/...sources/qicore/VTEICU_QICore4-4.0.000.cql → ...sources/qicore/VTEICU_QICore4-4.0.000.cql
diff --git a/...enom-EXM124/Encounter/denom-EXM124-1.json → ...enom-EXM124/Encounter/denom-EXM124-1.json b/...enom-EXM124/Encounter/denom-EXM124-1.json → ...enom-EXM124/Encounter/denom-EXM124-1.json
diff --git a/...om-EXM124/Observation/denom-EXM124-2.json → ...om-EXM124/Observation/denom-EXM124-2.json b/...om-EXM124/Observation/denom-EXM124-2.json → ...om-EXM124/Observation/denom-EXM124-2.json
diff --git a/...re/denom-EXM124/Patient/denom-EXM124.json → ...re/denom-EXM124/Patient/denom-EXM124.json b/...re/denom-EXM124/Patient/denom-EXM124.json → ...re/denom-EXM124/Patient/denom-EXM124.json
diff --git a/...le/AdverseEvent/AdverseEvent-example.json → ...le/AdverseEvent/AdverseEvent-example.json b/...le/AdverseEvent/AdverseEvent-example.json → ...le/AdverseEvent/AdverseEvent-example.json
diff --git a/...e/AllergyIntolerance-example-refuted.json → ...e/AllergyIntolerance-example-refuted.json b/...e/AllergyIntolerance-example-refuted.json → ...e/AllergyIntolerance-example-refuted.json
diff --git a/...tolerance/AllergyIntolerance-example.json → ...tolerance/AllergyIntolerance-example.json b/...tolerance/AllergyIntolerance-example.json → ...tolerance/AllergyIntolerance-example.json
diff --git a/.../BodyStructure/BodyStructure-example.json → .../BodyStructure/BodyStructure-example.json b/.../BodyStructure/BodyStructure-example.json → .../BodyStructure/BodyStructure-example.json
diff --git a/...xample/CarePlan/CarePlan-colonoscopy.json → ...xample/CarePlan/CarePlan-colonoscopy.json b/...xample/CarePlan/CarePlan-colonoscopy.json → ...xample/CarePlan/CarePlan-colonoscopy.json
diff --git a/...re/example/CarePlan/CarePlan-example.json → ...re/example/CarePlan/CarePlan-example.json b/...re/example/CarePlan/CarePlan-example.json → ...re/example/CarePlan/CarePlan-example.json
diff --git a/...re/example/CareTeam/CareTeam-example.json → ...re/example/CareTeam/CareTeam-example.json b/...re/example/CareTeam/CareTeam-example.json → ...re/example/CareTeam/CareTeam-example.json
diff --git a/...s/qicore/example/Claim/Claim-example.json → ...s/qicore/example/Claim/Claim-example.json b/...s/qicore/example/Claim/Claim-example.json → ...s/qicore/example/Claim/Claim-example.json
diff --git a/.../Communication/Communication-example.json → .../Communication/Communication-example.json b/.../Communication/Communication-example.json → .../Communication/Communication-example.json
diff --git a/...ation/Communication-negation-example.json → ...ation/Communication-negation-example.json b/...ation/Communication-negation-example.json → ...ation/Communication-negation-example.json
diff --git a/...Request/CommunicationRequest-example.json → ...Request/CommunicationRequest-example.json b/...Request/CommunicationRequest-example.json → ...Request/CommunicationRequest-example.json
diff --git a/...ition/Condition-appendicitis-example.json → ...ition/Condition-appendicitis-example.json b/...ition/Condition-appendicitis-example.json → ...ition/Condition-appendicitis-example.json
diff --git a/.../example/Condition/Condition-example.json → .../example/Condition/Condition-example.json b/.../example/Condition/Condition-example.json → .../example/Condition/Condition-example.json
diff --git a/...core/example/Condition/Condition-hc1.json → ...core/example/Condition/Condition-hc1.json b/...core/example/Condition/Condition-hc1.json → ...core/example/Condition/Condition-hc1.json
diff --git a/...re/example/Coverage/Coverage-example.json → ...re/example/Coverage/Coverage-example.json b/...re/example/Coverage/Coverage-example.json → ...re/example/Coverage/Coverage-example.json
diff --git a/...qicore/example/Device/Device-example.json → ...qicore/example/Device/Device-example.json b/...qicore/example/Device/Device-example.json → ...qicore/example/Device/Device-example.json
diff --git a/...s/qicore/example/Device/Device-udi-1.json → ...s/qicore/example/Device/Device-udi-1.json b/...s/qicore/example/Device/Device-udi-1.json → ...s/qicore/example/Device/Device-udi-1.json
diff --git a/...s/qicore/example/Device/Device-udi-2.json → ...s/qicore/example/Device/Device-udi-2.json b/...s/qicore/example/Device/Device-udi-2.json → ...s/qicore/example/Device/Device-udi-2.json
diff --git a/...s/qicore/example/Device/Device-udi-3.json → ...s/qicore/example/Device/Device-udi-3.json b/...s/qicore/example/Device/Device-udi-3.json → ...s/qicore/example/Device/Device-udi-3.json
diff --git a/.../DeviceRequest/DeviceRequest-example.json → .../DeviceRequest/DeviceRequest-example.json b/.../DeviceRequest/DeviceRequest-example.json → .../DeviceRequest/DeviceRequest-example.json
diff --git a/...quest/DeviceRequest-negation-example.json → ...quest/DeviceRequest-negation-example.json b/...quest/DeviceRequest-negation-example.json → ...quest/DeviceRequest-negation-example.json
diff --git a/...ceRequest-negation-with-code-example.json → ...ceRequest-negation-with-code-example.json b/...ceRequest-negation-with-code-example.json → ...ceRequest-negation-with-code-example.json
diff --git a/...Statement/DeviceUseStatement-example.json → ...Statement/DeviceUseStatement-example.json b/...Statement/DeviceUseStatement-example.json → ...Statement/DeviceUseStatement-example.json
diff --git a/...t/DiagnosticReport-cardiology-report.json → ...t/DiagnosticReport-cardiology-report.json b/...t/DiagnosticReport-cardiology-report.json → ...t/DiagnosticReport-cardiology-report.json
diff --git a/...iagnosticReport/DiagnosticReport-cbc.json → ...iagnosticReport/DiagnosticReport-cbc.json b/...iagnosticReport/DiagnosticReport-cbc.json → ...iagnosticReport/DiagnosticReport-cbc.json
diff --git a/...t/DiagnosticReport-chest-xray-report.json → ...t/DiagnosticReport-chest-xray-report.json b/...t/DiagnosticReport-chest-xray-report.json → ...t/DiagnosticReport-chest-xray-report.json
diff --git a/...osticReport/DiagnosticReport-example.json → ...osticReport/DiagnosticReport-example.json b/...osticReport/DiagnosticReport-example.json → ...osticReport/DiagnosticReport-example.json
diff --git a/...ort/DiagnosticReport-metabolic-panel.json → ...ort/DiagnosticReport-metabolic-panel.json b/...ort/DiagnosticReport-metabolic-panel.json → ...ort/DiagnosticReport-metabolic-panel.json
diff --git a/...Report/DiagnosticReport-note-example.json → ...Report/DiagnosticReport-note-example.json b/...Report/DiagnosticReport-note-example.json → ...Report/DiagnosticReport-note-example.json
diff --git a/...icReport/DiagnosticReport-urinalysis.json → ...icReport/DiagnosticReport-urinalysis.json b/...icReport/DiagnosticReport-urinalysis.json → ...icReport/DiagnosticReport-urinalysis.json
diff --git a/...ce/DocumentReference-episode-summary.json → ...ce/DocumentReference-episode-summary.json b/...ce/DocumentReference-episode-summary.json → ...ce/DocumentReference-episode-summary.json
diff --git a/...ore/example/Encounter/Encounter-1036.json → ...ore/example/Encounter/Encounter-1036.json b/...ore/example/Encounter/Encounter-1036.json → ...ore/example/Encounter/Encounter-1036.json
diff --git a/...xample/Encounter/Encounter-example-1.json → ...xample/Encounter/Encounter-example-1.json b/...xample/Encounter/Encounter-example-1.json → ...xample/Encounter/Encounter-example-1.json
diff --git a/.../example/Encounter/Encounter-example.json → .../example/Encounter/Encounter-example.json b/.../example/Encounter/Encounter-example.json → .../example/Encounter/Encounter-example.json
diff --git a/...rHistory/FamilyMemberHistory-example.json → ...rHistory/FamilyMemberHistory-example.json b/...rHistory/FamilyMemberHistory-example.json → ...rHistory/FamilyMemberHistory-example.json
diff --git a/...ces/qicore/example/Flag/Flag-example.json → ...ces/qicore/example/Flag/Flag-example.json b/...ces/qicore/example/Flag/Flag-example.json → ...ces/qicore/example/Flag/Flag-example.json
diff --git a/...ces/qicore/example/Goal/Goal-example.json → ...ces/qicore/example/Goal/Goal-example.json b/...ces/qicore/example/Goal/Goal-example.json → ...ces/qicore/example/Goal/Goal-example.json
diff --git a/...rces/qicore/example/Goal/Goal-goal-1.json → ...rces/qicore/example/Goal/Goal-goal-1.json b/...rces/qicore/example/Goal/Goal-goal-1.json → ...rces/qicore/example/Goal/Goal-goal-1.json
diff --git a/...le/ImagingStudy/ImagingStudy-example.json → ...le/ImagingStudy/ImagingStudy-example.json b/...le/ImagingStudy/ImagingStudy-example.json → ...le/ImagingStudy/ImagingStudy-example.json
diff --git a/...le/Immunization/Immunization-example.json → ...le/Immunization/Immunization-example.json b/...le/Immunization/Immunization-example.json → ...le/Immunization/Immunization-example.json
diff --git a/...mple/Immunization/Immunization-imm-1.json → ...mple/Immunization/Immunization-imm-1.json b/...mple/Immunization/Immunization-imm-1.json → ...mple/Immunization/Immunization-imm-1.json
diff --git a/...n/Immunization-negation-example-code.json → ...n/Immunization-negation-example-code.json b/...n/Immunization-negation-example-code.json → ...n/Immunization-negation-example-code.json
diff --git a/...zation/Immunization-negation-example.json → ...zation/Immunization-negation-example.json b/...zation/Immunization-negation-example.json → ...zation/Immunization-negation-example.json
diff --git a/...ation/ImmunizationEvaluation-example.json → ...ation/ImmunizationEvaluation-example.json b/...ation/ImmunizationEvaluation-example.json → ...ation/ImmunizationEvaluation-example.json
diff --git a/...n/ImmunizationRecommendation-example.json → ...n/ImmunizationRecommendation-example.json b/...n/ImmunizationRecommendation-example.json → ...n/ImmunizationRecommendation-example.json
diff --git a/...plementationGuide-hl7.fhir.us.qicore.json → ...plementationGuide-hl7.fhir.us.qicore.json b/...plementationGuide-hl7.fhir.us.qicore.json → ...plementationGuide-hl7.fhir.us.qicore.json
diff --git a/...re/example/Location/Location-example.json → ...re/example/Location/Location-example.json b/...re/example/Location/Location-example.json → ...re/example/Location/Location-example.json
diff --git a/...re/example/Location/Location-hl7east.json → ...re/example/Location/Location-hl7east.json b/...re/example/Location/Location-hl7east.json → ...re/example/Location/Location-hl7east.json
diff --git a/...xample/Medication/Medication-example.json → ...xample/Medication/Medication-example.json b/...xample/Medication/Medication-example.json → ...xample/Medication/Medication-example.json
diff --git a/...le/Medication/Medication-uscore-med1.json → ...le/Medication/Medication-uscore-med1.json b/...le/Medication/Medication-uscore-med1.json → ...le/Medication/Medication-uscore-med1.json
diff --git a/...le/Medication/Medication-uscore-med2.json → ...le/Medication/Medication-uscore-med2.json b/...le/Medication/Medication-uscore-med2.json → ...le/Medication/Medication-uscore-med2.json
diff --git a/...ion/MedicationAdministration-example.json → ...ion/MedicationAdministration-example.json b/...ion/MedicationAdministration-example.json → ...ion/MedicationAdministration-example.json
diff --git a/...ationAdministration-negation-example.json → ...ationAdministration-negation-example.json b/...ationAdministration-negation-example.json → ...ationAdministration-negation-example.json
diff --git a/...istration-negation-with-code-example.json → ...istration-negation-with-code-example.json b/...istration-negation-with-code-example.json → ...istration-negation-with-code-example.json
diff --git a/...nDispense/MedicationDispense-example.json → ...nDispense/MedicationDispense-example.json b/...nDispense/MedicationDispense-example.json → ...nDispense/MedicationDispense-example.json
diff --git a/.../MedicationDispense-negation-example.json → .../MedicationDispense-negation-example.json b/.../MedicationDispense-negation-example.json → .../MedicationDispense-negation-example.json
diff --git a/...nDispense-negation-with-code-example.json → ...nDispense-negation-with-code-example.json b/...nDispense-negation-with-code-example.json → ...nDispense-negation-with-code-example.json
diff --git a/...equest/MedicationRequest-cmd-example.json → ...equest/MedicationRequest-cmd-example.json b/...equest/MedicationRequest-cmd-example.json → ...equest/MedicationRequest-cmd-example.json
diff --git a/...ionRequest/MedicationRequest-example.json → ...ionRequest/MedicationRequest-example.json b/...ionRequest/MedicationRequest-example.json → ...ionRequest/MedicationRequest-example.json
diff --git a/...icationRequest-negation-example-code.json → ...icationRequest-negation-example-code.json b/...icationRequest-negation-example-code.json → ...icationRequest-negation-example-code.json
diff --git a/...t/MedicationRequest-negation-example.json → ...t/MedicationRequest-negation-example.json b/...t/MedicationRequest-negation-example.json → ...t/MedicationRequest-negation-example.json
diff --git a/...quest/MedicationRequest-self-tylenol.json → ...quest/MedicationRequest-self-tylenol.json b/...quest/MedicationRequest-self-tylenol.json → ...quest/MedicationRequest-self-tylenol.json
diff --git a/...Request/MedicationRequest-uscore-mo1.json → ...Request/MedicationRequest-uscore-mo1.json b/...Request/MedicationRequest-uscore-mo1.json → ...Request/MedicationRequest-uscore-mo1.json
diff --git a/...Request/MedicationRequest-uscore-mo2.json → ...Request/MedicationRequest-uscore-mo2.json b/...Request/MedicationRequest-uscore-mo2.json → ...Request/MedicationRequest-uscore-mo2.json
diff --git a/...tatement/MedicationStatement-example.json → ...tatement/MedicationStatement-example.json b/...tatement/MedicationStatement-example.json → ...tatement/MedicationStatement-example.json
diff --git a/...utritionOrder/NutritionOrder-example.json → ...utritionOrder/NutritionOrder-example.json b/...utritionOrder/NutritionOrder-example.json → ...utritionOrder/NutritionOrder-example.json
diff --git a/...bservation/Observation-blood-glucose.json → ...bservation/Observation-blood-glucose.json b/...bservation/Observation-blood-glucose.json → ...bservation/Observation-blood-glucose.json
diff --git a/...servation/Observation-blood-pressure.json → ...servation/Observation-blood-pressure.json b/...servation/Observation-blood-pressure.json → ...servation/Observation-blood-pressure.json
diff --git a/.../example/Observation/Observation-bmi.json → .../example/Observation/Observation-bmi.json b/.../example/Observation/Observation-bmi.json → .../example/Observation/Observation-bmi.json
diff --git a/...servation/Observation-bp-data-absent.json → ...servation/Observation-bp-data-absent.json b/...servation/Observation-bp-data-absent.json → ...servation/Observation-bp-data-absent.json
diff --git a/.../example/Observation/Observation-bun.json → .../example/Observation/Observation-bun.json b/.../example/Observation/Observation-bun.json → .../example/Observation/Observation-bun.json
diff --git a/...Observation/Observation-erythrocytes.json → ...Observation/Observation-erythrocytes.json b/...Observation/Observation-erythrocytes.json → ...Observation/Observation-erythrocytes.json
diff --git a/...mple/Observation/Observation-example.json → ...mple/Observation/Observation-example.json b/...mple/Observation/Observation-example.json → ...mple/Observation/Observation-example.json
diff --git a/...ation/Observation-head-circumference.json → ...ation/Observation-head-circumference.json b/...ation/Observation-head-circumference.json → ...ation/Observation-head-circumference.json
diff --git a/...e/Observation/Observation-heart-rate.json → ...e/Observation/Observation-heart-rate.json b/...e/Observation/Observation-heart-rate.json → ...e/Observation/Observation-heart-rate.json
diff --git a/...ample/Observation/Observation-height.json → ...ample/Observation/Observation-height.json b/...ample/Observation/Observation-height.json → ...ample/Observation/Observation-height.json
diff --git a/...e/Observation/Observation-hemoglobin.json → ...e/Observation/Observation-hemoglobin.json b/...e/Observation/Observation-hemoglobin.json → ...e/Observation/Observation-hemoglobin.json
diff --git a/...ample/Observation/Observation-length.json → ...ample/Observation/Observation-length.json b/...ample/Observation/Observation-length.json → ...ample/Observation/Observation-length.json
diff --git a/...example/Observation/Observation-mchc.json → ...example/Observation/Observation-mchc.json b/...example/Observation/Observation-mchc.json → ...example/Observation/Observation-mchc.json
diff --git a/...rvation/Observation-negation-example.json → ...rvation/Observation-negation-example.json b/...rvation/Observation-negation-example.json → ...rvation/Observation-negation-example.json
diff --git a/...servation-negation-with-code-example.json → ...servation-negation-with-code-example.json b/...servation-negation-with-code-example.json → ...servation-negation-with-code-example.json
diff --git a/.../Observation/Observation-neutrophils.json → .../Observation/Observation-neutrophils.json b/.../Observation/Observation-neutrophils.json → .../Observation/Observation-neutrophils.json
diff --git a/...vation/Observation-oxygen-saturation.json → ...vation/Observation-oxygen-saturation.json b/...vation/Observation-oxygen-saturation.json → ...vation/Observation-oxygen-saturation.json
diff --git a/...on/Observation-pediatric-bmi-example.json → ...on/Observation-pediatric-bmi-example.json b/...on/Observation-pediatric-bmi-example.json → ...on/Observation-pediatric-bmi-example.json
diff --git a/...ion/Observation-pediatric-wt-example.json → ...ion/Observation-pediatric-wt-example.json b/...ion/Observation-pediatric-wt-example.json → ...ion/Observation-pediatric-wt-example.json
diff --git a/...rvation/Observation-respiratory-rate.json → ...rvation/Observation-respiratory-rate.json b/...rvation/Observation-respiratory-rate.json → ...rvation/Observation-respiratory-rate.json
diff --git a/...e/Observation/Observation-satO2-fiO2.json → ...e/Observation/Observation-satO2-fiO2.json b/...e/Observation/Observation-satO2-fiO2.json → ...e/Observation/Observation-satO2-fiO2.json
diff --git a/...bservation/Observation-serum-calcium.json → ...bservation/Observation-serum-calcium.json b/...bservation/Observation-serum-calcium.json → ...bservation/Observation-serum-calcium.json
diff --git a/...servation/Observation-serum-chloride.json → ...servation/Observation-serum-chloride.json b/...servation/Observation-serum-chloride.json → ...servation/Observation-serum-chloride.json
diff --git a/...le/Observation/Observation-serum-co2.json → ...le/Observation/Observation-serum-co2.json b/...le/Observation/Observation-serum-co2.json → ...le/Observation/Observation-serum-co2.json
diff --git a/...rvation/Observation-serum-creatinine.json → ...rvation/Observation-serum-creatinine.json b/...rvation/Observation-serum-creatinine.json → ...rvation/Observation-serum-creatinine.json
diff --git a/...ervation/Observation-serum-potassium.json → ...ervation/Observation-serum-potassium.json b/...ervation/Observation-serum-potassium.json → ...ervation/Observation-serum-potassium.json
diff --git a/...Observation/Observation-serum-sodium.json → ...Observation/Observation-serum-sodium.json b/...Observation/Observation-serum-sodium.json → ...Observation/Observation-serum-sodium.json
diff --git a/...on/Observation-serum-total-bilirubin.json → ...on/Observation-serum-total-bilirubin.json b/...on/Observation-serum-total-bilirubin.json → ...on/Observation-serum-total-bilirubin.json
diff --git a/...ervation/Observation-some-day-smoker.json → ...ervation/Observation-some-day-smoker.json b/...ervation/Observation-some-day-smoker.json → ...ervation/Observation-some-day-smoker.json
diff --git a/.../Observation/Observation-temperature.json → .../Observation/Observation-temperature.json b/.../Observation/Observation-temperature.json → .../Observation/Observation-temperature.json
diff --git a/...servation/Observation-urine-bacteria.json → ...servation/Observation-urine-bacteria.json b/...servation/Observation-urine-bacteria.json → ...servation/Observation-urine-bacteria.json
diff --git a/...ervation/Observation-urine-bilirubin.json → ...ervation/Observation-urine-bilirubin.json b/...ervation/Observation-urine-bilirubin.json → ...ervation/Observation-urine-bilirubin.json
diff --git a/.../Observation/Observation-urine-cells.json → .../Observation/Observation-urine-cells.json b/.../Observation/Observation-urine-cells.json → .../Observation/Observation-urine-cells.json
diff --git a/...bservation/Observation-urine-clarity.json → ...bservation/Observation-urine-clarity.json b/...bservation/Observation-urine-clarity.json → ...bservation/Observation-urine-clarity.json
diff --git a/.../Observation/Observation-urine-color.json → .../Observation/Observation-urine-color.json b/.../Observation/Observation-urine-color.json → .../Observation/Observation-urine-color.json
diff --git a/...ervation/Observation-urine-epi-cells.json → ...ervation/Observation-urine-epi-cells.json b/...ervation/Observation-urine-epi-cells.json → ...ervation/Observation-urine-epi-cells.json
diff --git a/...bservation/Observation-urine-glucose.json → ...bservation/Observation-urine-glucose.json b/...bservation/Observation-urine-glucose.json → ...bservation/Observation-urine-glucose.json
diff --git a/...rvation/Observation-urine-hemoglobin.json → ...rvation/Observation-urine-hemoglobin.json b/...rvation/Observation-urine-hemoglobin.json → ...rvation/Observation-urine-hemoglobin.json
diff --git a/...Observation/Observation-urine-ketone.json → ...Observation/Observation-urine-ketone.json b/...Observation/Observation-urine-ketone.json → ...Observation/Observation-urine-ketone.json
diff --git a/...Observation-urine-leukocyte-esterase.json → ...Observation-urine-leukocyte-esterase.json b/...Observation-urine-leukocyte-esterase.json → ...Observation-urine-leukocyte-esterase.json
diff --git a/...bservation/Observation-urine-nitrite.json → ...bservation/Observation-urine-nitrite.json b/...bservation/Observation-urine-nitrite.json → ...bservation/Observation-urine-nitrite.json
diff --git a/...ple/Observation/Observation-urine-ph.json → ...ple/Observation/Observation-urine-ph.json b/...ple/Observation/Observation-urine-ph.json → ...ple/Observation/Observation-urine-ph.json
diff --git a/...bservation/Observation-urine-protein.json → ...bservation/Observation-urine-protein.json b/...bservation/Observation-urine-protein.json → ...bservation/Observation-urine-protein.json
diff --git a/...e/Observation/Observation-urine-rbcs.json → ...e/Observation/Observation-urine-rbcs.json b/...e/Observation/Observation-urine-rbcs.json → ...e/Observation/Observation-urine-rbcs.json
diff --git a/...servation/Observation-urine-sediment.json → ...servation/Observation-urine-sediment.json b/...servation/Observation-urine-sediment.json → ...servation/Observation-urine-sediment.json
diff --git a/...e/Observation/Observation-urine-wbcs.json → ...e/Observation/Observation-urine-wbcs.json b/...e/Observation/Observation-urine-wbcs.json → ...e/Observation/Observation-urine-wbcs.json
diff --git a/...Observation/Observation-urobilinogen.json → ...Observation/Observation-urobilinogen.json b/...Observation/Observation-urobilinogen.json → ...Observation/Observation-urobilinogen.json
diff --git a/.../example/Observation/Observation-usg.json → .../example/Observation/Observation-usg.json b/.../example/Observation/Observation-usg.json → .../example/Observation/Observation-usg.json
diff --git a/...Observation/Observation-vitals-panel.json → ...Observation/Observation-vitals-panel.json b/...Observation/Observation-vitals-panel.json → ...Observation/Observation-vitals-panel.json
diff --git a/...ample/Observation/Observation-weight.json → ...ample/Observation/Observation-weight.json b/...ample/Observation/Observation-weight.json → ...ample/Observation/Observation-weight.json
diff --git a/...e/Organization/Organization-acme-lab.json → ...e/Organization/Organization-acme-lab.json b/...e/Organization/Organization-acme-lab.json → ...e/Organization/Organization-acme-lab.json
diff --git a/.../Organization-example-organization-2.json → .../Organization-example-organization-2.json b/.../Organization-example-organization-2.json → .../Organization-example-organization-2.json
diff --git a/...le/Organization/Organization-example.json → ...le/Organization/Organization-example.json b/...le/Organization/Organization-example.json → ...le/Organization/Organization-example.json
diff --git a/...n/Organization-saint-luke-w-endpoint.json → ...n/Organization-saint-luke-w-endpoint.json b/...n/Organization-saint-luke-w-endpoint.json → ...n/Organization-saint-luke-w-endpoint.json
diff --git a/...core/example/Patient/Patient-example.json → ...core/example/Patient/Patient-example.json b/...core/example/Patient/Patient-example.json → ...core/example/Patient/Patient-example.json
diff --git a/...le/Practitioner/Practitioner-example.json → ...le/Practitioner/Practitioner-example.json b/...le/Practitioner/Practitioner-example.json → ...le/Practitioner/Practitioner-example.json
diff --git a/...titioner/Practitioner-practitioner-1.json → ...titioner/Practitioner-practitioner-1.json b/...titioner/Practitioner-practitioner-1.json → ...titioner/Practitioner-practitioner-1.json
diff --git a/...titioner/Practitioner-practitioner-2.json → ...titioner/Practitioner-practitioner-2.json b/...titioner/Practitioner-practitioner-2.json → ...titioner/Practitioner-practitioner-2.json
diff --git a/...itionerRole/PractitionerRole-example.json → ...itionerRole/PractitionerRole-example.json b/...itionerRole/PractitionerRole-example.json → ...itionerRole/PractitionerRole-example.json
diff --git a/...le/Procedure/Procedure-defib-implant.json → ...le/Procedure/Procedure-defib-implant.json b/...le/Procedure/Procedure-defib-implant.json → ...le/Procedure/Procedure-defib-implant.json
diff --git a/.../example/Procedure/Procedure-example.json → .../example/Procedure/Procedure-example.json b/.../example/Procedure/Procedure-example.json → .../example/Procedure/Procedure-example.json
diff --git a/...Procedure/Procedure-negation-example.json → ...Procedure/Procedure-negation-example.json b/...Procedure/Procedure-negation-example.json → ...Procedure/Procedure-negation-example.json
diff --git a/...Procedure-negation-with-code-example.json → ...Procedure-negation-with-code-example.json b/...Procedure-negation-with-code-example.json → ...Procedure-negation-with-code-example.json
diff --git a/...re/example/Procedure/Procedure-rehab.json → ...re/example/Procedure/Procedure-rehab.json b/...re/example/Procedure/Procedure-rehab.json → ...re/example/Procedure/Procedure-rehab.json
diff --git a/.../RelatedPerson/RelatedPerson-example.json → .../RelatedPerson/RelatedPerson-example.json b/.../RelatedPerson/RelatedPerson-example.json → .../RelatedPerson/RelatedPerson-example.json
diff --git a/...rviceRequest-appropriateness-example.json → ...rviceRequest-appropriateness-example.json b/...rviceRequest-appropriateness-example.json → ...rviceRequest-appropriateness-example.json
diff --git a/...uest/ServiceRequest-elective-example.json → ...uest/ServiceRequest-elective-example.json b/...uest/ServiceRequest-elective-example.json → ...uest/ServiceRequest-elective-example.json
diff --git a/...erviceRequest/ServiceRequest-example.json → ...erviceRequest/ServiceRequest-example.json b/...erviceRequest/ServiceRequest-example.json → ...erviceRequest/ServiceRequest-example.json
diff --git a/...ServiceRequest-negation-example-code.json → ...ServiceRequest-negation-example-code.json b/...ServiceRequest-negation-example-code.json → ...ServiceRequest-negation-example-code.json
diff --git a/...uest/ServiceRequest-negation-example.json → ...uest/ServiceRequest-negation-example.json b/...uest/ServiceRequest-negation-example.json → ...uest/ServiceRequest-negation-example.json
diff --git a/...uest/ServiceRequest-referral-example.json → ...uest/ServiceRequest-referral-example.json b/...uest/ServiceRequest-referral-example.json → ...uest/ServiceRequest-referral-example.json
diff --git a/...re/example/Specimen/Specimen-example.json → ...re/example/Specimen/Specimen-example.json b/...re/example/Specimen/Specimen-example.json → ...re/example/Specimen/Specimen-example.json
diff --git a/.../example/Substance/Substance-example.json → .../example/Substance/Substance-example.json b/.../example/Substance/Substance-example.json → .../example/Substance/Substance-example.json
diff --git a/...ces/qicore/example/Task/Task-example.json → ...ces/qicore/example/Task/Task-example.json b/...ces/qicore/example/Task/Task-example.json → ...ces/qicore/example/Task/Task-example.json
diff --git a/...e/example/Task/Task-negation-example.json → ...e/example/Task/Task-negation-example.json b/...e/example/Task/Task-negation-example.json → ...e/example/Task/Task-negation-example.json
diff --git a/...Task/Task-negation-with-code-example.json → ...Task/Task-negation-with-code-example.json b/...Task/Task-negation-with-code-example.json → ...Task/Task-negation-with-code-example.json
diff --git a/...umer-EXM124/Encounter/numer-EXM124-1.json → ...umer-EXM124/Encounter/numer-EXM124-1.json b/...umer-EXM124/Encounter/numer-EXM124-1.json → ...umer-EXM124/Encounter/numer-EXM124-1.json
diff --git a/...er-EXM124/Observation/numer-EXM124-2.json → ...er-EXM124/Observation/numer-EXM124-2.json b/...er-EXM124/Observation/numer-EXM124-2.json → ...er-EXM124/Observation/numer-EXM124-2.json
diff --git a/...re/numer-EXM124/Patient/numer-EXM124.json → ...re/numer-EXM124/Patient/numer-EXM124.json b/...re/numer-EXM124/Patient/numer-EXM124.json → ...re/numer-EXM124/Patient/numer-EXM124.json
diff --git a/...tem/CodeSystem-appropriateness-score.json → ...tem/CodeSystem-appropriateness-score.json b/...tem/CodeSystem-appropriateness-score.json → ...tem/CodeSystem-appropriateness-score.json
diff --git a/...eSystem/CodeSystem-careplan-category.json → ...eSystem/CodeSystem-careplan-category.json b/...eSystem/CodeSystem-careplan-category.json → ...eSystem/CodeSystem-careplan-category.json
diff --git a/...abulary/CodeSystem/CodeSystem-cdcrec.json → ...abulary/CodeSystem/CodeSystem-cdcrec.json b/...abulary/CodeSystem/CodeSystem-cdcrec.json → ...abulary/CodeSystem/CodeSystem-cdcrec.json
diff --git a/...stem/CodeSystem-communication-medium.json → ...stem/CodeSystem-communication-medium.json b/...stem/CodeSystem-communication-medium.json → ...stem/CodeSystem-communication-medium.json
diff --git a/...System/CodeSystem-condition-category.json → ...System/CodeSystem-condition-category.json b/...System/CodeSystem-condition-category.json → ...System/CodeSystem-condition-category.json
diff --git a/...tem/CodeSystem-condition-criticality.json → ...tem/CodeSystem-condition-criticality.json b/...tem/CodeSystem-condition-criticality.json → ...tem/CodeSystem-condition-criticality.json
diff --git a/...eSystem-diagnosticorder-precondition.json → ...eSystem-diagnosticorder-precondition.json b/...eSystem-diagnosticorder-precondition.json → ...eSystem-diagnosticorder-precondition.json
diff --git a/.../CodeSystem-observation-verification.json → .../CodeSystem-observation-verification.json b/.../CodeSystem-observation-verification.json → .../CodeSystem-observation-verification.json