diff --git a/src/test/java/net/onrc/onos/intent/ConstrainedBFSTreeTest.java b/src/test/java/net/onrc/onos/core/intent/ConstrainedBFSTreeTest.java
similarity index 92%
rename from src/test/java/net/onrc/onos/intent/ConstrainedBFSTreeTest.java
rename to src/test/java/net/onrc/onos/core/intent/ConstrainedBFSTreeTest.java
index f4413b8..473b32b 100644
--- a/src/test/java/net/onrc/onos/intent/ConstrainedBFSTreeTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/ConstrainedBFSTreeTest.java
@@ -1,7 +1,12 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 import static org.junit.Assert.*;
-import net.onrc.onos.intent.IntentOperation.Operator;
+import net.onrc.onos.core.intent.ConstrainedBFSTree;
+import net.onrc.onos.core.intent.ConstrainedShortestPathIntent;
+import net.onrc.onos.core.intent.IntentOperationList;
+import net.onrc.onos.core.intent.PathIntent;
+import net.onrc.onos.core.intent.PathIntentMap;
+import net.onrc.onos.core.intent.IntentOperation.Operator;
 import net.onrc.onos.ofcontroller.networkgraph.LinkEvent;
 import net.onrc.onos.ofcontroller.networkgraph.Path;
 
diff --git a/src/test/java/net/onrc/onos/intent/ConstrainedShortestPathIntentTest.java b/src/test/java/net/onrc/onos/core/intent/ConstrainedShortestPathIntentTest.java
similarity index 94%
rename from src/test/java/net/onrc/onos/intent/ConstrainedShortestPathIntentTest.java
rename to src/test/java/net/onrc/onos/core/intent/ConstrainedShortestPathIntentTest.java
index 99fa0b3..b0a8afc 100644
--- a/src/test/java/net/onrc/onos/intent/ConstrainedShortestPathIntentTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/ConstrainedShortestPathIntentTest.java
@@ -1,6 +1,7 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 import static org.junit.Assert.assertEquals;
+import net.onrc.onos.core.intent.ConstrainedShortestPathIntent;
 import net.onrc.onos.ofcontroller.util.serializers.KryoFactory;
 
 import org.junit.After;
diff --git a/src/test/java/net/onrc/onos/intent/ErrorIntentTest.java b/src/test/java/net/onrc/onos/core/intent/ErrorIntentTest.java
similarity index 84%
rename from src/test/java/net/onrc/onos/intent/ErrorIntentTest.java
rename to src/test/java/net/onrc/onos/core/intent/ErrorIntentTest.java
index c10b9b5..9fbbd56 100644
--- a/src/test/java/net/onrc/onos/intent/ErrorIntentTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/ErrorIntentTest.java
@@ -1,7 +1,9 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 import static org.junit.Assert.*;
-import net.onrc.onos.intent.ErrorIntent.ErrorType;
+import net.onrc.onos.core.intent.ErrorIntent;
+import net.onrc.onos.core.intent.Intent;
+import net.onrc.onos.core.intent.ErrorIntent.ErrorType;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/src/test/java/net/onrc/onos/intent/IntentMapTest.java b/src/test/java/net/onrc/onos/core/intent/IntentMapTest.java
similarity index 93%
rename from src/test/java/net/onrc/onos/intent/IntentMapTest.java
rename to src/test/java/net/onrc/onos/core/intent/IntentMapTest.java
index b636167..b8ad6fb 100644
--- a/src/test/java/net/onrc/onos/intent/IntentMapTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/IntentMapTest.java
@@ -1,13 +1,19 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
-import net.onrc.onos.intent.ErrorIntent.ErrorType;
-import net.onrc.onos.intent.Intent.IntentState;
-import net.onrc.onos.intent.IntentMap.ChangedEventType;
-import net.onrc.onos.intent.IntentOperation.Operator;
-import net.onrc.onos.intent.runtime.IntentStateList;
+import net.onrc.onos.core.intent.ConstrainedShortestPathIntent;
+import net.onrc.onos.core.intent.ErrorIntent;
+import net.onrc.onos.core.intent.Intent;
+import net.onrc.onos.core.intent.IntentMap;
+import net.onrc.onos.core.intent.IntentOperationList;
+import net.onrc.onos.core.intent.ShortestPathIntent;
+import net.onrc.onos.core.intent.ErrorIntent.ErrorType;
+import net.onrc.onos.core.intent.Intent.IntentState;
+import net.onrc.onos.core.intent.IntentMap.ChangedEventType;
+import net.onrc.onos.core.intent.IntentOperation.Operator;
+import net.onrc.onos.core.intent.runtime.IntentStateList;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/src/test/java/net/onrc/onos/intent/IntentOperationListTest.java b/src/test/java/net/onrc/onos/core/intent/IntentOperationListTest.java
similarity index 87%
rename from src/test/java/net/onrc/onos/intent/IntentOperationListTest.java
rename to src/test/java/net/onrc/onos/core/intent/IntentOperationListTest.java
index e0e907f..aa1410d 100644
--- a/src/test/java/net/onrc/onos/intent/IntentOperationListTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/IntentOperationListTest.java
@@ -1,6 +1,11 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 import static org.junit.Assert.assertEquals;
+import net.onrc.onos.core.intent.ConstrainedShortestPathIntent;
+import net.onrc.onos.core.intent.Intent;
+import net.onrc.onos.core.intent.IntentOperation;
+import net.onrc.onos.core.intent.IntentOperationList;
+import net.onrc.onos.core.intent.PathIntent;
 import net.onrc.onos.ofcontroller.networkgraph.LinkEvent;
 import net.onrc.onos.ofcontroller.networkgraph.Path;
 import net.onrc.onos.ofcontroller.util.serializers.KryoFactory;
diff --git a/src/test/java/net/onrc/onos/intent/IntentOperationTest.java b/src/test/java/net/onrc/onos/core/intent/IntentOperationTest.java
similarity index 85%
rename from src/test/java/net/onrc/onos/intent/IntentOperationTest.java
rename to src/test/java/net/onrc/onos/core/intent/IntentOperationTest.java
index 807f5ba..5dc960d 100644
--- a/src/test/java/net/onrc/onos/intent/IntentOperationTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/IntentOperationTest.java
@@ -1,7 +1,9 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 import static org.junit.Assert.*;
-import net.onrc.onos.intent.IntentOperation.Operator;
+import net.onrc.onos.core.intent.Intent;
+import net.onrc.onos.core.intent.IntentOperation;
+import net.onrc.onos.core.intent.IntentOperation.Operator;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/src/test/java/net/onrc/onos/intent/IntentTest.java b/src/test/java/net/onrc/onos/core/intent/IntentTest.java
similarity index 96%
rename from src/test/java/net/onrc/onos/intent/IntentTest.java
rename to src/test/java/net/onrc/onos/core/intent/IntentTest.java
index abc5373..5b539dc 100644
--- a/src/test/java/net/onrc/onos/intent/IntentTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/IntentTest.java
@@ -1,9 +1,11 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 import static org.junit.Assert.*;
 
 import java.util.HashSet;
 
