refactor: Update framework.core.test package structure

Change-Id: Ia3c14070f9d5ce2b70e2441683548ca9b7f1a25d

28 files changed, 47 insertions, 47 deletions

diff --git a/plugins/org.eclipse.osee.framework.core.test/pom.xml b/plugins/org.eclipse.osee.framework.core.test/pom.xml
index b0344dfe90e..6cb72224b49 100644
--- a/plugins/org.eclipse.osee.framework.core.test/pom.xml
+++ b/plugins/org.eclipse.osee.framework.core.test/pom.xml
@@ -22,7 +22,7 @@
 				<version>${tycho-version}</version>
 				<configuration>
 					<testSuite>org.eclipse.osee.framework.core.test</testSuite>
-					<testClass>org.eclipse.osee.framework.core.test.FrameworkCoreTestSuite</testClass>
+					<testClass>org.eclipse.osee.framework.core.FrameworkCoreTestSuite</testClass>
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/FrameworkCoreTestSuite.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/FrameworkCoreTestSuite.java
index 6de5b869716..57b94b6bbc9 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/FrameworkCoreTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/FrameworkCoreTestSuite.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test;
+package org.eclipse.osee.framework.core;
 
-import org.eclipse.osee.framework.core.test.data.DataTestSuite;
-import org.eclipse.osee.framework.core.test.enums.EnumsTestSuite;
-import org.eclipse.osee.framework.core.test.exception.ExceptionTestSuite;
-import org.eclipse.osee.framework.core.test.internal.InternalCoreTestSuite;
-import org.eclipse.osee.framework.core.test.ops.OpsTestSuite;
-import org.eclipse.osee.framework.core.test.util.UtilCoreTestSuite;
+import org.eclipse.osee.framework.core.data.DataTestSuite;
+import org.eclipse.osee.framework.core.enums.EnumsTestSuite;
+import org.eclipse.osee.framework.core.exception.ExceptionTestSuite;
+import org.eclipse.osee.framework.core.internal.InternalCoreTestSuite;
+import org.eclipse.osee.framework.core.ops.OpsTestSuite;
+import org.eclipse.osee.framework.core.util.UtilCoreTestSuite;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/data/DataTestSuite.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/data/DataTestSuite.java
index 5cf1899be63..7a282af053f 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/data/DataTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/data/DataTestSuite.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.data;
+package org.eclipse.osee.framework.core.data;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/data/RelationTypeSideTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/data/RelationTypeSideTest.java
index ba3efc26102..c03cf33c8f7 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/data/RelationTypeSideTest.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/data/RelationTypeSideTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.data;
+package org.eclipse.osee.framework.core.data;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/enums/DeletionFlagTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/enums/DeletionFlagTest.java
index 7c5aaabfdb1..47dd98cdc64 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/enums/DeletionFlagTest.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/enums/DeletionFlagTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.enums;
+package org.eclipse.osee.framework.core.enums;
 
 import org.junit.Assert;
 import org.eclipse.osee.framework.core.enums.DeletionFlag;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/enums/EnumsTestSuite.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/enums/EnumsTestSuite.java
index 46102064b1d..e6b71f20c04 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/enums/EnumsTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/enums/EnumsTestSuite.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.enums;
+package org.eclipse.osee.framework.core.enums;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/enums/PermissionEnumTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/enums/PermissionEnumTest.java
index eee846f835b..73f71cb8f34 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/enums/PermissionEnumTest.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/enums/PermissionEnumTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.enums;
+package org.eclipse.osee.framework.core.enums;
 
 import static org.eclipse.osee.framework.core.enums.PermissionEnum.DENY;
 import static org.eclipse.osee.framework.core.enums.PermissionEnum.FULLACCESS;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/exception/ExceptionTestSuite.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/exception/ExceptionTestSuite.java
index e03aeac72c7..a1d7ddf1b91 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/exception/ExceptionTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/exception/ExceptionTestSuite.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.exception;
+package org.eclipse.osee.framework.core.exception;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/exception/OseeCoreExceptionTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/exception/OseeCoreExceptionTest.java
index 8c445a0127b..524462ceae9 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/exception/OseeCoreExceptionTest.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/exception/OseeCoreExceptionTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.exception;
+package org.eclipse.osee.framework.core.exception;
 
 import org.junit.Assert;
 import org.eclipse.core.runtime.IStatus;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/exception/OseeExceptionsTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/exception/OseeExceptionsTest.java
