diff --git a/src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java b/src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java
index 062558e..32ce5e3 100644
--- a/src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java
+++ b/src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java
@@ -27,11 +27,11 @@
 import net.floodlightcontroller.restserver.IRestApiService;
 import net.floodlightcontroller.util.MACAddress;
 import net.onrc.onos.apps.bgproute.RibUpdate.Operation;
+import net.onrc.onos.apps.proxyarp.IArpRequester;
+import net.onrc.onos.apps.proxyarp.IProxyArpService;
 import net.onrc.onos.ofcontroller.core.config.IConfigInfoService;
 import net.onrc.onos.ofcontroller.linkdiscovery.ILinkDiscovery.LDUpdate;
 import net.onrc.onos.ofcontroller.linkdiscovery.ILinkDiscoveryService;
-import net.onrc.onos.ofcontroller.proxyarp.IArpRequester;
-import net.onrc.onos.ofcontroller.proxyarp.IProxyArpService;
 import net.onrc.onos.ofcontroller.util.CallerId;
 import net.onrc.onos.ofcontroller.util.DataPath;
 import net.onrc.onos.ofcontroller.util.Dpid;
diff --git a/src/main/java/net/onrc/onos/ofcontroller/forwarding/Forwarding.java b/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
similarity index 98%
rename from src/main/java/net/onrc/onos/ofcontroller/forwarding/Forwarding.java
rename to src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
index 1eb7750..3d1623c 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/forwarding/Forwarding.java
+++ b/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.ofcontroller.forwarding;
+package net.onrc.onos.apps.forwarding;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -19,6 +19,8 @@
 import net.floodlightcontroller.core.module.IFloodlightModule;
 import net.floodlightcontroller.core.module.IFloodlightService;
 import net.floodlightcontroller.util.MACAddress;
+import net.onrc.onos.apps.proxyarp.BroadcastPacketOutNotification;
+import net.onrc.onos.apps.proxyarp.IProxyArpService;
 import net.onrc.onos.datagrid.IDatagridService;
 import net.onrc.onos.datagrid.IEventChannel;
 import net.onrc.onos.datagrid.IEventChannelListener;
@@ -38,8 +40,6 @@
 import net.onrc.onos.ofcontroller.networkgraph.LinkEvent;
 import net.onrc.onos.ofcontroller.networkgraph.NetworkGraph;
 import net.onrc.onos.ofcontroller.networkgraph.Switch;
-import net.onrc.onos.ofcontroller.proxyarp.BroadcastPacketOutNotification;
-import net.onrc.onos.ofcontroller.proxyarp.IProxyArpService;
 import net.onrc.onos.ofcontroller.util.Dpid;
 import net.onrc.onos.ofcontroller.util.FlowPath;
 import net.onrc.onos.ofcontroller.util.Port;
diff --git a/src/main/java/net/onrc/onos/ofcontroller/forwarding/IForwardingService.java b/src/main/java/net/onrc/onos/apps/forwarding/IForwardingService.java
similarity index 94%
rename from src/main/java/net/onrc/onos/ofcontroller/forwarding/IForwardingService.java
rename to src/main/java/net/onrc/onos/apps/forwarding/IForwardingService.java
index 92d3a18..78bf41c 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/forwarding/IForwardingService.java
+++ b/src/main/java/net/onrc/onos/apps/forwarding/IForwardingService.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.ofcontroller.forwarding;
+package net.onrc.onos.apps.forwarding;
 
 import java.util.Collection;
 
diff --git a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/ArpCache.java b/src/main/java/net/onrc/onos/apps/proxyarp/ArpCache.java
similarity index 98%
rename from src/main/java/net/onrc/onos/ofcontroller/proxyarp/ArpCache.java
rename to src/main/java/net/onrc/onos/apps/proxyarp/ArpCache.java
index 0e965ff..f2e2891 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/ArpCache.java
+++ b/src/main/java/net/onrc/onos/apps/proxyarp/ArpCache.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.ofcontroller.proxyarp;
+package net.onrc.onos.apps.proxyarp;
 
 import java.net.InetAddress;
 import java.util.ArrayList;
diff --git a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/ArpCacheResource.java b/src/main/java/net/onrc/onos/apps/proxyarp/ArpCacheResource.java
similarity index 93%
rename from src/main/java/net/onrc/onos/ofcontroller/proxyarp/ArpCacheResource.java
rename to src/main/java/net/onrc/onos/apps/proxyarp/ArpCacheResource.java
index 242543c..7bf2a5a 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/ArpCacheResource.java
+++ b/src/main/java/net/onrc/onos/apps/proxyarp/ArpCacheResource.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.ofcontroller.proxyarp;
+package net.onrc.onos.apps.proxyarp;
 
 import java.util.List;
 
diff --git a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/ArpReplyNotification.java b/src/main/java/net/onrc/onos/apps/proxyarp/ArpReplyNotification.java
similarity index 96%
rename from src/main/java/net/onrc/onos/ofcontroller/proxyarp/ArpReplyNotification.java
rename to src/main/java/net/onrc/onos/apps/proxyarp/ArpReplyNotification.java
index 081101e..bde2734 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/ArpReplyNotification.java
+++ b/src/main/java/net/onrc/onos/apps/proxyarp/ArpReplyNotification.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.ofcontroller.proxyarp;
+package net.onrc.onos.apps.proxyarp;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/ArpWebRoutable.java b/src/main/java/net/onrc/onos/apps/proxyarp/ArpWebRoutable.java
similarity index 94%
rename from src/main/java/net/onrc/onos/ofcontroller/proxyarp/ArpWebRoutable.java
rename to src/main/java/net/onrc/onos/apps/proxyarp/ArpWebRoutable.java
index 606fb29..82847f2 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/ArpWebRoutable.java
+++ b/src/main/java/net/onrc/onos/apps/proxyarp/ArpWebRoutable.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.ofcontroller.proxyarp;
+package net.onrc.onos.apps.proxyarp;
 
 import net.floodlightcontroller.restserver.RestletRoutable;
 
