refactor[bgz_343296]: Restructure org.eclipse.osee.framework.jdk.core.test to mirror the corresponding bundle

41 files changed, 77 insertions, 136 deletions

diff --git a/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF
index 4529cfa..9f8d133 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF
@@ -30,7 +30,7 @@ Import-Package: org.eclipse.core.runtime,
  org.eclipse.osee.framework.core.test,
  org.eclipse.osee.framework.database.init,
  org.eclipse.osee.framework.database.test,
- org.eclipse.osee.framework.jdk.core.test,
+ org.eclipse.osee.framework.jdk.core,
  org.eclipse.osee.framework.jdk.core.util,
  org.eclipse.osee.framework.jdk.core.util.io,
  org.eclipse.osee.framework.lifecycle.test,
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/CoreRuntimeFeatureTestsSuite.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/CoreRuntimeFeatureTestsSuite.java
index b5f1287..4540966 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/CoreRuntimeFeatureTestsSuite.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/CoreRuntimeFeatureTestsSuite.java
@@ -14,7 +14,7 @@ import org.eclipse.osee.framework.core.message.test.AllCoreMessageTestSuite;
 import org.eclipse.osee.framework.core.model.test.AllCoreModelTestSuite;
 import org.eclipse.osee.framework.core.test.FrameworkCoreTestSuite;
 import org.eclipse.osee.framework.database.test.DatabaseTestSuite;
-import org.eclipse.osee.framework.jdk.core.test.JdkCoreTestSuite;
+import org.eclipse.osee.framework.jdk.core.JdkCoreTestSuite;
 import org.eclipse.osee.framework.lifecycle.test.AllLifecycleTestSuite;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.jdk.core.test/META-INF/MANIFEST.MF
index 0b7cf99..d4fe79e 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.9.9.qualifier
 Bundle-Vendor: Eclipse Open System Engineering Environment
 Fragment-Host: org.eclipse.osee.framework.jdk.core;bundle-version="0.4.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.osee.framework.jdk.core.test,
- org.eclipse.osee.framework.jdk.core.test.mock,
- org.eclipse.osee.framework.jdk.core.test.type
+Export-Package: org.eclipse.osee.framework.jdk.core,
+ org.eclipse.osee.framework.jdk.core.mock,
+ org.eclipse.osee.framework.jdk.core.type
 Require-Bundle: org.junit
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/JdkCoreTestSuite.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/JdkCoreTestSuite.java
index 29e78eb..c2e3287 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/JdkCoreTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/JdkCoreTestSuite.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test;
+package org.eclipse.osee.framework.jdk.core;
 
-import org.eclipse.osee.framework.jdk.core.test.rules.JdkCoreRuleTestSuite;
-import org.eclipse.osee.framework.jdk.core.test.text.JdkCoreTextTestSuite;
-import org.eclipse.osee.framework.jdk.core.test.type.JdkCoreTypeTestSuite;
-import org.eclipse.osee.framework.jdk.core.test.util.JdkCoreUtilTestSuite;
+import org.eclipse.osee.framework.jdk.core.rules.JdkCoreRuleTestSuite;
+import org.eclipse.osee.framework.jdk.core.text.JdkCoreTextTestSuite;
+import org.eclipse.osee.framework.jdk.core.type.JdkCoreTypeTestSuite;
+import org.eclipse.osee.framework.jdk.core.util.JdkCoreUtilTestSuite;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/mock/MockFileWatcherListener.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/mock/MockFileWatcherListener.java
index bcadfe6..b85af08 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/mock/MockFileWatcherListener.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/mock/MockFileWatcherListener.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.mock;
+package org.eclipse.osee.framework.jdk.core.mock;
 
 import java.util.Collection;
 import org.eclipse.osee.framework.jdk.core.util.io.FileChangeEvent;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/rules/JdkCoreRuleTestSuite.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/rules/JdkCoreRuleTestSuite.java
