diff --git a/src/test/java/net/onrc/onos/datastore/hazelcast/HZTableTest.java b/src/test/java/net/onrc/onos/core/datastore/hazelcast/HZTableTest.java
similarity index 95%
rename from src/test/java/net/onrc/onos/datastore/hazelcast/HZTableTest.java
rename to src/test/java/net/onrc/onos/core/datastore/hazelcast/HZTableTest.java
index a3bfab6..31f1646 100644
--- a/src/test/java/net/onrc/onos/datastore/hazelcast/HZTableTest.java
+++ b/src/test/java/net/onrc/onos/core/datastore/hazelcast/HZTableTest.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.datastore.hazelcast;
+package net.onrc.onos.core.datastore.hazelcast;
 
 import static org.junit.Assert.*;
 
@@ -6,12 +6,14 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import net.onrc.onos.datastore.IKVTable.IKVEntry;
-import net.onrc.onos.datastore.ObjectDoesntExistException;
-import net.onrc.onos.datastore.ObjectExistsException;
-import net.onrc.onos.datastore.WrongVersionException;
-import net.onrc.onos.datastore.hazelcast.HZTable.VersionedValue;
-import net.onrc.onos.datastore.utils.ByteArrayComparator;
+import net.onrc.onos.core.datastore.ObjectDoesntExistException;
+import net.onrc.onos.core.datastore.ObjectExistsException;
+import net.onrc.onos.core.datastore.WrongVersionException;
+import net.onrc.onos.core.datastore.IKVTable.IKVEntry;
+import net.onrc.onos.core.datastore.hazelcast.HZClient;
+import net.onrc.onos.core.datastore.hazelcast.HZTable;
+import net.onrc.onos.core.datastore.hazelcast.HZTable.VersionedValue;
+import net.onrc.onos.core.datastore.utils.ByteArrayComparator;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/src/test/java/net/onrc/onos/datastore/topology/KVSwitchNoDataStoreTest.java b/src/test/java/net/onrc/onos/core/datastore/topology/KVSwitchNoDataStoreTest.java
similarity index 91%
rename from src/test/java/net/onrc/onos/datastore/topology/KVSwitchNoDataStoreTest.java
rename to src/test/java/net/onrc/onos/core/datastore/topology/KVSwitchNoDataStoreTest.java
index e656596..eec4a47 100644
--- a/src/test/java/net/onrc/onos/datastore/topology/KVSwitchNoDataStoreTest.java
+++ b/src/test/java/net/onrc/onos/core/datastore/topology/KVSwitchNoDataStoreTest.java
@@ -1,10 +1,11 @@
-package net.onrc.onos.datastore.topology;
+package net.onrc.onos.core.datastore.topology;
 
 import static org.junit.Assert.*;
 
 import java.nio.ByteBuffer;
 
-import net.onrc.onos.datastore.topology.KVSwitch.STATUS;
+import net.onrc.onos.core.datastore.topology.KVSwitch;
+import net.onrc.onos.core.datastore.topology.KVSwitch.STATUS;
 
 import org.junit.Test;
 
diff --git a/src/test/java/net/onrc/onos/datastore/topology/KVSwitchTest.java b/src/test/java/net/onrc/onos/core/datastore/topology/KVSwitchTest.java
similarity index 92%
rename from src/test/java/net/onrc/onos/datastore/topology/KVSwitchTest.java
rename to src/test/java/net/onrc/onos/core/datastore/topology/KVSwitchTest.java
index ce73034..cb5544b 100644
--- a/src/test/java/net/onrc/onos/datastore/topology/KVSwitchTest.java
+++ b/src/test/java/net/onrc/onos/core/datastore/topology/KVSwitchTest.java
@@ -1,16 +1,17 @@
-package net.onrc.onos.datastore.topology;
+package net.onrc.onos.core.datastore.topology;
 
 import static org.junit.Assert.*;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import net.onrc.onos.datastore.DataStoreClient;
-import net.onrc.onos.datastore.IKVTable;
-import net.onrc.onos.datastore.ObjectDoesntExistException;
-import net.onrc.onos.datastore.ObjectExistsException;
-import net.onrc.onos.datastore.WrongVersionException;
-import net.onrc.onos.datastore.topology.KVSwitch.STATUS;
+import net.onrc.onos.core.datastore.DataStoreClient;
+import net.onrc.onos.core.datastore.IKVTable;
+import net.onrc.onos.core.datastore.ObjectDoesntExistException;
+import net.onrc.onos.core.datastore.ObjectExistsException;
+import net.onrc.onos.core.datastore.WrongVersionException;
+import net.onrc.onos.core.datastore.topology.KVSwitch;
+import net.onrc.onos.core.datastore.topology.KVSwitch.STATUS;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/src/test/java/net/onrc/onos/datastore/topology/KVTopologyTest.java b/src/test/java/net/onrc/onos/core/datastore/topology/KVTopologyTest.java
similarity index 94%
rename from src/test/java/net/onrc/onos/datastore/topology/KVTopologyTest.java
rename to src/test/java/net/onrc/onos/core/datastore/topology/KVTopologyTest.java
index 4fe0a1b..2e77de7 100644
--- a/src/test/java/net/onrc/onos/datastore/topology/KVTopologyTest.java
+++ b/src/test/java/net/onrc/onos/core/datastore/topology/KVTopologyTest.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.datastore.topology;
+package net.onrc.onos.core.datastore.topology;
 
 import static org.junit.Assert.*;
 import static org.hamcrest.Matchers.*;
