diff --git a/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java b/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
index e2efdbb..3533ebf 100644
--- a/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
+++ b/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
@@ -24,15 +24,15 @@
 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.IntentMap;
-import net.onrc.onos.intent.IntentOperation;
-import net.onrc.onos.intent.IntentOperationList;
-import net.onrc.onos.intent.PathIntent;
-import net.onrc.onos.intent.ShortestPathIntent;
-import net.onrc.onos.intent.Intent.IntentState;
-import net.onrc.onos.intent.runtime.IPathCalcRuntimeService;
-import net.onrc.onos.intent.runtime.IntentStateList;
+import net.onrc.onos.core.intent.Intent;
+import net.onrc.onos.core.intent.IntentMap;
+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.core.intent.ShortestPathIntent;
+import net.onrc.onos.core.intent.Intent.IntentState;
+import net.onrc.onos.core.intent.runtime.IPathCalcRuntimeService;
+import net.onrc.onos.core.intent.runtime.IntentStateList;
 import net.onrc.onos.ofcontroller.devicemanager.IOnosDeviceService;
 import net.onrc.onos.ofcontroller.flowprogrammer.IFlowPusherService;
 import net.onrc.onos.ofcontroller.networkgraph.Device;
diff --git a/src/main/java/net/onrc/onos/core/datagrid/web/GetNGFlowsSummaryResource.java b/src/main/java/net/onrc/onos/core/datagrid/web/GetNGFlowsSummaryResource.java
index 0ebeec9..33b9a5f 100644
--- a/src/main/java/net/onrc/onos/core/datagrid/web/GetNGFlowsSummaryResource.java
+++ b/src/main/java/net/onrc/onos/core/datagrid/web/GetNGFlowsSummaryResource.java
@@ -4,13 +4,12 @@
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import net.onrc.onos.intent.Intent;
-import net.onrc.onos.intent.PathIntent;
-import net.onrc.onos.intent.ShortestPathIntent;
-import net.onrc.onos.intent.Intent.IntentState;
-import net.onrc.onos.intent.IntentMap;
-import net.onrc.onos.intent.runtime.IPathCalcRuntimeService;
-
+import net.onrc.onos.core.intent.Intent;
+import net.onrc.onos.core.intent.IntentMap;
+import net.onrc.onos.core.intent.PathIntent;
+import net.onrc.onos.core.intent.ShortestPathIntent;
+import net.onrc.onos.core.intent.Intent.IntentState;
+import net.onrc.onos.core.intent.runtime.IPathCalcRuntimeService;
 import net.onrc.onos.ofcontroller.networkgraph.LinkEvent;
 import net.onrc.onos.ofcontroller.networkgraph.Path;
 import net.onrc.onos.ofcontroller.util.CallerId;
diff --git a/src/main/java/net/onrc/onos/core/datagrid/web/IntentResource.java b/src/main/java/net/onrc/onos/core/datagrid/web/IntentResource.java
index 7d338b5..e666eb7 100755
--- a/src/main/java/net/onrc/onos/core/datagrid/web/IntentResource.java
+++ b/src/main/java/net/onrc/onos/core/datagrid/web/IntentResource.java
@@ -8,19 +8,21 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-import net.onrc.onos.intent.ConstrainedShortestPathIntent;
-import net.onrc.onos.intent.ShortestPathIntent;
-import net.onrc.onos.intent.IntentOperation;
-import net.onrc.onos.intent.IntentMap;
-import net.onrc.onos.intent.Intent;
-import net.onrc.onos.intent.runtime.IPathCalcRuntimeService;
-import net.onrc.onos.intent.IntentOperationList;
+import net.onrc.onos.core.intent.ConstrainedShortestPathIntent;
+import net.onrc.onos.core.intent.Intent;
+import net.onrc.onos.core.intent.IntentMap;
+import net.onrc.onos.core.intent.IntentOperation;
+import net.onrc.onos.core.intent.IntentOperationList;
+import net.onrc.onos.core.intent.ShortestPathIntent;
+import net.onrc.onos.core.intent.runtime.IPathCalcRuntimeService;
+
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.JsonNode;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.restlet.resource.Post;
 import org.restlet.resource.ServerResource;
 import org.codehaus.jackson.map.ObjectMapper;