index 9474f487c80..0787968b16d 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/exception/OseeExceptionsTest.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/exception/OseeExceptionsTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.exception;
+package org.eclipse.osee.framework.core.exception;
 
 import junit.framework.Assert;
 import org.eclipse.osee.framework.core.data.OseeCodeVersion;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/exception/TestStringFormatMessages.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/exception/TestStringFormatMessages.java
index a033ca67b9c..0d920c5fb8c 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/exception/TestStringFormatMessages.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/exception/TestStringFormatMessages.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.exception;
+package org.eclipse.osee.framework.core.exception;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/internal/InternalCoreTestSuite.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/internal/InternalCoreTestSuite.java
index 5a17e8d5c9d..46478d92228 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/internal/InternalCoreTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/internal/InternalCoreTestSuite.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.internal;
+package org.eclipse.osee.framework.core.internal;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/internal/MultiServiceBinderTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/internal/MultiServiceBinderTest.java
index 352823c9379..5007abaf756 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/internal/MultiServiceBinderTest.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/internal/MultiServiceBinderTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.internal;
+package org.eclipse.osee.framework.core.internal;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -16,9 +16,9 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import org.eclipse.osee.framework.core.internal.AbstractServiceBinder;
 import org.eclipse.osee.framework.core.internal.MultiServiceBinder;
-import org.eclipse.osee.framework.core.test.mocks.MockBundleContext;
-import org.eclipse.osee.framework.core.test.mocks.MockServiceReference;
-import org.eclipse.osee.framework.core.test.mocks.MockTrackingHandler;
+import org.eclipse.osee.framework.core.mocks.MockBundleContext;
+import org.eclipse.osee.framework.core.mocks.MockServiceReference;
+import org.eclipse.osee.framework.core.mocks.MockTrackingHandler;
 import org.eclipse.osee.framework.jdk.core.type.Pair;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/internal/ServiceBinderFactoryTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/internal/ServiceBinderFactoryTest.java
index 6d0d08c528f..bec0f720950 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/internal/ServiceBinderFactoryTest.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/internal/ServiceBinderFactoryTest.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.internal;
+package org.eclipse.osee.framework.core.internal;
 
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.exception.OseeStateException;
 import org.eclipse.osee.framework.core.internal.ServiceBinderFactoryImpl;
-import org.eclipse.osee.framework.core.test.mocks.MockBundleContext;
-import org.eclipse.osee.framework.core.test.mocks.MockServiceReference;
-import org.eclipse.osee.framework.core.test.mocks.MockTrackingHandler;
+import org.eclipse.osee.framework.core.mocks.MockBundleContext;
+import org.eclipse.osee.framework.core.mocks.MockServiceReference;
+import org.eclipse.osee.framework.core.mocks.MockTrackingHandler;
 import org.eclipse.osee.framework.core.util.ServiceBindType;
 import org.eclipse.osee.framework.core.util.ServiceBinderFactory;
 import org.junit.Assert;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/internal/SingletonServiceBinderTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/internal/SingletonServiceBinderTest.java
index 1d2082d1f1b..a1d80fae62d 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/internal/SingletonServiceBinderTest.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/internal/SingletonServiceBinderTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.internal;
+package org.eclipse.osee.framework.core.internal;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -16,9 +16,9 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import org.eclipse.osee.framework.core.internal.AbstractServiceBinder;
 import org.eclipse.osee.framework.core.internal.SingletonServiceBinder;
-import org.eclipse.osee.framework.core.test.mocks.MockBundleContext;
-import org.eclipse.osee.framework.core.test.mocks.MockServiceReference;
-import org.eclipse.osee.framework.core.test.mocks.MockTrackingHandler;
+import org.eclipse.osee.framework.core.mocks.MockBundleContext;
+import org.eclipse.osee.framework.core.mocks.MockServiceReference;
+import org.eclipse.osee.framework.core.mocks.MockTrackingHandler;
 import org.eclipse.osee.framework.jdk.core.type.Pair;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/mocks/MockAbstractOperation.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/mocks/MockAbstractOperation.java
index 9c7b16b2151..7d887947e1f 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/mocks/MockAbstractOperation.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/mocks/MockAbstractOperation.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.mocks;
+package org.eclipse.osee.framework.core.mocks;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.osee.framework.core.operation.AbstractOperation;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/mocks/MockBundleContext.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/mocks/MockBundleContext.java
index 0b46616918c..10323d9e48f 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/mocks/MockBundleContext.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/mocks/MockBundleContext.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.mocks;
+package org.eclipse.osee.framework.core.mocks;
 
 import java.io.File;
 import java.io.InputStream;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/mocks/MockOperation.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/mocks/MockOperation.java
