Adapted gcm lesson projects to the ms-util package refactors. (#200)

HHS · Feb 4, 2024 · daa4669 · daa4669
1 parent 404200c
commit daa4669
Show file tree

Hide file tree

Showing 34 changed files with 47 additions and 46 deletions.
diff --git a/...rc/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/vaccine/reports/FamilyVaccineReport.java b/...rc/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/vaccine/reports/FamilyVaccineReport.java
@@ -18,7 +18,7 @@
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportHeader;
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportItem;
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel;
-import util.wrappers.MutableInteger;
+import gov.hhs.aspr.ms.util.wrappers.MutableInteger;
 
 public class FamilyVaccineReport {
 

diff --git a/...rc/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/vaccine/reports/HourlyVaccineReport.java b/...rc/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/vaccine/reports/HourlyVaccineReport.java
@@ -20,7 +20,7 @@
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportItem;
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel;
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportPeriod;
-import util.wrappers.MutableInteger;
+import gov.hhs.aspr.ms.util.wrappers.MutableInteger;
 
 public class HourlyVaccineReport extends PeriodicReport {
 	/* start code_ref=reports_plugin_hourly_vaccine_constructor|code_cap=The hourly vaccine report covers the same content as the family vaccine report. Rather than report events as they happen, it instead periodically summarizes these events.*/

diff --git a/...main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/vaccine/reports/StatelessVaccineReport.java b/...main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/vaccine/reports/StatelessVaccineReport.java
@@ -15,7 +15,7 @@
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportItem;
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel;
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportPeriod;
-import util.wrappers.MutableInteger;
+import gov.hhs.aspr.ms.util.wrappers.MutableInteger;
 
 public class StatelessVaccineReport extends PeriodicReport {
 

diff --git a/...lessons/lesson_14_people_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/Example_14.java b/...lessons/lesson_14_people_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/Example_14.java
@@ -25,7 +25,7 @@
 import gov.hhs.aspr.ms.gcm.plugins.stochastics.StochasticsPlugin;
 import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData;
 import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState;
-import util.random.RandomGeneratorProvider;
+import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider;
 
 public final class Example_14 {
 

diff --git a/...java/gov/hhs/aspr/ms/gcm/lessons/plugins/vaccine/datamanagers/VaccinationDataManager.java b/...java/gov/hhs/aspr/ms/gcm/lessons/plugins/vaccine/datamanagers/VaccinationDataManager.java
@@ -16,8 +16,8 @@
 import gov.hhs.aspr.ms.gcm.plugins.people.events.PersonRemovalEvent;
 import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError;
 import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId;
-import util.errors.ContractException;
-import util.wrappers.MutableInteger;
+import gov.hhs.aspr.ms.util.errors.ContractException;
+import gov.hhs.aspr.ms.util.wrappers.MutableInteger;
 
 public final class VaccinationDataManager extends DataManager {
 	/* start code_ref= people_plugin_vaccine_counts|code_cap=The vaccination data manager uses a simple map from person id to a counter to track the number of vaccinations for each person.*/

diff --git a/...ugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/vaccine/reports/VaccineReport.java b/...ugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/vaccine/reports/VaccineReport.java
@@ -14,7 +14,7 @@
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportItem;
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel;
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportPeriod;
-import util.wrappers.MutableInteger;
+import gov.hhs.aspr.ms.util.wrappers.MutableInteger;
 
 public final class VaccineReport extends PeriodicReport {
 

diff --git a/...lugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/vaccine/support/VaccineError.java b/...lugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/vaccine/support/VaccineError.java
@@ -1,7 +1,7 @@
 package gov.hhs.aspr.ms.gcm.lessons.plugins.vaccine.support;
 
-import util.errors.ContractError;
-import util.errors.ContractException;
+import gov.hhs.aspr.ms.util.errors.ContractError;
+import gov.hhs.aspr.ms.util.errors.ContractException;
 
 /**
  * An enumeration supporting {@link ContractException} that acts as a general

diff --git a/...essons/lesson_15_regions_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/Example_15.java b/...essons/lesson_15_regions_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/Example_15.java
@@ -33,7 +33,7 @@
 import gov.hhs.aspr.ms.gcm.plugins.stochastics.StochasticsPlugin;
 import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData;
 import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState;
-import util.random.RandomGeneratorProvider;
+import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider;
 
 public final class Example_15 {
 

diff --git a/...15_regions_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/ModelError.java b/...15_regions_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/ModelError.java
@@ -1,7 +1,7 @@
 package gov.hhs.aspr.ms.gcm.lessons.plugins.model;
 
-import util.errors.ContractError;
-import util.errors.ContractException;
+import gov.hhs.aspr.ms.util.errors.ContractError;
+import gov.hhs.aspr.ms.util.errors.ContractException;
 
 /**
  * An enumeration supporting {@link ContractException} that acts as a general

diff --git a/...son_15_regions_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/Region.java b/...son_15_regions_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/Region.java
@@ -1,8 +1,8 @@
 package gov.hhs.aspr.ms.gcm.lessons.plugins.model;
 
 import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionId;
+import gov.hhs.aspr.ms.util.errors.ContractException;
 import net.jcip.annotations.Immutable;
-import util.errors.ContractException;
 
 /**
  * Identifier for all regions

diff --git a/...gin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/vaccine/VaccinationDataManager.java b/...gin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/vaccine/VaccinationDataManager.java
@@ -15,8 +15,8 @@
 import gov.hhs.aspr.ms.gcm.plugins.people.events.PersonRemovalEvent;
 import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError;
 import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId;
-import util.errors.ContractException;
-import util.wrappers.MutableInteger;
+import gov.hhs.aspr.ms.util.errors.ContractException;
+import gov.hhs.aspr.ms.util.wrappers.MutableInteger;
 
 public final class VaccinationDataManager extends DataManager {
 

diff --git a/...egions_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/vaccine/VaccineError.java b/...egions_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/vaccine/VaccineError.java
@@ -1,7 +1,7 @@
 package gov.hhs.aspr.ms.gcm.lessons.plugins.vaccine;
 
-import util.errors.ContractError;
-import util.errors.ContractException;
+import gov.hhs.aspr.ms.util.errors.ContractError;
+import gov.hhs.aspr.ms.util.errors.ContractException;
 
 /**
  * An enumeration supporting {@link ContractException} that acts as a general

diff --git a/...ugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/vaccine/reports/VaccineReport.java b/...ugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/vaccine/reports/VaccineReport.java
@@ -14,7 +14,7 @@
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportItem;
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel;
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportPeriod;
-import util.wrappers.MutableInteger;
+import gov.hhs.aspr.ms.util.wrappers.MutableInteger;
 
 public final class VaccineReport extends PeriodicReport {
 

diff --git a/...son_16_person_properties_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/Example_16.java b/...son_16_person_properties_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/Example_16.java
@@ -35,7 +35,7 @@
 import gov.hhs.aspr.ms.gcm.plugins.stochastics.StochasticsPlugin;
 import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData;
 import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState;
-import util.random.RandomGeneratorProvider;
+import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider;
 
 public final class Example_16 {
 

diff --git a/...properties_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/ModelError.java b/...properties_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/ModelError.java
@@ -1,7 +1,7 @@
 package gov.hhs.aspr.ms.gcm.lessons.plugins.model;
 
-import util.errors.ContractError;
-import util.errors.ContractException;
+import gov.hhs.aspr.ms.util.errors.ContractError;
+import gov.hhs.aspr.ms.util.errors.ContractException;
 
 /**
  * An enumeration supporting {@link ContractException} that acts as a general

diff --git a/...son_properties_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/Region.java b/...son_properties_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/Region.java
@@ -1,8 +1,8 @@
 package gov.hhs.aspr.ms.gcm.lessons.plugins.model;
 
 import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionId;
+import gov.hhs.aspr.ms.util.errors.ContractException;
 import net.jcip.annotations.Immutable;
-import util.errors.ContractException;
 
 /**
  * Identifier for all regions

diff --git a/...ugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/actors/PopulationLoader.java b/...ugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/actors/PopulationLoader.java
@@ -11,8 +11,8 @@
 import gov.hhs.aspr.ms.gcm.plugins.globalproperties.datamanagers.GlobalPropertiesDataManager;
 import gov.hhs.aspr.ms.gcm.plugins.people.datamanagers.PeopleDataManager;
 import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonConstructionData;
-import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId;
 import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonConstructionData.Builder;
+import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId;
 import gov.hhs.aspr.ms.gcm.plugins.personproperties.datamanagers.PersonPropertiesDataManager;
 import gov.hhs.aspr.ms.gcm.plugins.personproperties.support.PersonPropertyDefinitionInitialization;
 import gov.hhs.aspr.ms.gcm.plugins.personproperties.support.PersonPropertyValueInitialization;

diff --git a/...lessons/lesson_17_groups_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/Example_17.java b/...lessons/lesson_17_groups_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/Example_17.java
@@ -42,7 +42,7 @@
 import gov.hhs.aspr.ms.gcm.plugins.stochastics.StochasticsPlugin;
 import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData;
 import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState;
-import util.random.RandomGeneratorProvider;
+import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider;
 
 public final class Example_17 {
 

diff --git a/...ugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/reports/ContagionReport.java b/...ugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/reports/ContagionReport.java
@@ -14,7 +14,7 @@
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportHeader;
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportItem;
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel;
-import util.wrappers.MutableInteger;
+import gov.hhs.aspr.ms.util.wrappers.MutableInteger;
 
 public final class ContagionReport {
 	private final ReportHeader reportHeader = ReportHeader.builder().add("infected").add("count").build();

diff --git a/...ps_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/support/ModelError.java b/...ps_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/support/ModelError.java
@@ -1,7 +1,7 @@
 package gov.hhs.aspr.ms.gcm.lessons.plugins.model.support;
 
-import util.errors.ContractError;
-import util.errors.ContractException;
+import gov.hhs.aspr.ms.util.errors.ContractError;
+import gov.hhs.aspr.ms.util.errors.ContractException;
 
 /**
  * An enumeration supporting {@link ContractException} that acts as a general

diff --git a/...groups_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/support/Region.java b/...groups_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/support/Region.java
@@ -1,8 +1,8 @@
 package gov.hhs.aspr.ms.gcm.lessons.plugins.model.support;
 
 import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionId;
+import gov.hhs.aspr.ms.util.errors.ContractException;
 import net.jcip.annotations.Immutable;
-import util.errors.ContractException;
 
 /**
  * Identifier for all regions

diff --git a/...sons/lesson_18_resources_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/Example_18.java b/...sons/lesson_18_resources_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/Example_18.java
@@ -39,7 +39,8 @@
 import gov.hhs.aspr.ms.gcm.plugins.stochastics.StochasticsPlugin;
 import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData;
 import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState;
-import util.random.RandomGeneratorProvider;
+import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider;
+
 
 public final class Example_18 {
 

diff --git a/..._resources_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/ModelError.java b/..._resources_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/ModelError.java
@@ -1,7 +1,7 @@
 package gov.hhs.aspr.ms.gcm.lessons.plugins.model;
 
-import util.errors.ContractError;
-import util.errors.ContractException;
+import gov.hhs.aspr.ms.util.errors.ContractError;
+import gov.hhs.aspr.ms.util.errors.ContractException;
 
 /**
  * An enumeration supporting {@link ContractException} that acts as a general

diff --git a/...n_18_resources_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/Region.java b/...n_18_resources_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/Region.java
@@ -1,8 +1,8 @@
 package gov.hhs.aspr.ms.gcm.lessons.plugins.model;
 
 import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionId;
+import gov.hhs.aspr.ms.util.errors.ContractException;
 import net.jcip.annotations.Immutable;
-import util.errors.ContractException;
 
 /**
  * Identifier for all regions

diff --git a/...ugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/actors/PopulationLoader.java b/...ugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/actors/PopulationLoader.java
@@ -15,7 +15,7 @@
 import gov.hhs.aspr.ms.gcm.plugins.regions.datamanagers.RegionsDataManager;
 import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionId;
 import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager;
-import util.wrappers.MutableDouble;
+import gov.hhs.aspr.ms.util.wrappers.MutableDouble;
 
 public class PopulationLoader {
 	private RegionId defaultRegionId;

diff --git a/.../src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/reports/QuestionnaireReport.java b/.../src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/reports/QuestionnaireReport.java
@@ -9,7 +9,7 @@
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportHeader;
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportItem;
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel;
-import util.stats.MutableStat;
+import gov.hhs.aspr.ms.util.stats.MutableStat;
 
 /**
  * A report that groups people at the end of the simulation by their shared

diff --git a/...ugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/reports/TreatmentReport.java b/...ugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/reports/TreatmentReport.java
@@ -11,8 +11,8 @@
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportHeader;
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportItem;
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel;
-import util.wrappers.MultiKey;
-import util.wrappers.MutableInteger;
+import gov.hhs.aspr.ms.util.wrappers.MultiKey;
+import gov.hhs.aspr.ms.util.wrappers.MutableInteger;
 
 /**
  * A report that groups people at the end of the simulation by their shared

diff --git a/...sons/lesson_19_materials_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/Example_19.java b/...sons/lesson_19_materials_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/Example_19.java
@@ -47,7 +47,7 @@
 import gov.hhs.aspr.ms.gcm.plugins.stochastics.StochasticsPlugin;
 import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData;
 import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState;
-import util.random.RandomGeneratorProvider;
+import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider;
 
 public final class Example_19 {
 

diff --git a/...als_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/actors/Vaccinator.java b/...als_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/actors/Vaccinator.java
@@ -22,8 +22,8 @@
 import gov.hhs.aspr.ms.gcm.plugins.regions.datamanagers.RegionsDataManager;
 import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionId;
 import gov.hhs.aspr.ms.gcm.plugins.resources.datamanagers.ResourcesDataManager;
-import util.wrappers.MutableDouble;
-import util.wrappers.MutableLong;
+import gov.hhs.aspr.ms.util.wrappers.MutableDouble;
+import gov.hhs.aspr.ms.util.wrappers.MutableLong;
 
 public class Vaccinator {
 

diff --git a/...ls_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/support/ModelError.java b/...ls_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/support/ModelError.java
@@ -1,7 +1,7 @@
 package gov.hhs.aspr.ms.gcm.lessons.plugins.model.support;
 
-import util.errors.ContractError;
-import util.errors.ContractException;
+import gov.hhs.aspr.ms.util.errors.ContractError;
+import gov.hhs.aspr.ms.util.errors.ContractException;
 
 /**
  * An enumeration supporting {@link ContractException} that acts as a general

diff --git a/...erials_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/support/Region.java b/...erials_plugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/support/Region.java
@@ -1,8 +1,8 @@
 package gov.hhs.aspr.ms.gcm.lessons.plugins.model.support;
 
 import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionId;
+import gov.hhs.aspr.ms.util.errors.ContractException;
 import net.jcip.annotations.Immutable;
-import util.errors.ContractException;
 
 /**
  * Identifier for all regions

diff --git a/...lugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/actors/EventVaccinator.java b/...lugin/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/actors/EventVaccinator.java
@@ -19,7 +19,7 @@
 import gov.hhs.aspr.ms.gcm.plugins.personproperties.events.PersonPropertyUpdateEvent;
 import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager;
 import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.Well;
-import util.wrappers.MultiKey;
+import gov.hhs.aspr.ms.util.wrappers.MultiKey;
 
 public class EventVaccinator {
 

diff --git a/.../src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/actors/InspectionVaccinator.java b/.../src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/actors/InspectionVaccinator.java
@@ -16,7 +16,7 @@
 import gov.hhs.aspr.ms.gcm.plugins.personproperties.datamanagers.PersonPropertiesDataManager;
 import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager;
 import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.Well;
-import util.wrappers.MultiKey;
+import gov.hhs.aspr.ms.util.wrappers.MultiKey;
 
 public class InspectionVaccinator {
 

diff --git a/...n/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/reports/PersonStatusReport.java b/...n/src/main/java/gov/hhs/aspr/ms/gcm/lessons/plugins/model/reports/PersonStatusReport.java
@@ -14,8 +14,8 @@
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportHeader;
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportItem;
 import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel;
-import util.wrappers.MultiKey;
-import util.wrappers.MutableInteger;
+import gov.hhs.aspr.ms.util.wrappers.MultiKey;
+import gov.hhs.aspr.ms.util.wrappers.MutableInteger;
 
 public class PersonStatusReport {
 	private final ReportLabel reportLabel;