@@ -10,15 +10,19 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import net.onrc.onos.datastore.DataStoreClient;
-import net.onrc.onos.datastore.IKVClient;
-import net.onrc.onos.datastore.IKVTable;
-import net.onrc.onos.datastore.ObjectDoesntExistException;
-import net.onrc.onos.datastore.ObjectExistsException;
-import net.onrc.onos.datastore.WrongVersionException;
-import net.onrc.onos.datastore.utils.ByteArrayComparator;
-import net.onrc.onos.datastore.utils.KVObject;
-import net.onrc.onos.datastore.utils.KVObject.WriteOp;
+import net.onrc.onos.core.datastore.DataStoreClient;
+import net.onrc.onos.core.datastore.IKVClient;
+import net.onrc.onos.core.datastore.IKVTable;
+import net.onrc.onos.core.datastore.ObjectDoesntExistException;
+import net.onrc.onos.core.datastore.ObjectExistsException;
+import net.onrc.onos.core.datastore.WrongVersionException;
+import net.onrc.onos.core.datastore.topology.KVDevice;
+import net.onrc.onos.core.datastore.topology.KVLink;
+import net.onrc.onos.core.datastore.topology.KVPort;
+import net.onrc.onos.core.datastore.topology.KVSwitch;
+import net.onrc.onos.core.datastore.utils.ByteArrayComparator;
+import net.onrc.onos.core.datastore.utils.KVObject;
+import net.onrc.onos.core.datastore.utils.KVObject.WriteOp;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/src/test/java/net/onrc/onos/intent/runtime/PathCalcRuntimeModuleTest.java b/src/test/java/net/onrc/onos/intent/runtime/PathCalcRuntimeModuleTest.java
index 9096d2d..0e9da71 100644
--- a/src/test/java/net/onrc/onos/intent/runtime/PathCalcRuntimeModuleTest.java
+++ b/src/test/java/net/onrc/onos/intent/runtime/PathCalcRuntimeModuleTest.java
@@ -2,10 +2,9 @@
 
 import net.floodlightcontroller.core.module.FloodlightModuleContext;
 import net.floodlightcontroller.core.module.FloodlightModuleException;
-import net.onrc.onos.datagrid.IDatagridService;
-import net.onrc.onos.datagrid.IEventChannel;
-import net.onrc.onos.datagrid.IEventChannelListener;
-
+import net.onrc.onos.core.datagrid.IDatagridService;
+import net.onrc.onos.core.datagrid.IEventChannel;
+import net.onrc.onos.core.datagrid.IEventChannelListener;
 import net.onrc.onos.intent.Intent;
 import net.onrc.onos.intent.Intent.IntentState;
 import net.onrc.onos.intent.IntentMap;
@@ -38,6 +37,7 @@
 import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;
 import org.hamcrest.TypeSafeMatcher;
+
 import static org.easymock.EasyMock.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
diff --git a/src/test/java/net/onrc/onos/intent/runtime/UseCaseTest.java b/src/test/java/net/onrc/onos/intent/runtime/UseCaseTest.java
index c746811..50c1228 100755
--- a/src/test/java/net/onrc/onos/intent/runtime/UseCaseTest.java
+++ b/src/test/java/net/onrc/onos/intent/runtime/UseCaseTest.java
@@ -8,9 +8,9 @@
 
 import net.floodlightcontroller.core.module.FloodlightModuleContext;
 import net.floodlightcontroller.core.module.FloodlightModuleException;
-import net.onrc.onos.datagrid.IDatagridService;
-import net.onrc.onos.datagrid.IEventChannel;
-import net.onrc.onos.datagrid.IEventChannelListener;
+import net.onrc.onos.core.datagrid.IDatagridService;
+import net.onrc.onos.core.datagrid.IEventChannel;
+import net.onrc.onos.core.datagrid.IEventChannelListener;
 import net.onrc.onos.intent.ConstrainedShortestPathIntent;
 import net.onrc.onos.intent.FlowEntry;
 import net.onrc.onos.intent.Intent;