+import net.onrc.onos.core.intent.Intent;
+
 import org.junit.Test;
 
 /**
diff --git a/src/test/java/net/onrc/onos/intent/MockNetworkGraph.java b/src/test/java/net/onrc/onos/core/intent/MockNetworkGraph.java
similarity index 98%
rename from src/test/java/net/onrc/onos/intent/MockNetworkGraph.java
rename to src/test/java/net/onrc/onos/core/intent/MockNetworkGraph.java
index 9d85e6f..fce9cc2 100644
--- a/src/test/java/net/onrc/onos/intent/MockNetworkGraph.java
+++ b/src/test/java/net/onrc/onos/core/intent/MockNetworkGraph.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 import net.onrc.onos.ofcontroller.networkgraph.NetworkGraph;
 import net.onrc.onos.ofcontroller.networkgraph.NetworkGraphImpl;
diff --git a/src/test/java/net/onrc/onos/intent/PathIntentMapTest.java b/src/test/java/net/onrc/onos/core/intent/PathIntentMapTest.java
similarity index 95%
rename from src/test/java/net/onrc/onos/intent/PathIntentMapTest.java
rename to src/test/java/net/onrc/onos/core/intent/PathIntentMapTest.java
index 1fb96ad..32f7e0f 100644
--- a/src/test/java/net/onrc/onos/intent/PathIntentMapTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/PathIntentMapTest.java
@@ -1,11 +1,15 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
 
 import java.util.Collection;
 
-import net.onrc.onos.intent.IntentOperation.Operator;
+import net.onrc.onos.core.intent.Intent;
+import net.onrc.onos.core.intent.IntentOperationList;
+import net.onrc.onos.core.intent.PathIntent;
+import net.onrc.onos.core.intent.PathIntentMap;
+import net.onrc.onos.core.intent.IntentOperation.Operator;
 import net.onrc.onos.ofcontroller.networkgraph.Link;
 import net.onrc.onos.ofcontroller.networkgraph.LinkEvent;
 import net.onrc.onos.ofcontroller.networkgraph.Path;
diff --git a/src/test/java/net/onrc/onos/intent/PathIntentTest.java b/src/test/java/net/onrc/onos/core/intent/PathIntentTest.java
similarity index 95%
rename from src/test/java/net/onrc/onos/intent/PathIntentTest.java
rename to src/test/java/net/onrc/onos/core/intent/PathIntentTest.java
index 3196493..9b4b255 100644
--- a/src/test/java/net/onrc/onos/intent/PathIntentTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/PathIntentTest.java
@@ -1,6 +1,8 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 import static org.junit.Assert.assertEquals;
+import net.onrc.onos.core.intent.ConstrainedShortestPathIntent;
+import net.onrc.onos.core.intent.PathIntent;
 import net.onrc.onos.ofcontroller.networkgraph.LinkEvent;
 import net.onrc.onos.ofcontroller.networkgraph.Path;
 import net.onrc.onos.ofcontroller.util.serializers.KryoFactory;
diff --git a/src/test/java/net/onrc/onos/intent/ShortestPathIntentTest.java b/src/test/java/net/onrc/onos/core/intent/ShortestPathIntentTest.java
similarity index 92%
rename from src/test/java/net/onrc/onos/intent/ShortestPathIntentTest.java
rename to src/test/java/net/onrc/onos/core/intent/ShortestPathIntentTest.java
index 5012ee6..1c34775 100644
--- a/src/test/java/net/onrc/onos/intent/ShortestPathIntentTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/ShortestPathIntentTest.java
@@ -1,6 +1,7 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 import static org.junit.Assert.*;
+import net.onrc.onos.core.intent.ShortestPathIntent;
 
 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/core/intent/runtime/PathCalcRuntimeModuleTest.java
similarity index 97%
rename from src/test/java/net/onrc/onos/intent/runtime/PathCalcRuntimeModuleTest.java
rename to src/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java
index 0e9da71..be8ad9a 100644
--- a/src/test/java/net/onrc/onos/intent/runtime/PathCalcRuntimeModuleTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java
@@ -1,17 +1,20 @@
-package net.onrc.onos.intent.runtime;
+package net.onrc.onos.core.intent.runtime;
 
 import net.floodlightcontroller.core.module.FloodlightModuleContext;
 import net.floodlightcontroller.core.module.FloodlightModuleException;
 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;
-import net.onrc.onos.intent.IntentOperation.Operator;
-import net.onrc.onos.intent.IntentOperationList;
-import net.onrc.onos.intent.MockNetworkGraph;
-import net.onrc.onos.intent.ShortestPathIntent;
+import net.onrc.onos.core.intent.Intent;
+import net.onrc.onos.core.intent.IntentMap;
+import net.onrc.onos.core.intent.IntentOperationList;
+import net.onrc.onos.core.intent.MockNetworkGraph;
+import net.onrc.onos.core.intent.ShortestPathIntent;
+import net.onrc.onos.core.intent.Intent.IntentState;
+import net.onrc.onos.core.intent.IntentOperation.Operator;
+import net.onrc.onos.core.intent.runtime.IntentStateList;
+import net.onrc.onos.core.intent.runtime.PathCalcRuntimeModule;
+import net.onrc.onos.core.intent.runtime.PersistIntent;
 import net.onrc.onos.ofcontroller.networkgraph.DeviceEvent;
 import net.onrc.onos.ofcontroller.networkgraph.INetworkGraphListener;
 import net.onrc.onos.ofcontroller.networkgraph.INetworkGraphService;
diff --git a/src/test/java/net/onrc/onos/intent/runtime/UseCaseTest.java b/src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java
similarity index 93%
rename from src/test/java/net/onrc/onos/intent/runtime/UseCaseTest.java
rename to src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java
index 50c1228..2505bb4 100755
--- a/src/test/java/net/onrc/onos/intent/runtime/UseCaseTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.intent.runtime;
+package net.onrc.onos.core.intent.runtime;
 
 import static org.easymock.EasyMock.*;
 
@@ -11,16 +11,20 @@
 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;
-import net.onrc.onos.intent.Intent.IntentState;
-import net.onrc.onos.intent.IntentOperation.Operator;
-import net.onrc.onos.intent.IntentOperationList;
-import net.onrc.onos.intent.MockNetworkGraph;
-import net.onrc.onos.intent.PathIntent;
-import net.onrc.onos.intent.PathIntentMap;
-import net.onrc.onos.intent.ShortestPathIntent;
+import net.onrc.onos.core.intent.ConstrainedShortestPathIntent;
+import net.onrc.onos.core.intent.FlowEntry;
+import net.onrc.onos.core.intent.Intent;
+import net.onrc.onos.core.intent.IntentOperationList;
+import net.onrc.onos.core.intent.MockNetworkGraph;
+import net.onrc.onos.core.intent.PathIntent;
+import net.onrc.onos.core.intent.PathIntentMap;
+import net.onrc.onos.core.intent.ShortestPathIntent;
+import net.onrc.onos.core.intent.Intent.IntentState;
+import net.onrc.onos.core.intent.IntentOperation.Operator;
+import net.onrc.onos.core.intent.runtime.IntentStateList;
+import net.onrc.onos.core.intent.runtime.PathCalcRuntimeModule;
+import net.onrc.onos.core.intent.runtime.PersistIntent;
+import net.onrc.onos.core.intent.runtime.PlanCalcRuntime;
 import net.onrc.onos.ofcontroller.networkgraph.DeviceEvent;
 import net.onrc.onos.ofcontroller.networkgraph.INetworkGraphListener;
 import net.onrc.onos.ofcontroller.networkgraph.INetworkGraphService;