index 343a373..490e19d 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/rules/JdkCoreRuleTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/rules/JdkCoreRuleTestSuite.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.rules;
+package org.eclipse.osee.framework.jdk.core.rules;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/rules/WordMLNewLineMakerRuleTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/rules/WordMLNewLineMakerRuleTest.java
index 4f3a455..92d3120 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/rules/WordMLNewLineMakerRuleTest.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/rules/WordMLNewLineMakerRuleTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.rules;
+package org.eclipse.osee.framework.jdk.core.rules;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/rules/sample_icd_formatted.xml b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/rules/sample_icd_formatted.xml
index 2447e4f..2447e4f 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/rules/sample_icd_formatted.xml
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/rules/sample_icd_formatted.xml
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/mock/MockPropertyStore.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/mock/MockPropertyStore.java
deleted file mode 100644
index 6741fa8..0000000
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/mock/MockPropertyStore.java
+++ b/dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.mock;
-
-import java.util.Map;
-import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
-
-/**
- * @author Roberto E. Escobar
- */
-public class MockPropertyStore extends PropertyStore {
-
-   private static final long serialVersionUID = 750608597542081776L;
-
-   public MockPropertyStore() {
-      super();
-   }
-
-   public MockPropertyStore(String id) {
-      super(id);
-   }
-
-   public MockPropertyStore(Map<String, Object> properties) {
-      super(properties);
-   }
-
-   @Override
-   public void setId(String name) {
-      super.setId(name);
-   }
-
-   @Override
-   public Map<String, Object> getItems() {
-      return super.getItems();
-   }
-
-   @Override
-   public Map<String, Object> getArrays() {
-      return super.getArrays();
-   }
-
-   @Override
-   public Map<String, Object> getPropertyStores() {
-      return super.getPropertyStores();
-   }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/text/JdkCoreTextTestSuite.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/text/JdkCoreTextTestSuite.java
index 007c5ef..a35401a 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/text/JdkCoreTextTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/text/JdkCoreTextTestSuite.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.text;
+package org.eclipse.osee.framework.jdk.core.text;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/text/UtfReadingRuleTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/text/UtfReadingRuleTest.java
index ab23c80..4a6c991 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/text/UtfReadingRuleTest.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/text/UtfReadingRuleTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.text;
+package org.eclipse.osee.framework.jdk.core.text;
 
 import java.io.BufferedInputStream;
 import java.io.File;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/text/utf8_input.xml b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/text/utf8_input.xml
index e2b766c..e2b766c 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/text/utf8_input.xml
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/text/utf8_input.xml
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/CompositeKeyHashMapTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/type/CompositeKeyHashMapTest.java
index 9124fb2..cbe4853 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/CompositeKeyHashMapTest.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/type/CompositeKeyHashMapTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.type;
+package org.eclipse.osee.framework.jdk.core.type;
 
 import java.util.List;
 import org.eclipse.osee.framework.jdk.core.type.CompositeKeyHashMap;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/JdkCoreTypeTestSuite.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/type/JdkCoreTypeTestSuite.java
index 434cf41..b702b42 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/JdkCoreTypeTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/type/JdkCoreTypeTestSuite.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.type;
+package org.eclipse.osee.framework.jdk.core.type;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/MatchLocationTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/type/MatchLocationTest.java
index 00b64fa..5a42295 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/MatchLocationTest.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/type/MatchLocationTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.type;
+package org.eclipse.osee.framework.jdk.core.type;
 
 import java.util.HashMap;
 import org.eclipse.osee.framework.jdk.core.type.MatchLocation;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/PairTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/type/PairTest.java
index 907ac0d..0caba61 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/PairTest.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/type/PairTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.type;
+package org.eclipse.osee.framework.jdk.core.type;
 
 import java.util.HashMap;
 import org.eclipse.osee.framework.jdk.core.type.Pair;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/PropertyStoreTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/type/PropertyStoreTest.java
index 670b646..5e74549 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/PropertyStoreTest.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/type/PropertyStoreTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.type;
+package org.eclipse.osee.framework.jdk.core.type;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -17,9 +17,6 @@ import java.io.StringWriter;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
-import org.eclipse.osee.framework.jdk.core.test.mock.MockPropertyStore;
-import org.eclipse.osee.framework.jdk.core.test.mock.PropertyStoreTestUtil;
-import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
 import org.junit.Assert;
 
 /**
@@ -33,7 +30,7 @@ public class PropertyStoreTest {
    public void testCreateWithProperties() {
       Map<String, Object> properties = PropertyStoreTestUtil.convertPropertiesToMap(System.getProperties());
 
-      MockPropertyStore store1 = PropertyStoreTestUtil.createPropertyStore(properties);
+      PropertyStore store1 = PropertyStoreTestUtil.createPropertyStore(properties);
       PropertyStoreTestUtil.checkPropertiesEqual(properties, store1.getItems());
       Assert.assertTrue(!properties.equals(store1.getArrays()));
    }
@@ -41,20 +38,20 @@ public class PropertyStoreTest {
    @org.junit.Test
    public void testCreateWithId() {
       String id = "123456";
-      MockPropertyStore store1 = PropertyStoreTestUtil.createPropertyStore(id);
+      PropertyStore store1 = PropertyStoreTestUtil.createPropertyStore(id);
       Assert.assertEquals(id, store1.getId());
    }
 
    @org.junit.Test
    public void testEqualsAndHashCode() {
-      MockPropertyStore store1 = PropertyStoreTestUtil.createPropertyStore("ID");
+      PropertyStore store1 = PropertyStoreTestUtil.createPropertyStore("ID");
       store1.put("key1", 12.3f);
       store1.put("key2", 543L);
       store1.put("key3", new String[] {"entry1", "entry2", "entry3"});
 
       Assert.assertFalse(store1.equals("Test"));
 
-      MockPropertyStore store2 = PropertyStoreTestUtil.createPropertyStore("ID");
+      PropertyStore store2 = PropertyStoreTestUtil.createPropertyStore("ID");
       store2.put("key1", 12.3f);
       store2.put("key2", 543L);
       store2.put("key3", new String[] {"entry1", "entry2", "entry3"});
@@ -82,7 +79,7 @@ public class PropertyStoreTest {
 
    @org.junit.Test
    public void testToString() {
-      MockPropertyStore store1 = PropertyStoreTestUtil.createPropertyStore("ID");
+      PropertyStore store1 = PropertyStoreTestUtil.createPropertyStore("ID");
       store1.put("key1", 12.3f);
       store1.put("key2", 543L);
       store1.put("key3", new String[] {"entry1", "entry2", "entry3"});
@@ -97,7 +94,7 @@ public class PropertyStoreTest {
 
    @org.junit.Test
    public void testNumberException() {
-      MockPropertyStore store1 = PropertyStoreTestUtil.createPropertyStore();
+      PropertyStore store1 = PropertyStoreTestUtil.createPropertyStore();
 
       try {
          store1.getDouble("key1");
@@ -146,7 +143,7 @@ public class PropertyStoreTest {
 
    @org.junit.Test
    public void testSetsAndGets() throws Exception {
-      MockPropertyStore store1 = PropertyStoreTestUtil.createPropertyStore();
+      PropertyStore store1 = PropertyStoreTestUtil.createPropertyStore();
       store1.setId("myId");
       store1.put("key1", true);
       store1.put("key2", "aKey");
@@ -157,7 +154,7 @@ public class PropertyStoreTest {
       store1.put("key6.5", "");
       store1.put("key7", new String[] {"entry1", "entry2", "entry3"});
       store1.put("key8", new String[] {"entry4", "entry5", "entry6"});
-      MockPropertyStore nested =
+      PropertyStore nested =
          PropertyStoreTestUtil.createPropertyStore(PropertyStoreTestUtil.convertPropertiesToMap(System.getProperties()));
       store1.put("key9", nested);
 
@@ -179,12 +176,12 @@ public class PropertyStoreTest {
       PropertyStoreTestUtil.checkArrays(new String[] {"entry1", "entry2", "entry3"}, store1.getArray("key7"));
       PropertyStoreTestUtil.checkArrays(new String[] {"entry4", "entry5", "entry6"}, store1.getArray("key8"));
 
-      PropertyStoreTestUtil.checkEquals(nested, (MockPropertyStore) store1.getPropertyStore("key9"));
+      PropertyStoreTestUtil.checkEquals(nested, store1.getPropertyStore("key9"));
    }
 
    @org.junit.Test
    public void testNullSetsAndGets() {
-      MockPropertyStore store1 = PropertyStoreTestUtil.createPropertyStore("HelloId");
+      PropertyStore store1 = PropertyStoreTestUtil.createPropertyStore("HelloId");
       Assert.assertEquals("HelloId", store1.getId());
       store1.setId(null);
 
@@ -205,7 +202,7 @@ public class PropertyStoreTest {
    public void testSaveAndLoad() throws Exception {
       ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
 
-      MockPropertyStore store1 = PropertyStoreTestUtil.createPropertyStore();
+      PropertyStore store1 = PropertyStoreTestUtil.createPropertyStore();
       store1.put("key1", true);
       store1.put("key2", "aKey");
       store1.put("key3", 0.1112);
@@ -220,7 +217,7 @@ public class PropertyStoreTest {
 
       store1.save(outputStream);
 
-      MockPropertyStore store2 = PropertyStoreTestUtil.createPropertyStore();
+      PropertyStore store2 = PropertyStoreTestUtil.createPropertyStore();
       store2.load(new ByteArrayInputStream(outputStream.toByteArray()));
 
       PropertyStoreTestUtil.checkEquals(store1, store2);
@@ -230,7 +227,7 @@ public class PropertyStoreTest {
    public void testSaveAndLoadRW() throws Exception {
       StringWriter writer = new StringWriter();
 
-      MockPropertyStore store1 = PropertyStoreTestUtil.createPropertyStore();
+      PropertyStore store1 = PropertyStoreTestUtil.createPropertyStore();
       store1.put("key1", true);
       store1.put("key2", "aKey");
       store1.put("key3", 0.1112);
@@ -245,7 +242,7 @@ public class PropertyStoreTest {
 
       store1.save(writer);
 
-      MockPropertyStore store2 = PropertyStoreTestUtil.createPropertyStore();
+      PropertyStore store2 = PropertyStoreTestUtil.createPropertyStore();
       store2.load(new InputStreamReader(new ByteArrayInputStream(writer.toString().getBytes("utf-8")), "utf-8"));
 
       PropertyStoreTestUtil.checkEquals(store1, store2);
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/mock/PropertyStoreTestUtil.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/type/PropertyStoreTestUtil.java
index 6d89d29..b412c4f 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/mock/PropertyStoreTestUtil.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/type/PropertyStoreTestUtil.java
@@ -8,12 +8,13 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.mock;
+package org.eclipse.osee.framework.jdk.core.type;
 
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.TreeMap;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
 import org.junit.Assert;
 
 /**
@@ -32,8 +33,8 @@ public final class PropertyStoreTestUtil {
       }
    }
 
-   public static MockPropertyStore createPropertyStore() {
-      MockPropertyStore store = new MockPropertyStore();
+   public static PropertyStore createPropertyStore() {
+      PropertyStore store = new PropertyStore();
       Assert.assertEquals("", store.getId());
       Assert.assertNotNull(store.getItems());
       Assert.assertNotNull(store.getArrays());
@@ -41,16 +42,16 @@ public final class PropertyStoreTestUtil {
       return store;
    }
 
-   public static MockPropertyStore createPropertyStore(String id) {
-      MockPropertyStore store = new MockPropertyStore(id);
+   public static PropertyStore createPropertyStore(String id) {
+      PropertyStore store = new PropertyStore(id);
       Assert.assertEquals(id, store.getId());
       Assert.assertNotNull(store.getItems());
       Assert.assertNotNull(store.getArrays());
       return store;
    }
 
-   public static MockPropertyStore createPropertyStore(Map<String, Object> properties) {
-      MockPropertyStore store = new MockPropertyStore(properties);
+   public static PropertyStore createPropertyStore(Map<String, Object> properties) {
+      PropertyStore store = new PropertyStore(properties);
       Assert.assertEquals(properties, store.getItems());
       Assert.assertEquals(String.valueOf(properties.hashCode()), store.getId());
       Assert.assertNotNull(store.getItems());
@@ -58,7 +59,7 @@ public final class PropertyStoreTestUtil {
       return store;
    }
 
-   public static void checkEquals(MockPropertyStore expected, MockPropertyStore actual) {
+   public static void checkEquals(PropertyStore expected, PropertyStore actual) {
       Assert.assertEquals(expected.getId(), actual.getId());
       checkPropertiesEqual(expected.getItems(), actual.getItems());
       checkPropertiesEqual(expected.getArrays(), actual.getArrays());
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/PropertyStoreWriterTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/type/PropertyStoreWriterTest.java
index 8f27de2..765a1d3 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/PropertyStoreWriterTest.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/type/PropertyStoreWriterTest.java
@@ -8,15 +8,12 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.type;
+package org.eclipse.osee.framework.jdk.core.type;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
-import org.eclipse.osee.framework.jdk.core.test.mock.MockPropertyStore;
-import org.eclipse.osee.framework.jdk.core.test.mock.PropertyStoreTestUtil;
-import org.eclipse.osee.framework.jdk.core.type.PropertyStoreWriter;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -26,8 +23,8 @@ import org.junit.Test;
  * @author Roberto E. Escobar
  */
 public class PropertyStoreWriterTest {
-   private MockPropertyStore store;
-   private MockPropertyStore nested;
+   private PropertyStore store;
+   private PropertyStore nested;
    private PropertyStoreWriter writer;
 
    @Before
@@ -55,7 +52,7 @@ public class PropertyStoreWriterTest {
 
    @Test
    public void testReadWriteStream() throws Exception {
-      MockPropertyStore actual = PropertyStoreTestUtil.createPropertyStore();
+      PropertyStore actual = PropertyStoreTestUtil.createPropertyStore();
       ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
       writer.save(store, outputStream);
       writer.load(actual, new ByteArrayInputStream(outputStream.toByteArray()));
@@ -65,7 +62,7 @@ public class PropertyStoreWriterTest {
 
    @Test
    public void testReadWrite() throws Exception {
-      MockPropertyStore actual = PropertyStoreTestUtil.createPropertyStore();
+      PropertyStore actual = PropertyStoreTestUtil.createPropertyStore();
       StringWriter stringWriter = new StringWriter();
       writer.save(store, stringWriter);
       writer.load(actual, new StringReader(stringWriter.toString()));
@@ -76,9 +73,9 @@ public class PropertyStoreWriterTest {
    public void testLoadingXml() throws Exception {
       String value =
          "<?xml version=\"1.0\" encoding=\"UTF-8\" ?> <store id=\"coverage.item\"> <item value=\"68\" key=\"line\" /> <item value=\"\" key=\"testUnits\" /> <item value=\"4\" key=\"executeNum\" /> <item value=\"APc07YhpXgobKwrbROgA\" key=\"guid\" /> <item value=\"Not_Covered\" key=\"methodType\" /> <item value=\"4\" key=\"methodNum\" /> <item value=\"OseeLog.log(Activator.class, Level.SEVERE, ex);\" key=\"text\" /> </store>";
-      MockPropertyStore actual = PropertyStoreTestUtil.createPropertyStore();
+      PropertyStore actual = PropertyStoreTestUtil.createPropertyStore();
       writer.load(actual, new StringReader(value));
-      MockPropertyStore expected = PropertyStoreTestUtil.createPropertyStore("coverage.item");
+      PropertyStore expected = PropertyStoreTestUtil.createPropertyStore("coverage.item");
       expected.put("line", "68");
       expected.put("testUnits", "");
       expected.put("executeNum", "4");
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/QuadTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/type/QuadTest.java
index 37205aa..0c20ce4 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/QuadTest.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/type/QuadTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.type;
+package org.eclipse.osee.framework.jdk.core.type;
 
 import java.util.HashMap;
 import org.eclipse.osee.framework.jdk.core.type.Quad;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/TripletTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/type/TripletTest.java
index b7348d0..95ddcd9 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/TripletTest.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/type/TripletTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.type;
+package org.eclipse.osee.framework.jdk.core.type;
 
 import java.util.HashMap;
 import org.eclipse.osee.framework.jdk.core.type.Triplet;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/CollectionsTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/CollectionsTest.java
index 3b10a8d..d569d3f 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/CollectionsTest.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/CollectionsTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.util;
+package org.eclipse.osee.framework.jdk.core.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/CompareTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/CompareTest.java
index a578eaf..3658d01 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/CompareTest.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/CompareTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.util;
+package org.eclipse.osee.framework.jdk.core.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/GUIDTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/GUIDTest.java
index ee821d3..e860cc6 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/GUIDTest.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/GUIDTest.java
@@ -18,7 +18,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.util;
+package org.eclipse.osee.framework.jdk.core.util;
 
 import org.eclipse.osee.framework.jdk.core.util.GUID;
 import org.junit.Assert;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/HashCollectionTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/HashCollectionTest.java
index 9827f9e..888770f 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/HashCollectionTest.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/HashCollectionTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.util;
+package org.eclipse.osee.framework.jdk.core.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/HumanReadableIdTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/HumanReadableIdTest.java
index 229377c..f0860ad 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/HumanReadableIdTest.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/HumanReadableIdTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.util;
+package org.eclipse.osee.framework.jdk.core.util;
 
 import org.eclipse.osee.framework.jdk.core.util.HumanReadableId;
 import org.junit.Assert;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/JdkCoreUtilTestSuite.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/JdkCoreUtilTestSuite.java
index 95a8492..7b9c5d7 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/JdkCoreUtilTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/JdkCoreUtilTestSuite.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.util;
+package org.eclipse.osee.framework.jdk.core.util;
 
-import org.eclipse.osee.framework.jdk.core.test.util.io.IoTestSuite;
-import org.eclipse.osee.framework.jdk.core.test.util.xml.XmlTestSuite;
+import org.eclipse.osee.framework.jdk.core.util.io.IoTestSuite;
+import org.eclipse.osee.framework.jdk.core.util.xml.XmlTestSuite;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/ProcessesTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/ProcessesTest.java
index 1b9f26c..0d205dd 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/ProcessesTest.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/ProcessesTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.util;
+package org.eclipse.osee.framework.jdk.core.util;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -34,7 +34,7 @@ public class ProcessesTest {
    @Test
    public void testProcessCancel() throws IOException, InterruptedException, ExecutionException {
       ProcessBuilder builder =
-         new ProcessBuilder("java", "-cp", ".\\bin", "org.eclipse.osee.framework.jdk.core.test.util.ProcessesTest",
+         new ProcessBuilder("java", "-cp", ".\\bin", "org.eclipse.osee.framework.jdk.core.util.ProcessesTest",
             argument, "bye");
       builder.redirectErrorStream(true);
       Process process = builder.start();
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/ReservedCharactersTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/ReservedCharactersTest.java
index 8255af4..b2e299c 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/ReservedCharactersTest.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/ReservedCharactersTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.util;
+package org.eclipse.osee.framework.jdk.core.util;
 
 import java.util.Collection;
 import org.eclipse.osee.framework.jdk.core.util.ReservedCharacters;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/StringsTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/StringsTest.java
index ac4741d..9a705a7 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/StringsTest.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/StringsTest.java
@@ -18,7 +18,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.util;
+package org.eclipse.osee.framework.jdk.core.util;
 
 import org.eclipse.osee.framework.jdk.core.util.Strings;
 import org.junit.Assert;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/io/FileWatcherTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/io/FileWatcherTest.java
index 364a8f6..58f04d1 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/io/FileWatcherTest.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/io/FileWatcherTest.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.util.io;
+package org.eclipse.osee.framework.jdk.core.util.io;
 
 import java.io.File;
 import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 import org.junit.Assert;
-import org.eclipse.osee.framework.jdk.core.test.mock.MockFileWatcherListener;
+import org.eclipse.osee.framework.jdk.core.mock.MockFileWatcherListener;
 import org.eclipse.osee.framework.jdk.core.util.io.FileChangeEvent;
 import org.eclipse.osee.framework.jdk.core.util.io.FileChangeType;
 import org.eclipse.osee.framework.jdk.core.util.io.FileWatcher;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/io/IoTestSuite.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/io/IoTestSuite.java
index 70eb4e0..73acd4f 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/io/IoTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/io/IoTestSuite.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.util.io;
+package org.eclipse.osee.framework.jdk.core.util.io;
 
-import org.eclipse.osee.framework.jdk.core.test.util.io.xml.IoXmlTestSuite;
+import org.eclipse.osee.framework.jdk.core.util.io.xml.IoXmlTestSuite;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/io/xml/ExcelXmlWriterTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/io/xml/ExcelXmlWriterTest.java
index 11bb150..97ae619 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/io/xml/ExcelXmlWriterTest.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/io/xml/ExcelXmlWriterTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.util.io.xml;
+package org.eclipse.osee.framework.jdk.core.util.io.xml;
 
 import java.io.IOException;
 import java.io.StringWriter;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/io/xml/IoXmlTestSuite.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/io/xml/IoXmlTestSuite.java
index 77e1515..ba83794 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/io/xml/IoXmlTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/io/xml/IoXmlTestSuite.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.util.io.xml;
+package org.eclipse.osee.framework.jdk.core.util.io.xml;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/xml/JAXPTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/xml/JAXPTest.java
index 3169b20..3967a17 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/xml/JAXPTest.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/xml/JAXPTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.util.xml;
+package org.eclipse.osee.framework.jdk.core.util.xml;
 
 import java.io.IOException;
 import java.io.StringWriter;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/xml/XmlTestSuite.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/xml/XmlTestSuite.java
index d08411d..8ffc06c 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/xml/XmlTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/xml/XmlTestSuite.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.util.xml;
+package org.eclipse.osee.framework.jdk.core.util.xml;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/plugins/org.eclipse.osee.framework.resource.management.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.resource.management.test/META-INF/MANIFEST.MF
index 184a947..1b43346 100644
--- a/plugins/org.eclipse.osee.framework.resource.management.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.resource.management.test/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.9.9.qualifier
 Bundle-Vendor: Eclipse Open System Engineering Environment
 Fragment-Host: org.eclipse.osee.framework.resource.management;bundle-version="0.4.0"
 Import-Package: org.eclipse.osee.framework.core.exception,
- org.eclipse.osee.framework.jdk.core.test.type,
+ org.eclipse.osee.framework.jdk.core.type,
  org.eclipse.osee.framework.resource.management,
  org.eclipse.osee.framework.resource.management.exception,
  org.junit,
diff --git a/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/OptionsTest.java b/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/OptionsTest.java
index 60e9fd8..9bd8f42 100644
--- a/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/OptionsTest.java
+++ b/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/OptionsTest.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.osee.framework.resource.management.test;
 
-import org.eclipse.osee.framework.jdk.core.test.type.PropertyStoreTest;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStoreTest;
 import org.eclipse.osee.framework.resource.management.Options;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/plugins/org.eclipse.osee.framework.resource.provider.attribute.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.resource.provider.attribute.test/META-INF/MANIFEST.MF
index b841b65..14e0a64 100644
--- a/plugins/org.eclipse.osee.framework.resource.provider.attribute.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.resource.provider.attribute.test/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.9.9.qualifier
 Fragment-Host: org.eclipse.osee.framework.resource.provider.attribute;bundle-version="0.4.0"
 Bundle-Vendor: Eclipse Open System Engineering Environment
 Import-Package: org.eclipse.osee.framework.core.exception,
- org.eclipse.osee.framework.jdk.core.test.type,
+ org.eclipse.osee.framework.jdk.core.type,
  org.eclipse.osee.framework.resource.management,
  org.eclipse.osee.framework.resource.management.exception,
  org.junit,
diff --git a/plugins/org.eclipse.osee.framework.server.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.server.tests/META-INF/MANIFEST.MF
index b4d3841..93ef3ea 100644
--- a/plugins/org.eclipse.osee.framework.server.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.server.tests/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Import-Package: org.eclipse.osee.framework.branch.management.test,
  org.eclipse.osee.framework.core.server.test,
  org.eclipse.osee.framework.core.test,
  org.eclipse.osee.framework.database.test,
- org.eclipse.osee.framework.jdk.core.test,
+ org.eclipse.osee.framework.jdk.core,
  org.eclipse.osee.framework.lifecycle.test,
  org.eclipse.osee.framework.logging,
  org.eclipse.osee.framework.resource.locator.attribute.test,
diff --git a/plugins/org.eclipse.osee.framework.server.tests/src/org/eclipse/osee/framework/server/tests/AllServerTestsSuite.java b/plugins/org.eclipse.osee.framework.server.tests/src/org/eclipse/osee/framework/server/tests/AllServerTestsSuite.java
index 4644a04..ee367ec 100644
--- a/plugins/org.eclipse.osee.framework.server.tests/src/org/eclipse/osee/framework/server/tests/AllServerTestsSuite.java
+++ b/plugins/org.eclipse.osee.framework.server.tests/src/org/eclipse/osee/framework/server/tests/AllServerTestsSuite.java
@@ -18,7 +18,7 @@ import org.eclipse.osee.framework.core.model.test.AllCoreModelTestSuite;
 import org.eclipse.osee.framework.core.server.test.CoreServerTestSuite;
 import org.eclipse.osee.framework.core.test.FrameworkCoreTestSuite;
 import org.eclipse.osee.framework.database.test.DatabaseTestSuite;
-import org.eclipse.osee.framework.jdk.core.test.JdkCoreTestSuite;
+import org.eclipse.osee.framework.jdk.core.JdkCoreTestSuite;
 import org.eclipse.osee.framework.lifecycle.test.AllLifecycleTestSuite;
 import org.eclipse.osee.framework.logging.AllLoggingTestSuite;
 import org.eclipse.osee.framework.resource.locator.attribute.test.AttributeLocatorProviderTestSuite;