diff --git a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/BroadcastPacketOutNotification.java b/src/main/java/net/onrc/onos/apps/proxyarp/BroadcastPacketOutNotification.java
similarity index 97%
rename from src/main/java/net/onrc/onos/ofcontroller/proxyarp/BroadcastPacketOutNotification.java
rename to src/main/java/net/onrc/onos/apps/proxyarp/BroadcastPacketOutNotification.java
index 387414b..c2097f2 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/BroadcastPacketOutNotification.java
+++ b/src/main/java/net/onrc/onos/apps/proxyarp/BroadcastPacketOutNotification.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.ofcontroller.proxyarp;
+package net.onrc.onos.apps.proxyarp;
 
 
 
diff --git a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/IArpRequester.java b/src/main/java/net/onrc/onos/apps/proxyarp/IArpRequester.java
similarity index 93%
rename from src/main/java/net/onrc/onos/ofcontroller/proxyarp/IArpRequester.java
rename to src/main/java/net/onrc/onos/apps/proxyarp/IArpRequester.java
index 51a6295..ddc0ab4 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/IArpRequester.java
+++ b/src/main/java/net/onrc/onos/apps/proxyarp/IArpRequester.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.ofcontroller.proxyarp;
+package net.onrc.onos.apps.proxyarp;
 
 import java.net.InetAddress;
 
diff --git a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/IProxyArpService.java b/src/main/java/net/onrc/onos/apps/proxyarp/IProxyArpService.java
similarity index 96%
rename from src/main/java/net/onrc/onos/ofcontroller/proxyarp/IProxyArpService.java
rename to src/main/java/net/onrc/onos/apps/proxyarp/IProxyArpService.java
index 57993e5..1cdf18c 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/IProxyArpService.java
+++ b/src/main/java/net/onrc/onos/apps/proxyarp/IProxyArpService.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.ofcontroller.proxyarp;
+package net.onrc.onos.apps.proxyarp;
 
 import java.net.InetAddress;
 import java.util.List;
diff --git a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/PacketOutNotification.java b/src/main/java/net/onrc/onos/apps/proxyarp/PacketOutNotification.java
similarity index 93%
rename from src/main/java/net/onrc/onos/ofcontroller/proxyarp/PacketOutNotification.java
rename to src/main/java/net/onrc/onos/apps/proxyarp/PacketOutNotification.java
index fb550cb..bd64e59 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/PacketOutNotification.java
+++ b/src/main/java/net/onrc/onos/apps/proxyarp/PacketOutNotification.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.ofcontroller.proxyarp;
+package net.onrc.onos.apps.proxyarp;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/ProxyArpManager.java b/src/main/java/net/onrc/onos/apps/proxyarp/ProxyArpManager.java
similarity index 99%
rename from src/main/java/net/onrc/onos/ofcontroller/proxyarp/ProxyArpManager.java
rename to src/main/java/net/onrc/onos/apps/proxyarp/ProxyArpManager.java
index e5bc64f..ef3bb83 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/ProxyArpManager.java
+++ b/src/main/java/net/onrc/onos/apps/proxyarp/ProxyArpManager.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.ofcontroller.proxyarp;
+package net.onrc.onos.apps.proxyarp;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
diff --git a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/SinglePacketOutNotification.java b/src/main/java/net/onrc/onos/apps/proxyarp/SinglePacketOutNotification.java
similarity index 96%
rename from src/main/java/net/onrc/onos/ofcontroller/proxyarp/SinglePacketOutNotification.java
rename to src/main/java/net/onrc/onos/apps/proxyarp/SinglePacketOutNotification.java
index 62d8086..8ee255b 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/SinglePacketOutNotification.java
+++ b/src/main/java/net/onrc/onos/apps/proxyarp/SinglePacketOutNotification.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.ofcontroller.proxyarp;
+package net.onrc.onos.apps.proxyarp;
 
 
 
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 9425b7e..0592877 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
@@ -7,6 +7,10 @@
 import java.util.HashSet;
 
 import net.floodlightcontroller.util.MACAddress;
+import net.onrc.onos.apps.proxyarp.ArpReplyNotification;
+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;
@@ -22,10 +26,6 @@
 import net.onrc.onos.ofcontroller.networkgraph.PortEvent;
 import net.onrc.onos.ofcontroller.networkgraph.SwitchEvent;
 import net.onrc.onos.ofcontroller.networkgraph.TopologyEvent;
-import net.onrc.onos.ofcontroller.proxyarp.ArpReplyNotification;
-import net.onrc.onos.ofcontroller.proxyarp.BroadcastPacketOutNotification;
-import net.onrc.onos.ofcontroller.proxyarp.PacketOutNotification;
-import net.onrc.onos.ofcontroller.proxyarp.SinglePacketOutNotification;
 import net.onrc.onos.ofcontroller.util.CallerId;
 import net.onrc.onos.ofcontroller.util.DataPath;
 import net.onrc.onos.ofcontroller.util.DataPathEndpoints;
@@ -60,6 +60,7 @@
 
 
 
+
 import com.esotericsoftware.kryo.Kryo;
 
 /**