diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/DefaultTopology.java b/core/common/src/test/java/org/onosproject/store/trivial/DefaultTopology.java
similarity index 99%
rename from core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/DefaultTopology.java
rename to core/common/src/test/java/org/onosproject/store/trivial/DefaultTopology.java
index bffb486..9f436b6 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/DefaultTopology.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/DefaultTopology.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static org.onlab.graph.GraphPathSearch.ALL_PATHS;
diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/DefaultTopologyGraph.java b/core/common/src/test/java/org/onosproject/store/trivial/DefaultTopologyGraph.java
similarity index 96%
rename from core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/DefaultTopologyGraph.java
rename to core/common/src/test/java/org/onosproject/store/trivial/DefaultTopologyGraph.java
index 84faafa..610d724 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/DefaultTopologyGraph.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/DefaultTopologyGraph.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import org.onlab.graph.AdjacencyListsGraph;
 import org.onosproject.net.topology.TopologyEdge;
diff --git a/core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/DefaultTopologyTest.java b/core/common/src/test/java/org/onosproject/store/trivial/DefaultTopologyTest.java
similarity index 98%
rename from core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/DefaultTopologyTest.java
rename to core/common/src/test/java/org/onosproject/store/trivial/DefaultTopologyTest.java
index 2e0b977..3ff340a 100644
--- a/core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/DefaultTopologyTest.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/DefaultTopologyTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/NoOpClockProviderService.java b/core/common/src/test/java/org/onosproject/store/trivial/NoOpClockProviderService.java
similarity index 96%
rename from core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/NoOpClockProviderService.java
rename to core/common/src/test/java/org/onosproject/store/trivial/NoOpClockProviderService.java
index f9e2413..739d36f 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/NoOpClockProviderService.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/NoOpClockProviderService.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import java.util.Set;
 
diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/PathKey.java b/core/common/src/test/java/org/onosproject/store/trivial/PathKey.java
similarity index 96%
rename from core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/PathKey.java
rename to core/common/src/test/java/org/onosproject/store/trivial/PathKey.java
index 6c5f677..00d6c9d 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/PathKey.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/PathKey.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import org.onosproject.net.DeviceId;
 
diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleApplicationIdStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleApplicationIdStore.java
similarity index 97%
rename from core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleApplicationIdStore.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SimpleApplicationIdStore.java
index 61cfd7c..6e6b958 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleApplicationIdStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleApplicationIdStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.collect.ImmutableSet;
 import org.apache.felix.scr.annotations.Component;
diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleApplicationStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleApplicationStore.java
similarity index 98%
rename from core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleApplicationStore.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SimpleApplicationStore.java
index 1bac57f..d38b801 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleApplicationStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleApplicationStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.collect.ImmutableSet;
 import org.apache.felix.scr.annotations.Activate;
diff --git a/core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleApplicationStoreTest.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleApplicationStoreTest.java
similarity index 98%
rename from core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleApplicationStoreTest.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SimpleApplicationStoreTest.java
index 0e7a16e..27996e5 100644
--- a/core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleApplicationStoreTest.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleApplicationStoreTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.collect.ImmutableSet;
 import org.junit.After;
diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleClusterStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleClusterStore.java
similarity index 98%
rename from core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleClusterStore.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SimpleClusterStore.java
index 0ef44d8..5eea3cc 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleClusterStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleClusterStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.collect.ImmutableSet;
 import org.apache.felix.scr.annotations.Activate;
diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleComponentConfigStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleComponentConfigStore.java
similarity index 97%
rename from core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleComponentConfigStore.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SimpleComponentConfigStore.java
index ba9d29b..1d8bcd6 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleComponentConfigStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleComponentConfigStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleDeviceStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStore.java
similarity index 99%
rename from core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleDeviceStore.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStore.java
index 4086ea8..f1a6982 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleDeviceStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.FluentIterable;
diff --git a/core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleDeviceStoreTest.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStoreTest.java
similarity index 99%
rename from core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleDeviceStoreTest.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStoreTest.java
index a9a2e05..562e6f3 100644
--- a/core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleDeviceStoreTest.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStoreTest.java
@@ -17,7 +17,7 @@
 /**
  *
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import static org.junit.Assert.*;
 import static org.onosproject.net.Device.Type.SWITCH;
diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleFlowRuleStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleFlowRuleStore.java
similarity index 99%
rename from core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleFlowRuleStore.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SimpleFlowRuleStore.java
index 5fb87ba..3b8f1d3 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleFlowRuleStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleFlowRuleStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.base.Function;
 import com.google.common.cache.Cache;
diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleGroupStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleGroupStore.java
similarity index 99%
rename from core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleGroupStore.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SimpleGroupStore.java
index 18117ca..71de3e1 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleGroupStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleGroupStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import static org.apache.commons.lang3.concurrent.ConcurrentUtils.createIfAbsentUnchecked;
 import static org.slf4j.LoggerFactory.getLogger;
diff --git a/core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleGroupStoreTest.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleGroupStoreTest.java
similarity index 99%
rename from core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleGroupStoreTest.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SimpleGroupStoreTest.java
index 88e30e5..dd6c8a5 100644
--- a/core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleGroupStoreTest.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleGroupStoreTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import static org.junit.Assert.assertEquals;
 import static org.onosproject.net.DeviceId.deviceId;
diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleHostStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleHostStore.java
similarity index 99%
rename from core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleHostStore.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SimpleHostStore.java
index ad3ce86..f5604f6 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleHostStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleHostStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import static org.onosproject.net.DefaultAnnotations.merge;
 import static org.onosproject.net.host.HostEvent.Type.HOST_ADDED;
diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleIdBlockStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleIdBlockStore.java
similarity index 96%
rename from core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleIdBlockStore.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SimpleIdBlockStore.java
index 5ad6dd4..3f7e563 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleIdBlockStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleIdBlockStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Service;
diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleIntentStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleIntentStore.java
similarity index 98%
rename from core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleIntentStore.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SimpleIntentStore.java
index 629cde3..9f95966 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleIntentStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleIntentStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleLeadershipManager.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleLeadershipManager.java
similarity index 98%
rename from core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleLeadershipManager.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SimpleLeadershipManager.java
index eebe3dd..194ffec 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleLeadershipManager.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleLeadershipManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleLinkResourceStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleLinkResourceStore.java
similarity index 99%
rename from core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleLinkResourceStore.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SimpleLinkResourceStore.java
index 77b918a..58b446c 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleLinkResourceStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleLinkResourceStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleLinkResourceStoreTest.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleLinkResourceStoreTest.java
similarity index 99%
rename from core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleLinkResourceStoreTest.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SimpleLinkResourceStoreTest.java
index 5841c32..238e75d 100644
--- a/core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleLinkResourceStoreTest.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleLinkResourceStoreTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleLinkStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleLinkStore.java
similarity index 99%
rename from core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleLinkStore.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SimpleLinkStore.java
index 4c124d9..d0be2b1 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleLinkStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleLinkStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.base.Function;
 import com.google.common.collect.FluentIterable;
diff --git a/core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleLinkStoreTest.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleLinkStoreTest.java
similarity index 99%
rename from core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleLinkStoreTest.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SimpleLinkStoreTest.java
index 1ecaf97..2d2b275 100644
--- a/core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleLinkStoreTest.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleLinkStoreTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.collect.Iterables;
 
diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleMastershipStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleMastershipStore.java
similarity index 99%
rename from core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleMastershipStore.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SimpleMastershipStore.java
index 2feb18b..ef92ded 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleMastershipStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleMastershipStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import static org.onosproject.mastership.MastershipEvent.Type.BACKUPS_CHANGED;
 import static org.onosproject.mastership.MastershipEvent.Type.MASTER_CHANGED;
diff --git a/core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleMastershipStoreTest.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleMastershipStoreTest.java
similarity index 98%
rename from core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleMastershipStoreTest.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SimpleMastershipStoreTest.java
index 2cda65b..672fc50 100644
--- a/core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleMastershipStoreTest.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleMastershipStoreTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimplePacketStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimplePacketStore.java
similarity index 97%
rename from core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimplePacketStore.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SimplePacketStore.java
index 04ea09c..81cef49 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimplePacketStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimplePacketStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.collect.Sets;
 import org.apache.felix.scr.annotations.Component;
diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleStatisticStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleStatisticStore.java
similarity index 98%
rename from core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleStatisticStore.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SimpleStatisticStore.java
index 454a5ca..370686f 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleStatisticStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleStatisticStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.collect.Sets;
 import org.apache.felix.scr.annotations.Activate;
diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleTopologyStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleTopologyStore.java
similarity index 98%
rename from core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleTopologyStore.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SimpleTopologyStore.java
index cbce901..cd564f0 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleTopologyStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleTopologyStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SystemClockTimestamp.java b/core/common/src/test/java/org/onosproject/store/trivial/SystemClockTimestamp.java
similarity index 97%
rename from core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SystemClockTimestamp.java
rename to core/common/src/test/java/org/onosproject/store/trivial/SystemClockTimestamp.java
index 1e98a7a..2ee4194 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SystemClockTimestamp.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SystemClockTimestamp.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ComparisonChain;
diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/package-info.java b/core/common/src/test/java/org/onosproject/store/trivial/package-info.java
similarity index 93%
rename from core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/package-info.java
rename to core/common/src/test/java/org/onosproject/store/trivial/package-info.java
index 7974b68..2b0c36b 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/package-info.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/package-info.java
@@ -18,4 +18,4 @@
  * Implementations of in-memory stores suitable for unit testing and
  * experimentation; not for production use.
  */
