Bundle restructuring

Change-Id: I5a9efa7f4d03bd78dd17297731c5addea5cf0442
diff --git a/core/net/pom.xml b/core/net/pom.xml
index e2703b2..e05a82d 100644
--- a/core/net/pom.xml
+++ b/core/net/pom.xml
@@ -40,13 +40,14 @@
               Currently required for DistributedDeviceManagerTest. -->
         <dependency>
             <groupId>org.onlab.onos</groupId>
-            <artifactId>onos-core-store</artifactId>
+            <artifactId>onos-core-hz</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.onlab.onos</groupId>
-            <artifactId>onos-core-store</artifactId>
+            <!-- FIXME: should be somewhere else -->
+            <artifactId>onos-core-hz</artifactId>
             <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>