+
 import net.floodlightcontroller.util.MACAddress;
 
 import java.util.HashMap;
diff --git a/src/main/java/net/onrc/onos/intent/Action.java b/src/main/java/net/onrc/onos/core/intent/Action.java
similarity index 85%
rename from src/main/java/net/onrc/onos/intent/Action.java
rename to src/main/java/net/onrc/onos/core/intent/Action.java
index 2f109d1..feea8e4 100644
--- a/src/main/java/net/onrc/onos/intent/Action.java
+++ b/src/main/java/net/onrc/onos/core/intent/Action.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 import net.onrc.onos.ofcontroller.util.FlowEntryAction;
 
diff --git a/src/main/java/net/onrc/onos/intent/ConstrainedBFSTree.java b/src/main/java/net/onrc/onos/core/intent/ConstrainedBFSTree.java
similarity index 98%
rename from src/main/java/net/onrc/onos/intent/ConstrainedBFSTree.java
rename to src/main/java/net/onrc/onos/core/intent/ConstrainedBFSTree.java
index a1edb20..ed03a8e 100644
--- a/src/main/java/net/onrc/onos/intent/ConstrainedBFSTree.java
+++ b/src/main/java/net/onrc/onos/core/intent/ConstrainedBFSTree.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/src/main/java/net/onrc/onos/intent/ConstrainedShortestPathIntent.java b/src/main/java/net/onrc/onos/core/intent/ConstrainedShortestPathIntent.java
similarity index 94%
rename from src/main/java/net/onrc/onos/intent/ConstrainedShortestPathIntent.java
rename to src/main/java/net/onrc/onos/core/intent/ConstrainedShortestPathIntent.java
index 6a6aab0..ca4f753 100644
--- a/src/main/java/net/onrc/onos/intent/ConstrainedShortestPathIntent.java
+++ b/src/main/java/net/onrc/onos/core/intent/ConstrainedShortestPathIntent.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 /**
  * @author Toshio Koide (t-koide@onlab.us)
diff --git a/src/main/java/net/onrc/onos/intent/ErrorIntent.java b/src/main/java/net/onrc/onos/core/intent/ErrorIntent.java
similarity index 94%
rename from src/main/java/net/onrc/onos/intent/ErrorIntent.java
rename to src/main/java/net/onrc/onos/core/intent/ErrorIntent.java
index 27daaa3..a5046e8 100644
--- a/src/main/java/net/onrc/onos/intent/ErrorIntent.java
+++ b/src/main/java/net/onrc/onos/core/intent/ErrorIntent.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 /**
  * This class is instantiated by Run-times to express intent calculation error
diff --git a/src/main/java/net/onrc/onos/intent/FlowEntry.java b/src/main/java/net/onrc/onos/core/intent/FlowEntry.java
similarity index 95%
rename from src/main/java/net/onrc/onos/intent/FlowEntry.java
rename to src/main/java/net/onrc/onos/core/intent/FlowEntry.java
index 7aa3d76..7c9c696 100644
--- a/src/main/java/net/onrc/onos/intent/FlowEntry.java
+++ b/src/main/java/net/onrc/onos/core/intent/FlowEntry.java
@@ -1,10 +1,10 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 import java.util.HashSet;
 import java.util.Set;
 
 import net.floodlightcontroller.util.MACAddress;
-import net.onrc.onos.intent.IntentOperation.Operator;
+import net.onrc.onos.core.intent.IntentOperation.Operator;
 import net.onrc.onos.ofcontroller.util.Dpid;
 import net.onrc.onos.ofcontroller.util.FlowEntryActions;
 import net.onrc.onos.ofcontroller.util.FlowEntryId;
diff --git a/src/main/java/net/onrc/onos/intent/ForwardAction.java b/src/main/java/net/onrc/onos/core/intent/ForwardAction.java
similarity index 95%
rename from src/main/java/net/onrc/onos/intent/ForwardAction.java
rename to src/main/java/net/onrc/onos/core/intent/ForwardAction.java
index 9344d8c..2294d65 100644
--- a/src/main/java/net/onrc/onos/intent/ForwardAction.java
+++ b/src/main/java/net/onrc/onos/core/intent/ForwardAction.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 import net.onrc.onos.ofcontroller.util.FlowEntryAction;
 
diff --git a/src/main/java/net/onrc/onos/intent/Intent.java b/src/main/java/net/onrc/onos/core/intent/Intent.java
similarity index 98%
rename from src/main/java/net/onrc/onos/intent/Intent.java
rename to src/main/java/net/onrc/onos/core/intent/Intent.java
index eba6e32..3c4dbea 100644
--- a/src/main/java/net/onrc/onos/intent/Intent.java
+++ b/src/main/java/net/onrc/onos/core/intent/Intent.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 import java.util.LinkedList;
 
diff --git a/src/main/java/net/onrc/onos/intent/IntentMap.java b/src/main/java/net/onrc/onos/core/intent/IntentMap.java
similarity index 96%
rename from src/main/java/net/onrc/onos/intent/IntentMap.java
rename to src/main/java/net/onrc/onos/core/intent/IntentMap.java
index 8e2e125..ae314a7 100644
--- a/src/main/java/net/onrc/onos/intent/IntentMap.java
+++ b/src/main/java/net/onrc/onos/core/intent/IntentMap.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 import java.util.Collection;
 import java.util.EventListener;
@@ -7,8 +7,8 @@
 import java.util.LinkedList;
 import java.util.Map.Entry;
 
-import net.onrc.onos.intent.Intent.IntentState;
-import net.onrc.onos.intent.runtime.IntentStateList;
+import net.onrc.onos.core.intent.Intent.IntentState;
+import net.onrc.onos.core.intent.runtime.IntentStateList;
 
 /**
  * @author Toshio Koide (t-koide@onlab.us)
diff --git a/src/main/java/net/onrc/onos/intent/IntentOperation.java b/src/main/java/net/onrc/onos/core/intent/IntentOperation.java
similarity index 95%
rename from src/main/java/net/onrc/onos/intent/IntentOperation.java
rename to src/main/java/net/onrc/onos/core/intent/IntentOperation.java
index 57d2667..006c159 100644
--- a/src/main/java/net/onrc/onos/intent/IntentOperation.java
+++ b/src/main/java/net/onrc/onos/core/intent/IntentOperation.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 /**
  * @author Toshio Koide (t-koide@onlab.us)
diff --git a/src/main/java/net/onrc/onos/intent/IntentOperationList.java b/src/main/java/net/onrc/onos/core/intent/IntentOperationList.java
similarity index 90%
rename from src/main/java/net/onrc/onos/intent/IntentOperationList.java
rename to src/main/java/net/onrc/onos/core/intent/IntentOperationList.java
index 881120a..a3981fa 100644
--- a/src/main/java/net/onrc/onos/intent/IntentOperationList.java
+++ b/src/main/java/net/onrc/onos/core/intent/IntentOperationList.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 import java.util.LinkedList;
 
diff --git a/src/main/java/net/onrc/onos/intent/Match.java b/src/main/java/net/onrc/onos/core/intent/Match.java
similarity index 97%
rename from src/main/java/net/onrc/onos/intent/Match.java
rename to src/main/java/net/onrc/onos/core/intent/Match.java
index 886fb64..0d5d38a 100644
--- a/src/main/java/net/onrc/onos/intent/Match.java
+++ b/src/main/java/net/onrc/onos/core/intent/Match.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 import java.util.Arrays;
 
diff --git a/src/main/java/net/onrc/onos/intent/PathIntent.java b/src/main/java/net/onrc/onos/core/intent/PathIntent.java
similarity index 97%
rename from src/main/java/net/onrc/onos/intent/PathIntent.java
rename to src/main/java/net/onrc/onos/core/intent/PathIntent.java
index 7caef9f..c84d739 100644
--- a/src/main/java/net/onrc/onos/intent/PathIntent.java
+++ b/src/main/java/net/onrc/onos/core/intent/PathIntent.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 import net.onrc.onos.ofcontroller.networkgraph.Path;
 
diff --git a/src/main/java/net/onrc/onos/intent/PathIntentMap.java b/src/main/java/net/onrc/onos/core/intent/PathIntentMap.java
similarity index 98%
rename from src/main/java/net/onrc/onos/intent/PathIntentMap.java
rename to src/main/java/net/onrc/onos/core/intent/PathIntentMap.java
index 85ea16c..89e70fb 100644
--- a/src/main/java/net/onrc/onos/intent/PathIntentMap.java
+++ b/src/main/java/net/onrc/onos/core/intent/PathIntentMap.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/src/main/java/net/onrc/onos/intent/ShortestPathIntent.java b/src/main/java/net/onrc/onos/core/intent/ShortestPathIntent.java
similarity index 97%
rename from src/main/java/net/onrc/onos/intent/ShortestPathIntent.java
rename to src/main/java/net/onrc/onos/core/intent/ShortestPathIntent.java
index 5b14fce..9a39627 100644
--- a/src/main/java/net/onrc/onos/intent/ShortestPathIntent.java
+++ b/src/main/java/net/onrc/onos/core/intent/ShortestPathIntent.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.intent;
+package net.onrc.onos.core.intent;
 
 import net.floodlightcontroller.util.MACAddress;
 import net.onrc.onos.ofcontroller.util.Dpid;
diff --git a/src/main/java/net/onrc/onos/intent/runtime/IPathCalcRuntimeService.java b/src/main/java/net/onrc/onos/core/intent/runtime/IPathCalcRuntimeService.java
similarity index 72%
rename from src/main/java/net/onrc/onos/intent/runtime/IPathCalcRuntimeService.java
rename to src/main/java/net/onrc/onos/core/intent/runtime/IPathCalcRuntimeService.java
index 9491d67..c6aad89 100644
--- a/src/main/java/net/onrc/onos/intent/runtime/IPathCalcRuntimeService.java
+++ b/src/main/java/net/onrc/onos/core/intent/runtime/IPathCalcRuntimeService.java
@@ -1,8 +1,8 @@
-package net.onrc.onos.intent.runtime;
+package net.onrc.onos.core.intent.runtime;
 
 import net.floodlightcontroller.core.module.IFloodlightService;
-import net.onrc.onos.intent.IntentMap;
-import net.onrc.onos.intent.IntentOperationList;
+import net.onrc.onos.core.intent.IntentMap;
+import net.onrc.onos.core.intent.IntentOperationList;
 
 /**
  * @author Toshio Koide (t-koide@onlab.us)
diff --git a/src/main/java/net/onrc/onos/intent/runtime/IntentStateList.java b/src/main/java/net/onrc/onos/core/intent/runtime/IntentStateList.java
similarity index 69%
rename from src/main/java/net/onrc/onos/intent/runtime/IntentStateList.java
rename to src/main/java/net/onrc/onos/core/intent/runtime/IntentStateList.java
index 4d2fc75..e6f1180 100644
--- a/src/main/java/net/onrc/onos/intent/runtime/IntentStateList.java
+++ b/src/main/java/net/onrc/onos/core/intent/runtime/IntentStateList.java
@@ -1,8 +1,8 @@
-package net.onrc.onos.intent.runtime;
+package net.onrc.onos.core.intent.runtime;
 
 import java.util.HashMap;
 
-import net.onrc.onos.intent.Intent.IntentState;
+import net.onrc.onos.core.intent.Intent.IntentState;
 
 /**
  * @author Toshio Koide (t-koide@onlab.us)
diff --git a/src/main/java/net/onrc/onos/intent/runtime/PathCalcRuntime.java b/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntime.java
similarity index 86%
rename from src/main/java/net/onrc/onos/intent/runtime/PathCalcRuntime.java
rename to src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntime.java
index 3de671e..89a0b1a 100644
--- a/src/main/java/net/onrc/onos/intent/runtime/PathCalcRuntime.java
+++ b/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntime.java
@@ -1,21 +1,21 @@
-package net.onrc.onos.intent.runtime;
+package net.onrc.onos.core.intent.runtime;
 
 import java.util.HashMap;
 
 import net.floodlightcontroller.core.module.IFloodlightService;
-import net.onrc.onos.intent.ConstrainedBFSTree;
-import net.onrc.onos.intent.ConstrainedShortestPathIntent;
-import net.onrc.onos.intent.ErrorIntent;
-import net.onrc.onos.intent.ErrorIntent.ErrorType;
-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;
-import net.onrc.onos.intent.IntentOperation.Operator;
-import net.onrc.onos.intent.IntentOperationList;
-import net.onrc.onos.intent.PathIntent;
-import net.onrc.onos.intent.PathIntentMap;
-import net.onrc.onos.intent.ShortestPathIntent;
+import net.onrc.onos.core.intent.ConstrainedBFSTree;
+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.IntentOperation;
+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.ShortestPathIntent;
+import net.onrc.onos.core.intent.ErrorIntent.ErrorType;
+import net.onrc.onos.core.intent.Intent.IntentState;
+import net.onrc.onos.core.intent.IntentOperation.Operator;
 import net.onrc.onos.ofcontroller.networkgraph.NetworkGraph;
 import net.onrc.onos.ofcontroller.networkgraph.Path;
 import net.onrc.onos.ofcontroller.networkgraph.Switch;
diff --git a/src/main/java/net/onrc/onos/intent/runtime/PathCalcRuntimeModule.java b/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModule.java
similarity index 96%
rename from src/main/java/net/onrc/onos/intent/runtime/PathCalcRuntimeModule.java
rename to src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModule.java
index b8fe6ed..9f6353e 100755
--- a/src/main/java/net/onrc/onos/intent/runtime/PathCalcRuntimeModule.java
+++ b/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModule.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.intent.runtime;
+package net.onrc.onos.core.intent.runtime;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -20,15 +20,15 @@
 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;
-import net.onrc.onos.intent.IntentOperation.Operator;
-import net.onrc.onos.intent.IntentOperationList;
-import net.onrc.onos.intent.PathIntent;
-import net.onrc.onos.intent.PathIntentMap;
-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.IntentOperation;
+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.ShortestPathIntent;
+import net.onrc.onos.core.intent.Intent.IntentState;
+import net.onrc.onos.core.intent.IntentOperation.Operator;
 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/main/java/net/onrc/onos/intent/runtime/PersistIntent.java b/src/main/java/net/onrc/onos/core/intent/runtime/PersistIntent.java
similarity index 97%
rename from src/main/java/net/onrc/onos/intent/runtime/PersistIntent.java
rename to src/main/java/net/onrc/onos/core/intent/runtime/PersistIntent.java
index 9347d5d..134f437 100755
--- a/src/main/java/net/onrc/onos/intent/runtime/PersistIntent.java
+++ b/src/main/java/net/onrc/onos/core/intent/runtime/PersistIntent.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package net.onrc.onos.intent.runtime;
+package net.onrc.onos.core.intent.runtime;
 
 import com.esotericsoftware.kryo.Kryo;
 import com.esotericsoftware.kryo.io.Output;
@@ -17,7 +17,7 @@
 import net.onrc.onos.core.datastore.DataStoreClient;
 import net.onrc.onos.core.datastore.IKVTable;
 import net.onrc.onos.core.datastore.ObjectExistsException;
-import net.onrc.onos.intent.IntentOperationList;
+import net.onrc.onos.core.intent.IntentOperationList;
 import net.onrc.onos.ofcontroller.networkgraph.INetworkGraphService;
 import net.onrc.onos.ofcontroller.networkgraph.NetworkGraph;
 import net.onrc.onos.ofcontroller.util.serializers.KryoFactory;
diff --git a/src/main/java/net/onrc/onos/intent/runtime/PlanCalcRuntime.java b/src/main/java/net/onrc/onos/core/intent/runtime/PlanCalcRuntime.java
similarity index 91%
rename from src/main/java/net/onrc/onos/intent/runtime/PlanCalcRuntime.java
rename to src/main/java/net/onrc/onos/core/intent/runtime/PlanCalcRuntime.java
index 5691c53..7c92115 100644
--- a/src/main/java/net/onrc/onos/intent/runtime/PlanCalcRuntime.java
+++ b/src/main/java/net/onrc/onos/core/intent/runtime/PlanCalcRuntime.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.intent.runtime;
+package net.onrc.onos.core.intent.runtime;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -11,16 +11,17 @@
 import java.util.Set;
 
 import net.floodlightcontroller.util.MACAddress;
-import net.onrc.onos.intent.FlowEntry;
-import net.onrc.onos.intent.Intent;
-import net.onrc.onos.intent.IntentOperation;
-import net.onrc.onos.intent.IntentOperation.Operator;
-import net.onrc.onos.intent.IntentOperationList;
-import net.onrc.onos.intent.PathIntent;
-import net.onrc.onos.intent.ShortestPathIntent;
+import net.onrc.onos.core.intent.FlowEntry;
+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.core.intent.ShortestPathIntent;
+import net.onrc.onos.core.intent.IntentOperation.Operator;
 import net.onrc.onos.ofcontroller.networkgraph.LinkEvent;
 //import net.onrc.onos.ofcontroller.networkgraph.NetworkGraph;
 
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/net/onrc/onos/intent/runtime/PlanInstallModule.java b/src/main/java/net/onrc/onos/core/intent/runtime/PlanInstallModule.java
similarity index 96%
rename from src/main/java/net/onrc/onos/intent/runtime/PlanInstallModule.java
rename to src/main/java/net/onrc/onos/core/intent/runtime/PlanInstallModule.java
index f4e8226..bbc303d 100644
--- a/src/main/java/net/onrc/onos/intent/runtime/PlanInstallModule.java
+++ b/src/main/java/net/onrc/onos/core/intent/runtime/PlanInstallModule.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.intent.runtime;
+package net.onrc.onos.core.intent.runtime;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -17,15 +17,16 @@
 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.FlowEntry;
-import net.onrc.onos.intent.Intent.IntentState;
-import net.onrc.onos.intent.IntentOperation;
-import net.onrc.onos.intent.IntentOperationList;
+import net.onrc.onos.core.intent.FlowEntry;
+import net.onrc.onos.core.intent.IntentOperation;
+import net.onrc.onos.core.intent.IntentOperationList;
+import net.onrc.onos.core.intent.Intent.IntentState;
 import net.onrc.onos.ofcontroller.flowprogrammer.IFlowPusherService;
 import net.onrc.onos.ofcontroller.networkgraph.INetworkGraphService;
 //import net.onrc.onos.ofcontroller.networkgraph.NetworkGraph;
 
 
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/net/onrc/onos/intent/runtime/PlanInstallRuntime.java b/src/main/java/net/onrc/onos/core/intent/runtime/PlanInstallRuntime.java
similarity index 97%
rename from src/main/java/net/onrc/onos/intent/runtime/PlanInstallRuntime.java
rename to src/main/java/net/onrc/onos/core/intent/runtime/PlanInstallRuntime.java
index e8d498f..e3bdc41 100644
--- a/src/main/java/net/onrc/onos/intent/runtime/PlanInstallRuntime.java
+++ b/src/main/java/net/onrc/onos/core/intent/runtime/PlanInstallRuntime.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.intent.runtime;
+package net.onrc.onos.core.intent.runtime;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -11,7 +11,7 @@
 import net.floodlightcontroller.core.IFloodlightProviderService;
 import net.floodlightcontroller.core.IOFSwitch;
 import net.floodlightcontroller.core.internal.OFMessageFuture;
-import net.onrc.onos.intent.FlowEntry;
+import net.onrc.onos.core.intent.FlowEntry;
 import net.onrc.onos.ofcontroller.flowprogrammer.IFlowPusherService;
 //import net.onrc.onos.ofcontroller.networkgraph.NetworkGraph;
 import net.onrc.onos.ofcontroller.util.Pair;
diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/NetworkGraphShortestPathResource.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/NetworkGraphShortestPathResource.java
index 43e5806..fa5e93b 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/NetworkGraphShortestPathResource.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/NetworkGraphShortestPathResource.java
@@ -4,7 +4,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import net.onrc.onos.intent.ConstrainedBFSTree;
+import net.onrc.onos.core.intent.ConstrainedBFSTree;
 import net.onrc.onos.ofcontroller.networkgraph.INetworkGraphService;
 import net.onrc.onos.ofcontroller.networkgraph.Link;
 import net.onrc.onos.ofcontroller.networkgraph.LinkEvent;
diff --git a/src/main/java/net/onrc/onos/ofcontroller/util/serializers/KryoFactory.java b/src/main/java/net/onrc/onos/ofcontroller/util/serializers/KryoFactory.java
index 0592877..748749f 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/util/serializers/KryoFactory.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/util/serializers/KryoFactory.java
@@ -11,14 +11,14 @@
 import net.onrc.onos.apps.proxyarp.BroadcastPacketOutNotification;
 import net.onrc.onos.apps.proxyarp.PacketOutNotification;
 import net.onrc.onos.apps.proxyarp.SinglePacketOutNotification;
-import net.onrc.onos.intent.ConstrainedShortestPathIntent;
-import net.onrc.onos.intent.ErrorIntent;
-import net.onrc.onos.intent.Intent;
-import net.onrc.onos.intent.IntentOperation;
-import net.onrc.onos.intent.IntentOperationList;
-import net.onrc.onos.intent.PathIntent;
-import net.onrc.onos.intent.ShortestPathIntent;
-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.IntentOperation;
+import net.onrc.onos.core.intent.IntentOperationList;
+import net.onrc.onos.core.intent.PathIntent;
+import net.onrc.onos.core.intent.ShortestPathIntent;
+import net.onrc.onos.core.intent.runtime.IntentStateList;
 import net.onrc.onos.ofcontroller.devicemanager.OnosDevice;
 import net.onrc.onos.ofcontroller.networkgraph.DeviceEvent;
 import net.onrc.onos.ofcontroller.networkgraph.LinkEvent;
@@ -61,6 +61,7 @@
 
 
 
+
 import com.esotericsoftware.kryo.Kryo;
 
 /**
diff --git a/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule b/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule
index 6ca443d..b46b343 100644
--- a/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule
+++ b/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule
@@ -19,5 +19,5 @@
 net.onrc.onos.ofcontroller.core.config.DefaultConfiguration
 net.onrc.onos.ofcontroller.devicemanager.OnosDeviceManager
 net.onrc.onos.ofcontroller.networkgraph.NetworkGraphModule
-net.onrc.onos.intent.runtime.PathCalcRuntimeModule
-net.onrc.onos.intent.runtime.PlanInstallModule
+net.onrc.onos.core.intent.runtime.PathCalcRuntimeModule
+net.onrc.onos.core.intent.runtime.PlanInstallModule