index 97dc5dff254..e58ad764304 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/mocks/MockOperation.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/mocks/MockOperation.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.mocks;
+package org.eclipse.osee.framework.core.mocks;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/mocks/MockServiceReference.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/mocks/MockServiceReference.java
index c792f1dc52c..11c4692e31b 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/mocks/MockServiceReference.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/mocks/MockServiceReference.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.mocks;
+package org.eclipse.osee.framework.core.mocks;
 
 import org.osgi.framework.Bundle;
 import org.osgi.framework.ServiceReference;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/mocks/MockTrackingHandler.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/mocks/MockTrackingHandler.java
index c34371917e4..a27fec67f67 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/mocks/MockTrackingHandler.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/mocks/MockTrackingHandler.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.mocks;
+package org.eclipse.osee.framework.core.mocks;
 
 import java.util.Map;
 import org.junit.Assert;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/ops/OpsTestSuite.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/ops/OpsTestSuite.java
index 8539d2ebcb2..20178cb4971 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/ops/OpsTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/ops/OpsTestSuite.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.ops;
+package org.eclipse.osee.framework.core.ops;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/ops/RenameFilesOperationTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/ops/RenameFilesOperationTest.java
index 634cf099476..ca25647a937 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/ops/RenameFilesOperationTest.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/ops/RenameFilesOperationTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.ops;
+package org.eclipse.osee.framework.core.ops;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/util/AbstractOperationTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/AbstractOperationTest.java
index 874943179c5..4130dc28ea2 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/util/AbstractOperationTest.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/AbstractOperationTest.java
@@ -8,17 +8,17 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.util;
+package org.eclipse.osee.framework.core.util;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.osee.framework.core.enums.OperationBehavior;
+import org.eclipse.osee.framework.core.mocks.MockAbstractOperation;
 import org.eclipse.osee.framework.core.operation.AbstractOperation;
 import org.eclipse.osee.framework.core.operation.CompositeOperation;
 import org.eclipse.osee.framework.core.operation.IOperation;
 import org.eclipse.osee.framework.core.operation.Operations;
-import org.eclipse.osee.framework.core.test.mocks.MockAbstractOperation;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/util/AbstractTrackingHandlerTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/AbstractTrackingHandlerTest.java
index de90078ce32..4b9b8f3b9c8 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/util/AbstractTrackingHandlerTest.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/AbstractTrackingHandlerTest.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.util;
+package org.eclipse.osee.framework.core.util;
 
 import java.util.Map;
 import org.junit.Assert;
-import org.eclipse.osee.framework.core.test.mocks.MockTrackingHandler;
+import org.eclipse.osee.framework.core.mocks.MockTrackingHandler;
 import org.eclipse.osee.framework.core.util.AbstractTrackingHandler;
 import org.eclipse.osee.framework.core.util.ServiceBindType;
 import org.junit.Test;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/util/ConditionsTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/ConditionsTest.java
index 645c1d9633d..e3ca0d97e6f 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/util/ConditionsTest.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/ConditionsTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.util;
+package org.eclipse.osee.framework.core.util;
 
 import org.eclipse.osee.framework.core.exception.OseeArgumentException;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/util/ServiceDependencyTrackerTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/ServiceDependencyTrackerTest.java
index 6c7e4d34829..9e35f712120 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/util/ServiceDependencyTrackerTest.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/ServiceDependencyTrackerTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.util;
+package org.eclipse.osee.framework.core.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -16,8 +16,8 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.test.mocks.MockBundleContext;
-import org.eclipse.osee.framework.core.test.mocks.MockTrackingHandler;
+import org.eclipse.osee.framework.core.mocks.MockBundleContext;
+import org.eclipse.osee.framework.core.mocks.MockTrackingHandler;
 import org.eclipse.osee.framework.core.util.ServiceBindType;
 import org.eclipse.osee.framework.core.util.ServiceBinderFactory;
 import org.eclipse.osee.framework.core.util.ServiceDependencyTracker;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/util/UtilCoreTestSuite.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/UtilCoreTestSuite.java
index 87af7707af9..98e64bbd89e 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/util/UtilCoreTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/UtilCoreTestSuite.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.util;
+package org.eclipse.osee.framework.core.util;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/util/XResultDataTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/XResultDataTest.java
index 22cf7e842e8..2ae7bfc7a85 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/util/XResultDataTest.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/XResultDataTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.core.test.util;
+package org.eclipse.osee.framework.core.util;
 
 import junit.framework.Assert;
 import org.eclipse.osee.framework.core.util.IResultDataListener;