diff --git a/input/fsh/measures/IMMZIND05.fsh b/input/fsh/measures/IMMZIND05.fsh
new file mode 100644
index 0000000000..585200f230
--- /dev/null
+++ b/input/fsh/measures/IMMZIND05.fsh
@@ -0,0 +1,41 @@
+Instance: IMMZIND05
+InstanceOf: http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cv-measure-cqfm
+Title: "IMMZIND05"
+
+* description = "IMMZ.IND.05 Measles indicator for first dose."
+* url = "http://smart.who.int/ig/smart-immunizations/Measure/IMMZIND05"
+* version = "0.1.0"
+* status = #draft
+* experimental = false
+* date = "2023-10-05"
+* name = "IMMZIND05"
+* publisher = "World Health Organization (WHO)"
+* library = "http://smart.who.int/ig/smart-immunizations/Library/IMMZINDMeasles"
+* scoring = $measure-scoring#continuous-variable "Continuous Variable"
+* group[+]
+  * population[initialPopulation]
+    * extension[http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-populationBasis].valueCode = #boolean
+    * id = "IMMZ.IND.05.IP"
+    * description = "Initial Population"
+    * code = $measure-population#initial-population "Initial Population"
+    * criteria.language = #text/cql
+    * criteria.expression = "Initial Population 05"
+  * population[measurePopulation]
+    * extension[http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-populationBasis].valueCode = #boolean
+    * id = "IMMZ.IND.05.MP"
+    * description = "Measure Population"
+    * code = $measure-population#measure-population "Measure Population"
+    * criteria.language = #text/cql
+    * criteria.expression = "Measure Population 05"
+  * population[measureObservation]
+    * extension[http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-criteriaReference].valueString = "measure-population"
+    * extension[http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-aggregateMethod].valueCode = #count
+    * id = "IMMZ.IND.05.MO"
+    * description = "Measure Observation"
+    * code = $measure-population#measure-observation
+    * criteria.language = #text/cql
+    * criteria.expression = "Measure Observation 05"
+  * stratifier[+]
+    * id = "IMMZ.IND.05.S"
+    * criteria.language = #text/cql
+    * criteria.expression = "Stratification"
\ No newline at end of file
diff --git a/input/fsh/measures/IMMZIND40.fsh b/input/fsh/measures/IMMZIND40.fsh
new file mode 100644
index 0000000000..56aebbf4c0
--- /dev/null
+++ b/input/fsh/measures/IMMZIND40.fsh
@@ -0,0 +1,41 @@
+Instance: IMMZIND40
+InstanceOf: http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cv-measure-cqfm
+Title: "IMMZIND40"
+
+* description = "IMMZ.IND.40 Measles indicator for second dose."
+* url = "http://smart.who.int/ig/smart-immunizations/Measure/IMMZIND40"
+* version = "0.1.0"
+* status = #draft
+* experimental = false
+* date = "2023-10-05"
+* name = "IMMZIND40"
+* publisher = "World Health Organization (WHO)"
+* library = "http://smart.who.int/ig/smart-immunizations/Library/IMMZINDMeasles"
+* scoring = $measure-scoring#continuous-variable "Continuous Variable"
+* group[+]
+  * population[initialPopulation]
+    * extension[http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-populationBasis].valueCode = #boolean
+    * id = "IMMZ.IND.40.IP"
+    * description = "Initial Population"
+    * code = $measure-population#initial-population "Initial Population"
+    * criteria.language = #text/cql
+    * criteria.expression = "Initial Population 40"
+  * population[measurePopulation]
+    * extension[http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-populationBasis].valueCode = #boolean
+    * id = "IMMZ.IND.40.MP"
+    * description = "Measure Population"
+    * code = $measure-population#measure-population "Measure Population"
+    * criteria.language = #text/cql
+    * criteria.expression = "Measure Population 40"
+  * population[measureObservation]
+    * extension[http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-criteriaReference].valueString = "measure-population"
+    * extension[http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-aggregateMethod].valueCode = #count
+    * id = "IMMZ.IND.40.MO"
+    * description = "Measure Observation"
+    * code = $measure-population#measure-observation
+    * criteria.language = #text/cql
+    * criteria.expression = "Measure Observation 40"
+  * stratifier[+]
+    * id = "IMMZ.IND.40.S"
+    * criteria.language = #text/cql
+    * criteria.expression = "Stratification"
\ No newline at end of file
diff --git a/input/fsh/measures/measles.fsh b/input/fsh/measures/measles.fsh
deleted file mode 100644
index d87ca4c042..0000000000
--- a/input/fsh/measures/measles.fsh
+++ /dev/null
@@ -1,83 +0,0 @@
-Instance: IMMZIND05
-InstanceOf: http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cv-measure-cqfm
-Title: "IMMZIND05"
-
-* description = "IMMZ.IND.05 Measles indicator for first dose."
-* url = "http://smart.who.int/ig/smart-immunizations/Measure/IMMZIND05"
-* version = "0.1.0"
-* status = #draft
-* experimental = false
-* date = "2023-10-05"
-* name = "IMMZIND05"
-* publisher = "World Health Organization (WHO)"
-* library = "http://smart.who.int/ig/smart-immunizations/Library/IMMZINDMeasles"
-* scoring = $measure-scoring#continuous-variable "Continuous Variable"
-* group[+]
-  * population[initialPopulation]
-    * extension[http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-populationBasis].valueCode = #boolean
-    * id = "IMMZ.IND.05.IP"
-    * description = "Initial Population"
-    * code = $measure-population#initial-population "Initial Population"
-    * criteria.language = #text/cql
-    * criteria.expression = "Initial Population 05"
-  * population[measurePopulation]
-    * extension[http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-populationBasis].valueCode = #boolean
-    * id = "IMMZ.IND.05.MP"
-    * description = "Measure Population"
-    * code = $measure-population#measure-population "Measure Population"
-    * criteria.language = #text/cql
-    * criteria.expression = "Measure Population 05"
-  * population[measureObservation]
-    * extension[http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-criteriaReference].valueString = "measure-population"
-    * extension[http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-aggregateMethod].valueCode = #count
-    * id = "IMMZ.IND.05.MO"
-    * description = "Measure Observation"
-    * code = $measure-population#measure-observation
-    * criteria.language = #text/cql
-    * criteria.expression = "Measure Observation 05"
-  * stratifier[+]
-    * id = "IMMZ.IND.05.S"
-    * criteria.language = #text/cql
-    * criteria.expression = "Stratification"
-
-Instance: IMMZIND40
-InstanceOf: http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cv-measure-cqfm
-Title: "IMMZIND40"
-
-* description = "IMMZ.IND.40 Measles indicator for second dose."
-* url = "http://smart.who.int/ig/smart-immunizations/Measure/IMMZIND40"
-* version = "0.1.0"
-* status = #draft
-* experimental = false
-* date = "2023-10-05"
-* name = "IMMZIND40"
-* publisher = "World Health Organization (WHO)"
-* library = "http://smart.who.int/ig/smart-immunizations/Library/IMMZINDMeasles"
-* scoring = $measure-scoring#continuous-variable "Continuous Variable"
-* group[+]
-  * population[initialPopulation]
-    * extension[http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-populationBasis].valueCode = #boolean
-    * id = "IMMZ.IND.40.IP"
-    * description = "Initial Population"
-    * code = $measure-population#initial-population "Initial Population"
-    * criteria.language = #text/cql
-    * criteria.expression = "Initial Population 40"
-  * population[measurePopulation]
-    * extension[http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-populationBasis].valueCode = #boolean
-    * id = "IMMZ.IND.40.MP"
-    * description = "Measure Population"
-    * code = $measure-population#measure-population "Measure Population"
-    * criteria.language = #text/cql
-    * criteria.expression = "Measure Population 40"
-  * population[measureObservation]
-    * extension[http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-criteriaReference].valueString = "measure-population"
-    * extension[http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-aggregateMethod].valueCode = #count
-    * id = "IMMZ.IND.40.MO"
-    * description = "Measure Observation"
-    * code = $measure-population#measure-observation
-    * criteria.language = #text/cql
-    * criteria.expression = "Measure Observation 40"
-  * stratifier[+]
-    * id = "IMMZ.IND.40.S"
-    * criteria.language = #text/cql
-    * criteria.expression = "Stratification"
\ No newline at end of file