-package org.onosproject.store.trivial.impl;
+package org.onosproject.store.trivial;
diff --git a/core/net/pom.xml b/core/net/pom.xml
index 24b47dd..c54be45 100644
--- a/core/net/pom.xml
+++ b/core/net/pom.xml
@@ -46,17 +46,8 @@
 
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-core-trivial</artifactId>
+            <artifactId>onos-core-common</artifactId>
             <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- FIXME remove when we figure out the trivial store -->
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-core-dist</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
         </dependency>
 
         <dependency>
diff --git a/core/net/src/test/java/org/onosproject/cluster/impl/MastershipManagerTest.java b/core/net/src/test/java/org/onosproject/cluster/impl/MastershipManagerTest.java
index e4d4331..477c7c4 100644
--- a/core/net/src/test/java/org/onosproject/cluster/impl/MastershipManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/cluster/impl/MastershipManagerTest.java
@@ -31,7 +31,7 @@
 import org.onosproject.mastership.MastershipStore;
 import org.onosproject.mastership.MastershipTermService;
 import org.onosproject.net.DeviceId;
-import org.onosproject.store.trivial.impl.SimpleMastershipStore;
+import org.onosproject.store.trivial.SimpleMastershipStore;
 
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.Futures;
diff --git a/core/net/src/test/java/org/onosproject/net/device/impl/DeviceManagerTest.java b/core/net/src/test/java/org/onosproject/net/device/impl/DeviceManagerTest.java
index fdda578..4d8d2fc 100644
--- a/core/net/src/test/java/org/onosproject/net/device/impl/DeviceManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/device/impl/DeviceManagerTest.java
@@ -54,7 +54,7 @@
 import org.onosproject.net.device.PortDescription;
 import org.onosproject.net.provider.AbstractProvider;
 import org.onosproject.net.provider.ProviderId;
-import org.onosproject.store.trivial.impl.SimpleDeviceStore;
+import org.onosproject.store.trivial.SimpleDeviceStore;
 
 import com.google.common.collect.Sets;
 
diff --git a/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java b/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
index 520cb8c..db434c7 100644
--- a/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
@@ -62,7 +62,7 @@
 import org.onosproject.net.flow.instructions.Instructions.MetadataInstruction;
 import org.onosproject.net.provider.AbstractProvider;
 import org.onosproject.net.provider.ProviderId;
-import org.onosproject.store.trivial.impl.SimpleFlowRuleStore;
+import org.onosproject.store.trivial.SimpleFlowRuleStore;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/core/net/src/test/java/org/onosproject/net/group/impl/GroupManagerTest.java b/core/net/src/test/java/org/onosproject/net/group/impl/GroupManagerTest.java
index 43ce78a..327296e 100644
--- a/core/net/src/test/java/org/onosproject/net/group/impl/GroupManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/group/impl/GroupManagerTest.java
@@ -61,7 +61,7 @@
 import org.onosproject.net.group.StoredGroupEntry;
 import org.onosproject.net.provider.AbstractProvider;
 import org.onosproject.net.provider.ProviderId;
-import org.onosproject.store.trivial.impl.SimpleGroupStore;
+import org.onosproject.store.trivial.SimpleGroupStore;
 
 import com.google.common.collect.Iterables;
 
diff --git a/core/net/src/test/java/org/onosproject/net/host/impl/HostManagerTest.java b/core/net/src/test/java/org/onosproject/net/host/impl/HostManagerTest.java
index a6e8e62..77b199b 100644
--- a/core/net/src/test/java/org/onosproject/net/host/impl/HostManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/host/impl/HostManagerTest.java
@@ -54,7 +54,7 @@
 import org.onosproject.net.host.PortAddresses;
 import org.onosproject.net.provider.AbstractProvider;
 import org.onosproject.net.provider.ProviderId;
-import org.onosproject.store.trivial.impl.SimpleHostStore;
+import org.onosproject.store.trivial.SimpleHostStore;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/IntentCleanupTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/IntentCleanupTest.java
index 4953778..0f6ce67 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/IntentCleanupTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/IntentCleanupTest.java
@@ -29,8 +29,8 @@
 import org.onosproject.net.intent.IntentStoreDelegate;
 import org.onosproject.net.intent.MockIdGenerator;
 import org.onosproject.store.Timestamp;
-import org.onosproject.store.trivial.impl.SimpleIntentStore;
-import org.onosproject.store.trivial.impl.SystemClockTimestamp;
+import org.onosproject.store.trivial.SimpleIntentStore;
+import org.onosproject.store.trivial.SystemClockTimestamp;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/IntentCleanupTestMock.java b/core/net/src/test/java/org/onosproject/net/intent/impl/IntentCleanupTestMock.java
index 19c754c..15ee24e 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/IntentCleanupTestMock.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/IntentCleanupTestMock.java
@@ -29,8 +29,8 @@
 import org.onosproject.net.intent.IntentStoreDelegate;
 import org.onosproject.net.intent.MockIdGenerator;
 import org.onosproject.store.Timestamp;
-import org.onosproject.store.trivial.impl.SimpleIntentStore;
-import org.onosproject.store.trivial.impl.SystemClockTimestamp;
+import org.onosproject.store.trivial.SimpleIntentStore;
+import org.onosproject.store.trivial.SystemClockTimestamp;
 
 import static org.easymock.EasyMock.*;
 import static org.junit.Assert.assertTrue;
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/IntentManagerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/IntentManagerTest.java
index 4ddb332..ae6b0d2 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/IntentManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/IntentManagerTest.java
@@ -45,7 +45,7 @@
 import org.onosproject.net.intent.IntentState;
 import org.onosproject.net.intent.Key;
 import org.onosproject.net.resource.link.LinkResourceAllocations;
-import org.onosproject.store.trivial.impl.SimpleIntentStore;
+import org.onosproject.store.trivial.SimpleIntentStore;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/MplsPathIntentCompilerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/MplsPathIntentCompilerTest.java
index 574bc05..771a988 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/MplsPathIntentCompilerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/MplsPathIntentCompilerTest.java
@@ -44,7 +44,7 @@
 import org.onosproject.net.intent.IntentTestsMocks;
 import org.onosproject.net.intent.MockIdGenerator;
 import org.onosproject.net.intent.MplsPathIntent;
