Renamed package to gov.hhs.aspr.ms.gcm.simulation to align with Maven…

… standards
HHS · Apr 16, 2024 · a23ce44 · a23ce44
1 parent 53f0782
commit a23ce44
Show file tree

Hide file tree

Showing 198 changed files with 458 additions and 458 deletions.
diff --git a/...c/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/testsupport/ExampleDimension.java b/...c/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/testsupport/ExampleDimension.java
@@ -4,8 +4,8 @@
 import java.util.List;
 import java.util.Objects;
 
-import gov.hhs.aspr.ms.gcm.nucleus.Dimension;
-import gov.hhs.aspr.ms.gcm.nucleus.DimensionContext;
+import gov.hhs.aspr.ms.gcm.simulation.nucleus.Dimension;
+import gov.hhs.aspr.ms.gcm.simulation.nucleus.DimensionContext;
 
 public class ExampleDimension implements Dimension {
     String levelName;

diff --git a/...ov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/DimensionTranslationSpec.java b/...ov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/DimensionTranslationSpec.java
@@ -1,6 +1,6 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.nucleus.Dimension;
+import gov.hhs.aspr.ms.gcm.simulation.nucleus.Dimension;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.input.DimensionInput;
 import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec;
 

diff --git a/.../gcm/taskit/protobuf/nucleus/translationSpecs/ExperimentParameterDataTranslationSpec.java b/.../gcm/taskit/protobuf/nucleus/translationSpecs/ExperimentParameterDataTranslationSpec.java
@@ -2,7 +2,7 @@
 
 import java.nio.file.Path;
 
-import gov.hhs.aspr.ms.gcm.nucleus.ExperimentParameterData;
+import gov.hhs.aspr.ms.gcm.simulation.nucleus.ExperimentParameterData;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.input.ExperimentParameterDataInput;
 import gov.hhs.aspr.ms.taskit.core.CoreTranslationError;
 import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec;

diff --git a/.../gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/PlannerTranslationSpec.java b/.../gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/PlannerTranslationSpec.java
@@ -1,6 +1,6 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.nucleus.Planner;
+import gov.hhs.aspr.ms.gcm.simulation.nucleus.Planner;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.input.PlannerInput;
 import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec;
 

diff --git a/.../aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/SimulationStateTranslationSpec.java b/.../aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/SimulationStateTranslationSpec.java
@@ -4,7 +4,7 @@
 
 import com.google.type.Date;
 
-import gov.hhs.aspr.ms.gcm.nucleus.SimulationState;
+import gov.hhs.aspr.ms.gcm.simulation.nucleus.SimulationState;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.input.SimulationStateInput;
 import gov.hhs.aspr.ms.taskit.core.CoreTranslationError;
 import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec;

diff --git a/.../plugins/globalproperties/translationSpecs/GlobalPropertiesPluginDataTranslationSpec.java b/.../plugins/globalproperties/translationSpecs/GlobalPropertiesPluginDataTranslationSpec.java
@@ -2,9 +2,9 @@
 
 import com.google.protobuf.Any;
 
-import gov.hhs.aspr.ms.gcm.plugins.globalproperties.datamanagers.GlobalPropertiesPluginData;
-import gov.hhs.aspr.ms.gcm.plugins.globalproperties.support.GlobalPropertyId;
-import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.globalproperties.datamanagers.GlobalPropertiesPluginData;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.globalproperties.support.GlobalPropertyId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.properties.support.PropertyDefinition;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.data.input.GlobalPropertiesPluginDataInput;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.support.input.PropertyDefinitionInput;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.support.input.PropertyDefinitionMapInput;

diff --git a/...buf/plugins/globalproperties/translationSpecs/GlobalPropertyDimensionTranslationSpec.java b/...buf/plugins/globalproperties/translationSpecs/GlobalPropertyDimensionTranslationSpec.java
@@ -2,8 +2,8 @@
 
 import com.google.protobuf.Any;
 
-import gov.hhs.aspr.ms.gcm.plugins.globalproperties.support.GlobalPropertyDimension;
-import gov.hhs.aspr.ms.gcm.plugins.globalproperties.support.GlobalPropertyId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.globalproperties.support.GlobalPropertyDimension;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.globalproperties.support.GlobalPropertyId;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.support.input.GlobalPropertyDimensionInput;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.support.input.GlobalPropertyIdInput;
 import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec;

diff --git a/...t/protobuf/plugins/globalproperties/translationSpecs/GlobalPropertyIdTranslationSpec.java b/...t/protobuf/plugins/globalproperties/translationSpecs/GlobalPropertyIdTranslationSpec.java
@@ -1,6 +1,6 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.plugins.globalproperties.support.GlobalPropertyId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.globalproperties.support.GlobalPropertyId;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.support.input.GlobalPropertyIdInput;
 import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec;
 

diff --git a/...gins/globalproperties/translationSpecs/GlobalPropertyReportPluginDataTranslationSpec.java b/...gins/globalproperties/translationSpecs/GlobalPropertyReportPluginDataTranslationSpec.java
@@ -1,8 +1,8 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.plugins.globalproperties.reports.GlobalPropertyReportPluginData;
-import gov.hhs.aspr.ms.gcm.plugins.globalproperties.support.GlobalPropertyId;
-import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.globalproperties.reports.GlobalPropertyReportPluginData;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.globalproperties.support.GlobalPropertyId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.reports.input.GlobalPropertyReportPluginDataInput;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.support.input.GlobalPropertyIdInput;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportLabelInput;

diff --git a/...otobuf/plugins/globalproperties/translationSpecs/TestGlobalPropertyIdTranslationSpec.java b/...otobuf/plugins/globalproperties/translationSpecs/TestGlobalPropertyIdTranslationSpec.java
@@ -1,6 +1,6 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.plugins.globalproperties.testsupport.TestGlobalPropertyId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.globalproperties.testsupport.TestGlobalPropertyId;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.testsupport.input.TestGlobalPropertyIdInput;
 import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec;
 

diff --git a/...s/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupIdTranslationSpec.java b/...s/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupIdTranslationSpec.java
@@ -1,6 +1,6 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupId;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupIdInput;
 import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec;
 

diff --git a/...gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupMemberFilterTranslationSpec.java b/...gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupMemberFilterTranslationSpec.java
@@ -1,7 +1,7 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupId;
-import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupMemberFilter;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupMemberFilter;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupMemberFilterInput;
 import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec;
 

diff --git a/...tobuf/plugins/groups/translationSpecs/GroupPopulationReportPluginDataTranslationSpec.java b/...tobuf/plugins/groups/translationSpecs/GroupPopulationReportPluginDataTranslationSpec.java
@@ -1,7 +1,7 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.plugins.groups.reports.GroupPopulationReportPluginData;
-import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.reports.GroupPopulationReportPluginData;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.reports.input.GroupPopulationReportPluginDataInput;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportLabelInput;
 import gov.hhs.aspr.ms.taskit.core.CoreTranslationError;

diff --git a/...askit/protobuf/plugins/groups/translationSpecs/GroupPropertyDimensionTranslationSpec.java b/...askit/protobuf/plugins/groups/translationSpecs/GroupPropertyDimensionTranslationSpec.java
@@ -2,9 +2,9 @@
 
 import com.google.protobuf.Any;
 
-import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupId;
-import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupPropertyDimension;
-import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupPropertyId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupPropertyDimension;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupPropertyId;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupPropertyDimensionInput;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupPropertyIdInput;
 import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec;

diff --git a/...s/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupPropertyIdTranslationSpec.java b/...s/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupPropertyIdTranslationSpec.java
@@ -1,6 +1,6 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupPropertyId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupPropertyId;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupPropertyIdInput;
 import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec;
 

diff --git a/...rotobuf/plugins/groups/translationSpecs/GroupPropertyReportPluginDataTranslationSpec.java b/...rotobuf/plugins/groups/translationSpecs/GroupPropertyReportPluginDataTranslationSpec.java
@@ -1,9 +1,9 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.plugins.groups.reports.GroupPropertyReportPluginData;
-import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupPropertyId;
-import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupTypeId;
-import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.reports.GroupPropertyReportPluginData;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupPropertyId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupTypeId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.reports.input.GroupPropertyReportPluginDataInput;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.reports.input.GroupPropertyReportPropertyMap;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupPropertyIdInput;

diff --git a/...pr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupTypeIdTranslationSpec.java b/...pr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupTypeIdTranslationSpec.java
@@ -1,6 +1,6 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupTypeId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupTypeId;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupTypeIdInput;
 import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec;
 

diff --git a/...it/protobuf/plugins/groups/translationSpecs/GroupTypesForPersonFilterTranslationSpec.java b/...it/protobuf/plugins/groups/translationSpecs/GroupTypesForPersonFilterTranslationSpec.java
@@ -1,7 +1,7 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupTypesForPersonFilter;
-import gov.hhs.aspr.ms.gcm.plugins.partitions.support.Equality;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupTypesForPersonFilter;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.Equality;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupTypesForPersonFilterInput;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.input.EqualityInput;
 import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec;

diff --git a/...buf/plugins/groups/translationSpecs/GroupsForPersonAndGroupTypeFilterTranslationSpec.java b/...buf/plugins/groups/translationSpecs/GroupsForPersonAndGroupTypeFilterTranslationSpec.java
@@ -1,8 +1,8 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupTypeId;
-import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupsForPersonAndGroupTypeFilter;
-import gov.hhs.aspr.ms.gcm.plugins.partitions.support.Equality;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupTypeId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupsForPersonAndGroupTypeFilter;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.Equality;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupTypeIdInput;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupsForPersonAndGroupTypeFilterInput;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.input.EqualityInput;

diff --git a/...taskit/protobuf/plugins/groups/translationSpecs/GroupsForPersonFilterTranslationSpec.java b/...taskit/protobuf/plugins/groups/translationSpecs/GroupsForPersonFilterTranslationSpec.java
@@ -1,7 +1,7 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupsForPersonFilter;
-import gov.hhs.aspr.ms.gcm.plugins.partitions.support.Equality;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupsForPersonFilter;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.Equality;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupsForPersonFilterInput;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.input.EqualityInput;
 import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec;

diff --git a/.../gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupsPluginDataTranslationSpec.java b/.../gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupsPluginDataTranslationSpec.java
@@ -2,13 +2,13 @@
 
 import java.util.*;
 
-import gov.hhs.aspr.ms.gcm.plugins.groups.datamanagers.GroupsPluginData;
-import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupId;
-import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupPropertyId;
-import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupPropertyValue;
-import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupTypeId;
-import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId;
-import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.datamanagers.GroupsPluginData;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupPropertyId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupPropertyValue;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupTypeId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.people.support.PersonId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.properties.support.PropertyDefinition;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.data.input.GroupsPluginDataInput;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupInput;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupPropertyDefinitionMapInput;

diff --git a/...m/taskit/protobuf/plugins/groups/translationSpecs/TestGroupPropertyIdTranslationSpec.java b/...m/taskit/protobuf/plugins/groups/translationSpecs/TestGroupPropertyIdTranslationSpec.java
@@ -1,6 +1,6 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.plugins.groups.testsupport.TestGroupPropertyId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.testsupport.TestGroupPropertyId;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.testsupport.input.TestGroupPropertyIdInput;
 import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec;
 

diff --git a/...s/gcm/taskit/protobuf/plugins/groups/translationSpecs/TestGroupTypeIdTranslationSpec.java b/...s/gcm/taskit/protobuf/plugins/groups/translationSpecs/TestGroupTypeIdTranslationSpec.java
@@ -1,6 +1,6 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.plugins.groups.testsupport.TestGroupTypeId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.testsupport.TestGroupTypeId;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.testsupport.input.TestGroupTypeIdInput;
 import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec;
 

diff --git a/...spr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/BatchIdTranslationSpec.java b/...spr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/BatchIdTranslationSpec.java
@@ -1,6 +1,6 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.plugins.materials.support.BatchId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.BatchId;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.support.input.BatchIdInput;
 import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec;
 

diff --git a/...cm/taskit/protobuf/plugins/materials/translationSpecs/BatchPropertyIdTranslationSpec.java b/...cm/taskit/protobuf/plugins/materials/translationSpecs/BatchPropertyIdTranslationSpec.java
@@ -1,6 +1,6 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.plugins.materials.support.BatchPropertyId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.BatchPropertyId;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.support.input.BatchPropertyIdInput;
 import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec;
 

diff --git a/...otobuf/plugins/materials/translationSpecs/BatchStatusReportPluginDataTranslationSpec.java b/...otobuf/plugins/materials/translationSpecs/BatchStatusReportPluginDataTranslationSpec.java
@@ -1,7 +1,7 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.plugins.materials.reports.BatchStatusReportPluginData;
-import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.reports.BatchStatusReportPluginData;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.reports.input.BatchStatusReportPluginDataInput;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportLabelInput;
 import gov.hhs.aspr.ms.taskit.core.CoreTranslationError;

diff --git a/.../ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/MaterialIdTranslationSpec.java b/.../ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/MaterialIdTranslationSpec.java
@@ -1,6 +1,6 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.MaterialId;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.support.input.MaterialIdInput;
 import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec;
 

diff --git a/...askit/protobuf/plugins/materials/translationSpecs/MaterialsPluginDataTranslationSpec.java b/...askit/protobuf/plugins/materials/translationSpecs/MaterialsPluginDataTranslationSpec.java
@@ -3,15 +3,15 @@
 import java.util.Map;
 import java.util.Set;
 
-import gov.hhs.aspr.ms.gcm.plugins.materials.datamangers.MaterialsPluginData;
-import gov.hhs.aspr.ms.gcm.plugins.materials.support.BatchId;
-import gov.hhs.aspr.ms.gcm.plugins.materials.support.BatchPropertyId;
-import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialId;
-import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsProducerId;
-import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsProducerPropertyId;
-import gov.hhs.aspr.ms.gcm.plugins.materials.support.StageId;
-import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceId;
-import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.datamangers.MaterialsPluginData;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.BatchId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.BatchPropertyId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.MaterialId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.MaterialsProducerId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.MaterialsProducerPropertyId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.StageId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.properties.support.PropertyDefinition;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.support.ResourceId;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.data.input.MaterialsPluginDataInput;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.support.input.BatchIdInput;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.support.input.BatchInput;

diff --git a/...askit/protobuf/plugins/materials/translationSpecs/MaterialsProducerIdTranslationSpec.java b/...askit/protobuf/plugins/materials/translationSpecs/MaterialsProducerIdTranslationSpec.java
@@ -1,6 +1,6 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsProducerId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.MaterialsProducerId;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.support.input.MaterialsProducerIdInput;
 import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec;
 

diff --git a/...otobuf/plugins/materials/translationSpecs/MaterialsProducerPropertyIdTranslationSpec.java b/...otobuf/plugins/materials/translationSpecs/MaterialsProducerPropertyIdTranslationSpec.java
@@ -1,6 +1,6 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsProducerPropertyId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.MaterialsProducerPropertyId;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.support.input.MaterialsProducerPropertyIdInput;
 import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec;
 

diff --git a/.../materials/translationSpecs/MaterialsProducerPropertyReportPluginDataTranslationSpec.java b/.../materials/translationSpecs/MaterialsProducerPropertyReportPluginDataTranslationSpec.java
@@ -1,7 +1,7 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.plugins.materials.reports.MaterialsProducerPropertyReportPluginData;
-import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.reports.MaterialsProducerPropertyReportPluginData;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.reports.input.MaterialsProducerPropertyReportPluginDataInput;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportLabelInput;
 import gov.hhs.aspr.ms.taskit.core.CoreTranslationError;

diff --git a/.../materials/translationSpecs/MaterialsProducerResourceReportPluginDataTranslationSpec.java b/.../materials/translationSpecs/MaterialsProducerResourceReportPluginDataTranslationSpec.java
@@ -1,7 +1,7 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.plugins.materials.reports.MaterialsProducerResourceReportPluginData;
-import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.reports.MaterialsProducerResourceReportPluginData;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.reports.input.MaterialsProducerResourceReportPluginDataInput;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportLabelInput;
 import gov.hhs.aspr.ms.taskit.core.CoreTranslationError;

diff --git a/...spr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/StageIdTranslationSpec.java b/...spr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/StageIdTranslationSpec.java
@@ -1,6 +1,6 @@
 package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs;
 
-import gov.hhs.aspr.ms.gcm.plugins.materials.support.StageId;
+import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.StageId;
 import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.support.input.StageIdInput;
 import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec;