23 files changed, 26 insertions, 24 deletions

diff --git a/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF
index 561dc793973..6892e5ca9c6 100644
--- a/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF
@@ -68,13 +68,15 @@ Export-Package: org.eclipse.osee.ats,
  org.eclipse.osee.ats.world.search

 Import-Package: javax.mail,

  javax.mail.internet,

- org.eclipse.osee.framework.core.cache,

  org.eclipse.osee.framework.core.client,

  org.eclipse.osee.framework.core.client.server,

  org.eclipse.osee.framework.core.data,

  org.eclipse.osee.framework.core.enums,

  org.eclipse.osee.framework.core.exception,

  org.eclipse.osee.framework.core.model,

+ org.eclipse.osee.framework.core.model.cache,

+ org.eclipse.osee.framework.core.model.event,

+ org.eclipse.osee.framework.core.model.type,

  org.eclipse.osee.framework.core.operation,

  org.eclipse.osee.framework.database.init,

  org.eclipse.osee.framework.logging,

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ArtifactSelectWizardPage.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ArtifactSelectWizardPage.java
index 7021213170f..2b75845047f 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ArtifactSelectWizardPage.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ArtifactSelectWizardPage.java
@@ -23,7 +23,7 @@ import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.jface.wizard.WizardPage;

 import org.eclipse.osee.ats.internal.AtsPlugin;

 import org.eclipse.osee.ats.util.AtsUtil;

-import org.eclipse.osee.framework.core.model.ArtifactType;

+import org.eclipse.osee.framework.core.model.type.ArtifactType;

 import org.eclipse.osee.framework.logging.OseeLog;

 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSArtifact.java
index c7fe00c47f7..86ada3e11cc 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSArtifact.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSArtifact.java
@@ -18,8 +18,8 @@ import org.eclipse.osee.ats.hyper.IHyperArtifact;
 import org.eclipse.osee.ats.util.Overview;

 import org.eclipse.osee.framework.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.core.exception.OseeDataStoreException;

-import org.eclipse.osee.framework.core.model.ArtifactType;

 import org.eclipse.osee.framework.core.model.Branch;

+import org.eclipse.osee.framework.core.model.type.ArtifactType;

 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactFactory;

 import org.eclipse.osee.framework.skynet.core.artifact.IATSArtifact;

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java
index 87096e95b64..fe64ff9bcb2 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java
@@ -37,8 +37,8 @@ import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
 import org.eclipse.osee.framework.core.exception.OseeArgumentException;

 import org.eclipse.osee.framework.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.core.exception.OseeDataStoreException;

-import org.eclipse.osee.framework.core.model.ArtifactType;

 import org.eclipse.osee.framework.core.model.Branch;

+import org.eclipse.osee.framework.core.model.type.ArtifactType;

 import org.eclipse.osee.framework.jdk.core.util.Collections;

 import org.eclipse.osee.framework.logging.OseeLog;

 import org.eclipse.osee.framework.skynet.core.User;

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java
index 2d7af474200..d22d6b513bd 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java
@@ -25,8 +25,8 @@ import org.eclipse.osee.ats.util.AtsFolderUtil.AtsFolder;
 import org.eclipse.osee.framework.core.enums.Active;

 import org.eclipse.osee.framework.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.core.exception.OseeDataStoreException;

-import org.eclipse.osee.framework.core.model.ArtifactType;

 import org.eclipse.osee.framework.core.model.Branch;

+import org.eclipse.osee.framework.core.model.type.ArtifactType;

 import org.eclipse.osee.framework.jdk.core.util.Collections;

 import org.eclipse.osee.framework.skynet.core.User;

 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AtsArtifactFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AtsArtifactFactory.java
index e7484b390a2..a327bf18c46 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AtsArtifactFactory.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AtsArtifactFactory.java
@@ -19,8 +19,8 @@ import org.eclipse.osee.ats.util.AtsArtifactTypes;
 import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
 import org.eclipse.osee.framework.core.exception.OseeArgumentException;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.ArtifactType;
 import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.type.ArtifactType;
 import org.eclipse.osee.framework.logging.OseeLevel;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/DecisionReviewArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/DecisionReviewArtifact.java
index f23836bdd66..aa4af9e8900 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/DecisionReviewArtifact.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/DecisionReviewArtifact.java
@@ -18,8 +18,8 @@ import org.eclipse.osee.ats.util.widgets.XDecisionOptions;
 import org.eclipse.osee.ats.world.IWorldViewArtifact;

 import org.eclipse.osee.framework.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.core.exception.OseeDataStoreException;

-import org.eclipse.osee.framework.core.model.ArtifactType;

 import org.eclipse.osee.framework.core.model.Branch;

+import org.eclipse.osee.framework.core.model.type.ArtifactType;

 import org.eclipse.osee.framework.skynet.core.User;

 import org.eclipse.osee.framework.skynet.core.UserManager;

 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactFactory;

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalArtifact.java
index 6b0eb830343..1aa4af8ed7c 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalArtifact.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalArtifact.java
@@ -27,8 +27,8 @@ import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.ats.world.search.GoalSearchItem;

 import org.eclipse.osee.framework.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.core.exception.OseeDataStoreException;

-import org.eclipse.osee.framework.core.model.ArtifactType;

 import org.eclipse.osee.framework.core.model.Branch;

+import org.eclipse.osee.framework.core.model.type.ArtifactType;

 import org.eclipse.osee.framework.skynet.core.User;

 import org.eclipse.osee.framework.skynet.core.UserManager;

 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/PeerToPeerReviewArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/PeerToPeerReviewArtifact.java
index f69f7789db6..f017cb6dc86 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/PeerToPeerReviewArtifact.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/PeerToPeerReviewArtifact.java
@@ -23,8 +23,8 @@ import org.eclipse.osee.ats.util.widgets.role.UserRole.Role;
 import org.eclipse.osee.ats.world.IWorldViewArtifact;

 import org.eclipse.osee.framework.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.core.exception.OseeDataStoreException;

-import org.eclipse.osee.framework.core.model.ArtifactType;

 import org.eclipse.osee.framework.core.model.Branch;

+import org.eclipse.osee.framework.core.model.type.ArtifactType;

 import org.eclipse.osee.framework.skynet.core.User;

 import org.eclipse.osee.framework.skynet.core.UserManager;

 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactFactory;

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ReviewSMArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ReviewSMArtifact.java
index 78dd5c37830..98abcff6c5f 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ReviewSMArtifact.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ReviewSMArtifact.java
@@ -28,8 +28,8 @@ import org.eclipse.osee.ats.util.widgets.role.UserRoleManager;
 import org.eclipse.osee.ats.util.widgets.role.UserRole.Role;

 import org.eclipse.osee.framework.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.core.exception.OseeDataStoreException;

-import org.eclipse.osee.framework.core.model.ArtifactType;

 import org.eclipse.osee.framework.core.model.Branch;

+import org.eclipse.osee.framework.core.model.type.ArtifactType;

 import org.eclipse.osee.framework.logging.OseeLog;

 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactFactory;

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java
index cb02c7920e5..6850c568002 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java
@@ -51,8 +51,8 @@ import org.eclipse.osee.framework.core.exception.OseeArgumentException;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.core.exception.OseeDataStoreException;

 import org.eclipse.osee.framework.core.exception.OseeStateException;

-import org.eclipse.osee.framework.core.model.ArtifactType;

 import org.eclipse.osee.framework.core.model.Branch;

+import org.eclipse.osee.framework.core.model.type.ArtifactType;

 import org.eclipse.osee.framework.jdk.core.util.Lib;

 import org.eclipse.osee.framework.logging.OseeLevel;

 import org.eclipse.osee.framework.logging.OseeLog;

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskArtifact.java
index ac5685fe0ac..d0f1b44f293 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskArtifact.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskArtifact.java
@@ -26,8 +26,8 @@ import org.eclipse.osee.ats.world.IWorldViewArtifact;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.core.exception.OseeDataStoreException;

 import org.eclipse.osee.framework.core.exception.OseeStateException;

-import org.eclipse.osee.framework.core.model.ArtifactType;

 import org.eclipse.osee.framework.core.model.Branch;

+import org.eclipse.osee.framework.core.model.type.ArtifactType;

 import org.eclipse.osee.framework.jdk.core.util.Collections;

 import org.eclipse.osee.framework.logging.OseeLog;

 import org.eclipse.osee.framework.skynet.core.User;

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskableStateMachineArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskableStateMachineArtifact.java
index d852bb87f6f..32d6951c078 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskableStateMachineArtifact.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskableStateMachineArtifact.java
@@ -28,8 +28,8 @@ import org.eclipse.osee.ats.util.AtsRelationTypes;
 import org.eclipse.osee.ats.util.AtsUtil;

 import org.eclipse.osee.framework.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.core.exception.OseeDataStoreException;

-import org.eclipse.osee.framework.core.model.ArtifactType;

 import org.eclipse.osee.framework.core.model.Branch;

+import org.eclipse.osee.framework.core.model.type.ArtifactType;

 import org.eclipse.osee.framework.logging.OseeLevel;

 import org.eclipse.osee.framework.logging.OseeLog;

 import org.eclipse.osee.framework.skynet.core.User;

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java
index a8d980d12b5..98dd36db92e 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java
@@ -34,8 +34,8 @@ import org.eclipse.osee.framework.core.exception.BranchDoesNotExist;
 import org.eclipse.osee.framework.core.exception.OseeArgumentException;

 import org.eclipse.osee.framework.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.core.exception.OseeDataStoreException;

-import org.eclipse.osee.framework.core.model.ArtifactType;

 import org.eclipse.osee.framework.core.model.Branch;

+import org.eclipse.osee.framework.core.model.type.ArtifactType;

 import org.eclipse.osee.framework.jdk.core.util.Collections;

 import org.eclipse.osee.framework.jdk.core.util.GUID;

 import org.eclipse.osee.framework.logging.OseeLog;

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java
index 55edd4ab176..a043604a590 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java
@@ -36,8 +36,8 @@ import org.eclipse.osee.framework.core.exception.OseeArgumentException;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.core.exception.OseeDataStoreException;

 import org.eclipse.osee.framework.core.exception.OseeStateException;

-import org.eclipse.osee.framework.core.model.ArtifactType;

 import org.eclipse.osee.framework.core.model.Branch;

+import org.eclipse.osee.framework.core.model.type.ArtifactType;

 import org.eclipse.osee.framework.jdk.core.util.Strings;

 import org.eclipse.osee.framework.logging.OseeLevel;

 import org.eclipse.osee.framework.logging.OseeLog;

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/VersionArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/VersionArtifact.java
index abf5a9aa3a7..d53396b5034 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/VersionArtifact.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/VersionArtifact.java
@@ -24,8 +24,8 @@ import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
 import org.eclipse.osee.framework.core.exception.BranchDoesNotExist;

 import org.eclipse.osee.framework.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.core.exception.OseeDataStoreException;

-import org.eclipse.osee.framework.core.model.ArtifactType;

 import org.eclipse.osee.framework.core.model.Branch;

+import org.eclipse.osee.framework.core.model.type.ArtifactType;

 import org.eclipse.osee.framework.jdk.core.util.GUID;

 import org.eclipse.osee.framework.logging.OseeLog;

 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsCacheManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsCacheManager.java
index ae8d3e31668..9f295fb3d74 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsCacheManager.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsCacheManager.java
@@ -28,7 +28,7 @@ import org.eclipse.osee.framework.core.enums.Active;
 import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;

 import org.eclipse.osee.framework.core.enums.CoreRelationTypes;

 import org.eclipse.osee.framework.core.exception.OseeCoreException;

-import org.eclipse.osee.framework.core.model.ArtifactType;

+import org.eclipse.osee.framework.core.model.type.ArtifactType;

 import org.eclipse.osee.framework.logging.OseeLevel;

 import org.eclipse.osee.framework.logging.OseeLog;

 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

@@ -66,7 +66,7 @@ import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.
  * ActionableItemArtifact<br>

  * All other artifact types will silently not cached<br>

  * <REM2>

- * 

+ *

  * @author Donald G. Dunne

  */

 public class AtsCacheManager implements IArtifactEventListener, IArtifactsPurgedEventListener, IFrameworkTransactionEventListener {

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsSection.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsSection.java
index dd8ea98defc..e2bfee71a79 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsSection.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsSection.java
@@ -19,7 +19,7 @@ import org.eclipse.osee.ats.util.AtsRelationTypes;
 import org.eclipse.osee.ats.util.AtsUtil;

 import org.eclipse.osee.framework.core.enums.CoreRelationTypes;

 import org.eclipse.osee.framework.core.exception.OseeCoreException;

-import org.eclipse.osee.framework.core.model.RelationType;

+import org.eclipse.osee.framework.core.model.type.RelationType;

 import org.eclipse.osee.framework.ui.skynet.artifact.editor.BaseArtifactEditorInput;

 import org.eclipse.osee.framework.ui.skynet.artifact.editor.sections.RelationsFormSection;

 import org.eclipse.swt.widgets.Composite;

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java
index 6f686d6c98d..d74e438db04 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java
@@ -54,8 +54,8 @@ import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
 import org.eclipse.osee.framework.core.exception.BranchDoesNotExist;

 import org.eclipse.osee.framework.core.exception.OseeArgumentException;

 import org.eclipse.osee.framework.core.exception.OseeCoreException;

-import org.eclipse.osee.framework.core.model.AttributeType;

 import org.eclipse.osee.framework.core.model.Branch;

+import org.eclipse.osee.framework.core.model.type.AttributeType;

 import org.eclipse.osee.framework.jdk.core.type.HashCollection;

 import org.eclipse.osee.framework.jdk.core.util.Collections;

 import org.eclipse.osee.framework.jdk.core.util.Strings;

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/TaskMetrics.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/TaskMetrics.java
index 7b089a8ed8c..443ff3d9ee7 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/TaskMetrics.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/TaskMetrics.java
@@ -27,7 +27,7 @@ import org.eclipse.osee.ats.util.widgets.SMAState;
 import org.eclipse.osee.ats.util.widgets.XCurrentStateDam;
 import org.eclipse.osee.ats.util.widgets.XStateDam;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.ArtifactType;
+import org.eclipse.osee.framework.core.model.type.ArtifactType;
 import org.eclipse.osee.framework.jdk.core.type.CountingMap;
 import org.eclipse.osee.framework.jdk.core.type.MutableInteger;
 import org.eclipse.osee.framework.jdk.core.util.io.CharBackedInputStream;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java
index 2ac0b2b9093..d18700289e0 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java
@@ -39,7 +39,6 @@ import org.eclipse.osee.ats.workflow.item.AtsAddDecisionReviewRule;
 import org.eclipse.osee.ats.workflow.item.AtsAddPeerToPeerReviewRule;

 import org.eclipse.osee.ats.workflow.item.StateEventType;

 import org.eclipse.osee.ats.workflow.item.AtsAddDecisionReviewRule.DecisionRuleOption;

-import org.eclipse.osee.framework.core.cache.BranchFilter;

 import org.eclipse.osee.framework.core.data.IOseeBranch;

 import org.eclipse.osee.framework.core.enums.BranchArchivedState;

 import org.eclipse.osee.framework.core.enums.BranchState;

@@ -50,6 +49,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.exception.OseeStateException;

 import org.eclipse.osee.framework.core.model.Branch;

 import org.eclipse.osee.framework.core.model.TransactionRecord;

+import org.eclipse.osee.framework.core.model.cache.BranchFilter;

 import org.eclipse.osee.framework.core.operation.IOperation;

 import org.eclipse.osee.framework.core.operation.Operations;

 import org.eclipse.osee.framework.jdk.core.util.Strings;

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/AtsAttributeXWidgetProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/AtsAttributeXWidgetProvider.java
index 2556b64f807..28c7c08e8b3 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/AtsAttributeXWidgetProvider.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/AtsAttributeXWidgetProvider.java
@@ -14,7 +14,7 @@ import java.util.Arrays;
 import java.util.List;

 import org.eclipse.osee.ats.artifact.ATSAttributes;

 import org.eclipse.osee.framework.core.exception.OseeCoreException;

-import org.eclipse.osee.framework.core.model.AttributeType;

+import org.eclipse.osee.framework.core.model.type.AttributeType;

 import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DefaultAttributeXWidgetProvider;

 import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData;

 import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemAttributes;

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java
index 2456f9c2c0c..f7f84d9cbda 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java
@@ -20,7 +20,7 @@ import org.eclipse.osee.ats.artifact.GoalArtifact;
 import org.eclipse.osee.ats.internal.AtsPlugin;

 import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeColumn;

 import org.eclipse.osee.ats.util.xviewer.column.XViewerSmaCreatedDateColumn;

-import org.eclipse.osee.framework.core.model.AttributeType;

+import org.eclipse.osee.framework.core.model.type.AttributeType;

 import org.eclipse.osee.framework.logging.OseeLog;

 import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;

 import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;