-import org.onosproject.store.trivial.impl.SimpleLinkStore;
+import org.onosproject.store.trivial.SimpleLinkStore;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
diff --git a/core/net/src/test/java/org/onosproject/net/link/impl/LinkManagerTest.java b/core/net/src/test/java/org/onosproject/net/link/impl/LinkManagerTest.java
index cacf082..f164fa8 100644
--- a/core/net/src/test/java/org/onosproject/net/link/impl/LinkManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/link/impl/LinkManagerTest.java
@@ -39,7 +39,7 @@
 import org.onosproject.net.provider.ProviderId;
 import org.onosproject.common.event.impl.TestEventDispatcher;
 import org.onosproject.net.device.impl.DeviceManager;
-import org.onosproject.store.trivial.impl.SimpleLinkStore;
+import org.onosproject.store.trivial.SimpleLinkStore;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/core/net/src/test/java/org/onosproject/net/topology/impl/TopologyManagerTest.java b/core/net/src/test/java/org/onosproject/net/topology/impl/TopologyManagerTest.java
index d3bbd2b..99b8fbd 100644
--- a/core/net/src/test/java/org/onosproject/net/topology/impl/TopologyManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/topology/impl/TopologyManagerTest.java
@@ -38,7 +38,7 @@
 import org.onosproject.net.topology.TopologyProviderRegistry;
 import org.onosproject.net.topology.TopologyProviderService;
 import org.onosproject.net.topology.TopologyService;
-import org.onosproject.store.trivial.impl.SimpleTopologyStore;
+import org.onosproject.store.trivial.SimpleTopologyStore;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/store/pom.xml b/core/store/pom.xml
index fd6b48e..5cb5fd6 100644
--- a/core/store/pom.xml
+++ b/core/store/pom.xml
@@ -32,7 +32,6 @@
     <description>ONOS Core Store subsystem</description>
 
     <modules>
-        <module>trivial</module>
         <module>dist</module>
         <module>serializers</module>
     </modules>
diff --git a/core/store/trivial/pom.xml b/core/store/trivial/pom.xml
deleted file mode 100644
index e556506..0000000
--- a/core/store/trivial/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2014 Open Networking Laboratory
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onosproject</groupId>
-        <artifactId>onos-core-store</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>onos-core-trivial</artifactId>
-    <packaging>bundle</packaging>
-
-    <description>ONOS network control trivial implementations of core subsystems</description>
-
-    <dependencies>
-        <dependency>
-          <groupId>org.apache.commons</groupId>
-          <artifactId>commons-lang3</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-core-common</artifactId>
-        </dependency>
-
-        <dependency>
-          <groupId>org.onosproject</groupId>
-          <artifactId>onos-api</artifactId>
-          <classifier>tests</classifier>
-          <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/features/features.xml b/features/features.xml
index 5b5481f..2f8c209 100644
--- a/features/features.xml
+++ b/features/features.xml
@@ -138,13 +138,4 @@
         <bundle>mvn:org.onosproject/onos-security-impl/@ONOS-VERSION</bundle>
     </feature>
 
-    <!-- Deprecated! For standalone testing only. -->
-    <feature name="onos-core-trivial" version="@FEATURE-VERSION"
-             description="ONOS trivial core components">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onos-core-net/@ONOS-VERSION</bundle>
-        <bundle>mvn:org.onosproject/onos-core-common/@ONOS-VERSION</bundle>
-        <bundle>mvn:org.onosproject/onos-core-trivial/@ONOS-VERSION</bundle>
-    </feature>
-    
 </features>
diff --git a/incubator/net/pom.xml b/incubator/net/pom.xml
index 25e7049..bd0004a 100644
--- a/incubator/net/pom.xml
+++ b/incubator/net/pom.xml
@@ -49,16 +49,9 @@
 
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-core-trivial</artifactId>
+            <artifactId>onos-core-common</artifactId>
             <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- FIXME remove when we figure out the trivial store -->
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-core-dist</artifactId>
-            <version>${project.version}</version>
+            <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>