diff --git a/src/main/java/net/floodlightcontroller/core/IFloodlightProviderService.java b/src/main/java/net/floodlightcontroller/core/IFloodlightProviderService.java
index 436af3d..4a49488 100644
--- a/src/main/java/net/floodlightcontroller/core/IFloodlightProviderService.java
+++ b/src/main/java/net/floodlightcontroller/core/IFloodlightProviderService.java
@@ -21,7 +21,7 @@
 import java.util.Map;
 
 import net.floodlightcontroller.core.module.IFloodlightService;
-import net.floodlightcontroller.packet.Ethernet;
+import net.onrc.onos.packet.Ethernet;
 
 import org.openflow.protocol.OFMessage;
 import org.openflow.protocol.OFType;
diff --git a/src/main/java/net/floodlightcontroller/core/internal/Controller.java b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
index 39bdf3c..d853f9e 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/Controller.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
@@ -57,11 +57,11 @@
 import net.floodlightcontroller.core.internal.OFChannelState.HandshakeState;
 import net.floodlightcontroller.core.util.ListenerDispatcher;
 import net.floodlightcontroller.core.web.CoreWebRoutable;
-import net.floodlightcontroller.packet.Ethernet;
 import net.floodlightcontroller.restserver.IRestApiService;
 import net.floodlightcontroller.threadpool.IThreadPoolService;
 import net.onrc.onos.ofcontroller.core.IOFSwitchPortListener;
 import net.onrc.onos.ofcontroller.linkdiscovery.ILinkDiscoveryService;
+import net.onrc.onos.packet.Ethernet;
 import net.onrc.onos.registry.controller.IControllerRegistryService;
 import net.onrc.onos.registry.controller.IControllerRegistryService.ControlChangeCallback;
 import net.onrc.onos.registry.controller.RegistryException;
diff --git a/src/main/java/net/floodlightcontroller/core/web/serializers/IPv4Serializer.java b/src/main/java/net/floodlightcontroller/core/web/serializers/IPv4Serializer.java
index f4a5877..09fa347 100644
--- a/src/main/java/net/floodlightcontroller/core/web/serializers/IPv4Serializer.java
+++ b/src/main/java/net/floodlightcontroller/core/web/serializers/IPv4Serializer.java
@@ -19,7 +19,7 @@
 
 import java.io.IOException;
 
-import net.floodlightcontroller.packet.IPv4;
+import net.onrc.onos.packet.IPv4;
 
 import org.codehaus.jackson.JsonGenerator;
 import org.codehaus.jackson.JsonProcessingException;
diff --git a/src/main/java/net/onrc/onos/ofcontroller/bgproute/BgpRoute.java b/src/main/java/net/onrc/onos/ofcontroller/bgproute/BgpRoute.java
index a1da185..dc6f075 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/bgproute/BgpRoute.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/bgproute/BgpRoute.java
@@ -24,8 +24,6 @@
 import net.floodlightcontroller.core.module.IFloodlightModule;
 import net.floodlightcontroller.core.module.IFloodlightService;
 import net.floodlightcontroller.core.util.SingletonTask;
-import net.floodlightcontroller.packet.Ethernet;
-import net.floodlightcontroller.packet.IPv4;
 import net.floodlightcontroller.restserver.IRestApiService;
 import net.floodlightcontroller.util.MACAddress;
 import net.onrc.onos.ofcontroller.bgproute.RibUpdate.Operation;
@@ -48,6 +46,8 @@
 import net.onrc.onos.ofcontroller.util.IPv4Net;
 import net.onrc.onos.ofcontroller.util.Port;
 import net.onrc.onos.ofcontroller.util.SwitchPort;
+import net.onrc.onos.packet.Ethernet;
+import net.onrc.onos.packet.IPv4;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import net.sf.json.JSONSerializer;
diff --git a/src/main/java/net/onrc/onos/ofcontroller/devicemanager/OnosDevice.java b/src/main/java/net/onrc/onos/ofcontroller/devicemanager/OnosDevice.java
index ed4dd7d..546ec64 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/devicemanager/OnosDevice.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/devicemanager/OnosDevice.java
@@ -1,5 +1,5 @@
 /**
-*    Copyright 2011,2012, Big Switch Networks, Inc. 
+l*    Copyright 2011,2012, Big Switch Networks, Inc. 
 *    Originally created by David Erickson, Stanford University
 * 
 *    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -20,8 +20,8 @@
 import java.io.Serializable;
 import java.util.Date;
 
-import net.floodlightcontroller.packet.IPv4;
 import net.floodlightcontroller.util.MACAddress;
+import net.onrc.onos.packet.IPv4;
 
 /**
  * An entity on the network is a visible trace of a device that corresponds
@@ -38,10 +38,7 @@
  *
  */
 public class OnosDevice implements Serializable { //implements Comparable<OnosDevice> {
-    /**
-     * Timeout for computing {@link Entity#activeSince}.
-     * @see {@link Entity#activeSince}
-     */
+
     private static int ACTIVITY_TIMEOUT = 30000;
     
     /**
diff --git a/src/main/java/net/onrc/onos/ofcontroller/devicemanager/OnosDeviceManager.java b/src/main/java/net/onrc/onos/ofcontroller/devicemanager/OnosDeviceManager.java
index ef02577..bb2e387 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/devicemanager/OnosDeviceManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/devicemanager/OnosDeviceManager.java
@@ -22,13 +22,13 @@
 import net.floodlightcontroller.core.module.FloodlightModuleException;
 import net.floodlightcontroller.core.module.IFloodlightModule;
 import net.floodlightcontroller.core.module.IFloodlightService;
-import net.floodlightcontroller.packet.ARP;
-import net.floodlightcontroller.packet.DHCP;
-import net.floodlightcontroller.packet.Ethernet;
-import net.floodlightcontroller.packet.IPv4;
-import net.floodlightcontroller.packet.UDP;
 import net.floodlightcontroller.util.MACAddress;
 import net.onrc.onos.datagrid.IDatagridService;
+import net.onrc.onos.packet.ARP;
+import net.onrc.onos.packet.DHCP;
+import net.onrc.onos.packet.Ethernet;
+import net.onrc.onos.packet.IPv4;
+import net.onrc.onos.packet.UDP;
 
 import org.openflow.protocol.OFMessage;
 import org.openflow.protocol.OFPacketIn;
diff --git a/src/main/java/net/onrc/onos/ofcontroller/forwarding/Forwarding.java b/src/main/java/net/onrc/onos/ofcontroller/forwarding/Forwarding.java
index 8dfd3e3..0ee4466 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/forwarding/Forwarding.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/forwarding/Forwarding.java
@@ -17,7 +17,6 @@
 import net.floodlightcontroller.core.module.FloodlightModuleContext;
 import net.floodlightcontroller.core.module.IFloodlightModule;
 import net.floodlightcontroller.core.module.IFloodlightService;
-import net.floodlightcontroller.packet.Ethernet;
 import net.floodlightcontroller.util.MACAddress;
 import net.onrc.onos.datagrid.IDatagridService;
 import net.onrc.onos.ofcontroller.devicemanager.IOnosDeviceService;
@@ -35,6 +34,7 @@
 import net.onrc.onos.ofcontroller.util.FlowPathUserState;
 import net.onrc.onos.ofcontroller.util.Port;
 import net.onrc.onos.ofcontroller.util.SwitchPort;
+import net.onrc.onos.packet.Ethernet;
 import net.onrc.onos.registry.controller.IControllerRegistryService;
 
 import org.openflow.protocol.OFMessage;
diff --git a/src/main/java/net/onrc/onos/ofcontroller/linkdiscovery/internal/LinkDiscoveryManager.java b/src/main/java/net/onrc/onos/ofcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
index a035867..39444b9 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
@@ -52,11 +52,6 @@
 import net.floodlightcontroller.core.module.IFloodlightModule;
 import net.floodlightcontroller.core.module.IFloodlightService;
 import net.floodlightcontroller.core.util.SingletonTask;
-import net.floodlightcontroller.packet.BSN;
-import net.floodlightcontroller.packet.Ethernet;
-import net.floodlightcontroller.packet.IPv4;
-import net.floodlightcontroller.packet.LLDP;
-import net.floodlightcontroller.packet.LLDPTLV;
 import net.floodlightcontroller.restserver.IRestApiService;
 import net.floodlightcontroller.threadpool.IThreadPoolService;
 import net.floodlightcontroller.util.EventHistory;
@@ -71,6 +66,11 @@
 import net.onrc.onos.ofcontroller.linkdiscovery.LinkInfo;
 import net.onrc.onos.ofcontroller.linkdiscovery.NodePortTuple;
 import net.onrc.onos.ofcontroller.linkdiscovery.web.LinkDiscoveryWebRoutable;
+import net.onrc.onos.packet.BSN;
+import net.onrc.onos.packet.Ethernet;
+import net.onrc.onos.packet.IPv4;
+import net.onrc.onos.packet.LLDP;
+import net.onrc.onos.packet.LLDPTLV;
 import net.onrc.onos.registry.controller.IControllerRegistryService;
 
 import org.openflow.protocol.OFMessage;
diff --git a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/ProxyArpManager.java b/src/main/java/net/onrc/onos/ofcontroller/proxyarp/ProxyArpManager.java
index 9e2ae4c..2294a60 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/proxyarp/ProxyArpManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/proxyarp/ProxyArpManager.java
@@ -19,9 +19,6 @@
 import net.floodlightcontroller.core.module.FloodlightModuleContext;
 import net.floodlightcontroller.core.module.IFloodlightModule;
 import net.floodlightcontroller.core.module.IFloodlightService;
-import net.floodlightcontroller.packet.ARP;
-import net.floodlightcontroller.packet.Ethernet;
-import net.floodlightcontroller.packet.IPv4;
 import net.floodlightcontroller.restserver.IRestApiService;
 import net.floodlightcontroller.util.MACAddress;
 import net.onrc.onos.datagrid.IDatagridService;
@@ -29,6 +26,9 @@
 import net.onrc.onos.ofcontroller.core.config.IConfigInfoService;
 import net.onrc.onos.ofcontroller.flowprogrammer.IFlowPusherService;
 import net.onrc.onos.ofcontroller.util.SwitchPort;
+import net.onrc.onos.packet.ARP;
+import net.onrc.onos.packet.Ethernet;
+import net.onrc.onos.packet.IPv4;
 
 import org.openflow.protocol.OFMessage;
 import org.openflow.protocol.OFPacketIn;
diff --git a/src/main/java/net/floodlightcontroller/packet/ARP.java b/src/main/java/net/onrc/onos/packet/ARP.java
similarity index 99%
rename from src/main/java/net/floodlightcontroller/packet/ARP.java
rename to src/main/java/net/onrc/onos/packet/ARP.java
index e8428ea..2765f7d 100644
--- a/src/main/java/net/floodlightcontroller/packet/ARP.java
+++ b/src/main/java/net/onrc/onos/packet/ARP.java
@@ -15,7 +15,7 @@
 *    under the License.
 **/
 
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
diff --git a/src/main/java/net/floodlightcontroller/packet/BPDU.java b/src/main/java/net/onrc/onos/packet/BPDU.java
similarity index 98%
rename from src/main/java/net/floodlightcontroller/packet/BPDU.java
rename to src/main/java/net/onrc/onos/packet/BPDU.java
index 6c27216..908411b 100644
--- a/src/main/java/net/floodlightcontroller/packet/BPDU.java
+++ b/src/main/java/net/onrc/onos/packet/BPDU.java
@@ -15,7 +15,7 @@
 *    under the License.
 **/
 
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/main/java/net/floodlightcontroller/packet/BSN.java b/src/main/java/net/onrc/onos/packet/BSN.java
similarity index 98%
rename from src/main/java/net/floodlightcontroller/packet/BSN.java
rename to src/main/java/net/onrc/onos/packet/BSN.java
index 27c8f70..a8c7dc0 100644
--- a/src/main/java/net/floodlightcontroller/packet/BSN.java
+++ b/src/main/java/net/onrc/onos/packet/BSN.java
@@ -17,7 +17,7 @@
 /**
  * 
  */
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import java.nio.ByteBuffer;
 import java.util.HashMap;
diff --git a/src/main/java/net/floodlightcontroller/packet/BSNPROBE.java b/src/main/java/net/onrc/onos/packet/BSNPROBE.java
similarity index 98%
rename from src/main/java/net/floodlightcontroller/packet/BSNPROBE.java
rename to src/main/java/net/onrc/onos/packet/BSNPROBE.java
index 720b45f..0519208 100644
--- a/src/main/java/net/floodlightcontroller/packet/BSNPROBE.java
+++ b/src/main/java/net/onrc/onos/packet/BSNPROBE.java
@@ -17,7 +17,7 @@
 /**
  * 
  */
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
diff --git a/src/main/java/net/floodlightcontroller/packet/BasePacket.java b/src/main/java/net/onrc/onos/packet/BasePacket.java
similarity index 98%
rename from src/main/java/net/floodlightcontroller/packet/BasePacket.java
rename to src/main/java/net/onrc/onos/packet/BasePacket.java
index 4ecfded..6d91640 100644
--- a/src/main/java/net/floodlightcontroller/packet/BasePacket.java
+++ b/src/main/java/net/onrc/onos/packet/BasePacket.java
@@ -15,7 +15,7 @@
 *    under the License.
 **/
 
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 
 /**
diff --git a/src/main/java/net/floodlightcontroller/packet/DHCP.java b/src/main/java/net/onrc/onos/packet/DHCP.java
similarity index 99%
rename from src/main/java/net/floodlightcontroller/packet/DHCP.java
rename to src/main/java/net/onrc/onos/packet/DHCP.java
index f73d9c9..2e71ec8 100644
--- a/src/main/java/net/floodlightcontroller/packet/DHCP.java
+++ b/src/main/java/net/onrc/onos/packet/DHCP.java
@@ -15,7 +15,7 @@
 *    under the License.
 **/
 
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
diff --git a/src/main/java/net/floodlightcontroller/packet/DHCPOption.java b/src/main/java/net/onrc/onos/packet/DHCPOption.java
similarity index 98%
rename from src/main/java/net/floodlightcontroller/packet/DHCPOption.java
rename to src/main/java/net/onrc/onos/packet/DHCPOption.java
index 1fcc324..539fa99 100644
--- a/src/main/java/net/floodlightcontroller/packet/DHCPOption.java
+++ b/src/main/java/net/onrc/onos/packet/DHCPOption.java
@@ -15,7 +15,7 @@
 *    under the License.
 **/
 
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import java.util.Arrays;
 
diff --git a/src/main/java/net/floodlightcontroller/packet/DHCPPacketType.java b/src/main/java/net/onrc/onos/packet/DHCPPacketType.java
similarity index 98%
rename from src/main/java/net/floodlightcontroller/packet/DHCPPacketType.java
rename to src/main/java/net/onrc/onos/packet/DHCPPacketType.java
index 3417a18..a01a2a2 100644
--- a/src/main/java/net/floodlightcontroller/packet/DHCPPacketType.java
+++ b/src/main/java/net/onrc/onos/packet/DHCPPacketType.java
@@ -15,7 +15,7 @@
 *    under the License.
 **/
 
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 public enum DHCPPacketType {
     // From RFC 1533
diff --git a/src/main/java/net/floodlightcontroller/packet/Data.java b/src/main/java/net/onrc/onos/packet/Data.java
similarity index 97%
rename from src/main/java/net/floodlightcontroller/packet/Data.java
rename to src/main/java/net/onrc/onos/packet/Data.java
index 47762da..ac1aa42 100644
--- a/src/main/java/net/floodlightcontroller/packet/Data.java
+++ b/src/main/java/net/onrc/onos/packet/Data.java
@@ -15,7 +15,7 @@
 *    under the License.
 **/
 
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import java.util.Arrays;
 
diff --git a/src/main/java/net/floodlightcontroller/packet/Ethernet.java b/src/main/java/net/onrc/onos/packet/Ethernet.java
similarity index 99%
rename from src/main/java/net/floodlightcontroller/packet/Ethernet.java
rename to src/main/java/net/onrc/onos/packet/Ethernet.java
index 6bd627b..c884129 100644
--- a/src/main/java/net/floodlightcontroller/packet/Ethernet.java
+++ b/src/main/java/net/onrc/onos/packet/Ethernet.java
@@ -15,7 +15,7 @@
 *    under the License.
 **/
 
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
diff --git a/src/main/java/net/floodlightcontroller/packet/ICMP.java b/src/main/java/net/onrc/onos/packet/ICMP.java
similarity index 98%
rename from src/main/java/net/floodlightcontroller/packet/ICMP.java
rename to src/main/java/net/onrc/onos/packet/ICMP.java
index 5431277..f66b163 100644
--- a/src/main/java/net/floodlightcontroller/packet/ICMP.java
+++ b/src/main/java/net/onrc/onos/packet/ICMP.java
@@ -15,7 +15,7 @@
 *    under the License.
 **/
 
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/main/java/net/floodlightcontroller/packet/IPacket.java b/src/main/java/net/onrc/onos/packet/IPacket.java
similarity index 97%
rename from src/main/java/net/floodlightcontroller/packet/IPacket.java
rename to src/main/java/net/onrc/onos/packet/IPacket.java
index 02376cd..cb48f88 100644
--- a/src/main/java/net/floodlightcontroller/packet/IPacket.java
+++ b/src/main/java/net/onrc/onos/packet/IPacket.java
@@ -15,7 +15,7 @@
 *    under the License.
 **/
 
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 /**
 *
diff --git a/src/main/java/net/floodlightcontroller/packet/IPv4.java b/src/main/java/net/onrc/onos/packet/IPv4.java
similarity index 99%
rename from src/main/java/net/floodlightcontroller/packet/IPv4.java
rename to src/main/java/net/onrc/onos/packet/IPv4.java
index 85f21ca..9dc5ec2 100644
--- a/src/main/java/net/floodlightcontroller/packet/IPv4.java
+++ b/src/main/java/net/onrc/onos/packet/IPv4.java
@@ -18,7 +18,7 @@
 /**
  * 
  */
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
diff --git a/src/main/java/net/floodlightcontroller/packet/LLC.java b/src/main/java/net/onrc/onos/packet/LLC.java
similarity index 97%
rename from src/main/java/net/floodlightcontroller/packet/LLC.java
rename to src/main/java/net/onrc/onos/packet/LLC.java
index dc7d6d8..7ff4f56 100644
--- a/src/main/java/net/floodlightcontroller/packet/LLC.java
+++ b/src/main/java/net/onrc/onos/packet/LLC.java
@@ -15,7 +15,7 @@
 *    under the License.
 **/
 
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/main/java/net/floodlightcontroller/packet/LLDP.java b/src/main/java/net/onrc/onos/packet/LLDP.java
similarity index 98%
rename from src/main/java/net/floodlightcontroller/packet/LLDP.java
rename to src/main/java/net/onrc/onos/packet/LLDP.java
index 8c2c457..0e3cb2f 100644
--- a/src/main/java/net/floodlightcontroller/packet/LLDP.java
+++ b/src/main/java/net/onrc/onos/packet/LLDP.java
@@ -18,7 +18,7 @@
 /**
  * 
  */
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
diff --git a/src/main/java/net/floodlightcontroller/packet/LLDPOrganizationalTLV.java b/src/main/java/net/onrc/onos/packet/LLDPOrganizationalTLV.java
similarity index 98%
rename from src/main/java/net/floodlightcontroller/packet/LLDPOrganizationalTLV.java
rename to src/main/java/net/onrc/onos/packet/LLDPOrganizationalTLV.java
index a0930bd..754875c 100644
--- a/src/main/java/net/floodlightcontroller/packet/LLDPOrganizationalTLV.java
+++ b/src/main/java/net/onrc/onos/packet/LLDPOrganizationalTLV.java
@@ -12,7 +12,7 @@
  *    under the License.
  **/
 
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
diff --git a/src/main/java/net/floodlightcontroller/packet/LLDPTLV.java b/src/main/java/net/onrc/onos/packet/LLDPTLV.java
similarity index 98%
rename from src/main/java/net/floodlightcontroller/packet/LLDPTLV.java
rename to src/main/java/net/onrc/onos/packet/LLDPTLV.java
index 0552321..fe361cb 100644
--- a/src/main/java/net/floodlightcontroller/packet/LLDPTLV.java
+++ b/src/main/java/net/onrc/onos/packet/LLDPTLV.java
@@ -15,7 +15,7 @@
 *    under the License.
 **/
 
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
diff --git a/src/main/java/net/floodlightcontroller/packet/TCP.java b/src/main/java/net/onrc/onos/packet/TCP.java
similarity index 99%
rename from src/main/java/net/floodlightcontroller/packet/TCP.java
rename to src/main/java/net/onrc/onos/packet/TCP.java
index 889e4c6..505ada2 100644
--- a/src/main/java/net/floodlightcontroller/packet/TCP.java
+++ b/src/main/java/net/onrc/onos/packet/TCP.java
@@ -15,7 +15,7 @@
 *    under the License.
 **/
 
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/main/java/net/floodlightcontroller/packet/UDP.java b/src/main/java/net/onrc/onos/packet/UDP.java
similarity index 99%
rename from src/main/java/net/floodlightcontroller/packet/UDP.java
rename to src/main/java/net/onrc/onos/packet/UDP.java
index cbeeedf..88ef883 100644
--- a/src/main/java/net/floodlightcontroller/packet/UDP.java
+++ b/src/main/java/net/onrc/onos/packet/UDP.java
@@ -15,7 +15,7 @@
 *    under the License.
 **/
 
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import java.nio.ByteBuffer;
 import java.util.HashMap;
diff --git a/src/main/java/org/openflow/protocol/OFMessage.java b/src/main/java/org/openflow/protocol/OFMessage.java
index 7ea69a7..d8fdb59 100644
--- a/src/main/java/org/openflow/protocol/OFMessage.java
+++ b/src/main/java/org/openflow/protocol/OFMessage.java
@@ -25,7 +25,7 @@
 import net.floodlightcontroller.core.FloodlightContext;
 import net.floodlightcontroller.core.IFloodlightProviderService;
 import net.floodlightcontroller.core.IOFSwitch;
-import net.floodlightcontroller.packet.Ethernet;
+import net.onrc.onos.packet.Ethernet;
 
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.openflow.util.HexString;
diff --git a/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java b/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java
index 9c7b820..a0dc06b 100644
--- a/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java
+++ b/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java
@@ -51,10 +51,6 @@
 import net.floodlightcontroller.core.internal.OFChannelState.HandshakeState;
 import net.floodlightcontroller.core.module.FloodlightModuleContext;
 import net.floodlightcontroller.core.test.MockThreadPoolService;
-import net.floodlightcontroller.packet.ARP;
-import net.floodlightcontroller.packet.Ethernet;
-import net.floodlightcontroller.packet.IPacket;
-import net.floodlightcontroller.packet.IPv4;
 import net.floodlightcontroller.restserver.IRestApiService;
 import net.floodlightcontroller.restserver.RestApiServer;
 import net.floodlightcontroller.test.FloodlightTestCase;
@@ -62,6 +58,10 @@
 import net.onrc.onos.ofcontroller.core.IOFSwitchPortListener;
 import net.onrc.onos.ofcontroller.linkdiscovery.ILinkDiscoveryService;
 import net.onrc.onos.ofcontroller.linkdiscovery.internal.LinkDiscoveryManager;
+import net.onrc.onos.packet.ARP;
+import net.onrc.onos.packet.Ethernet;
+import net.onrc.onos.packet.IPacket;
+import net.onrc.onos.packet.IPv4;
 import net.onrc.onos.registry.controller.IControllerRegistryService;
 import net.onrc.onos.registry.controller.StandaloneRegistry;
 
diff --git a/src/test/java/net/floodlightcontroller/core/test/MockFloodlightProvider.java b/src/test/java/net/floodlightcontroller/core/test/MockFloodlightProvider.java
index f3abae8..34a3f62 100644
--- a/src/test/java/net/floodlightcontroller/core/test/MockFloodlightProvider.java
+++ b/src/test/java/net/floodlightcontroller/core/test/MockFloodlightProvider.java
@@ -42,7 +42,7 @@
 import net.floodlightcontroller.core.module.IFloodlightModule;
 import net.floodlightcontroller.core.module.IFloodlightService;
 import net.floodlightcontroller.core.util.ListenerDispatcher;
-import net.floodlightcontroller.packet.Ethernet;
+import net.onrc.onos.packet.Ethernet;
 
 import org.openflow.protocol.OFMessage;
 import org.openflow.protocol.OFPacketIn;
diff --git a/src/test/java/net/floodlightcontroller/core/test/PacketFactory.java b/src/test/java/net/floodlightcontroller/core/test/PacketFactory.java
index 4d9ca32..6d78426 100644
--- a/src/test/java/net/floodlightcontroller/core/test/PacketFactory.java
+++ b/src/test/java/net/floodlightcontroller/core/test/PacketFactory.java
@@ -3,12 +3,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import net.floodlightcontroller.packet.DHCP;
-import net.floodlightcontroller.packet.DHCPOption;
-import net.floodlightcontroller.packet.Ethernet;
-import net.floodlightcontroller.packet.IPv4;
-import net.floodlightcontroller.packet.UDP;
 import net.floodlightcontroller.util.MACAddress;
+import net.onrc.onos.packet.DHCP;
+import net.onrc.onos.packet.DHCPOption;
+import net.onrc.onos.packet.Ethernet;
+import net.onrc.onos.packet.IPv4;
+import net.onrc.onos.packet.UDP;
 
 import org.openflow.protocol.OFPacketIn;
 import org.openflow.protocol.OFPacketOut;
diff --git a/src/test/java/net/floodlightcontroller/util/MACAddressTest.java b/src/test/java/net/floodlightcontroller/util/MACAddressTest.java
index f19eedb..ee79566 100644
--- a/src/test/java/net/floodlightcontroller/util/MACAddressTest.java
+++ b/src/test/java/net/floodlightcontroller/util/MACAddressTest.java
@@ -50,7 +50,7 @@
         MACAddress.valueOf(new byte[]{0x01, 0x01, 0x02, 0x03, 0x04});
     }
 
-    //  Test data is imported from net.floodlightcontroller.packet.EthernetTest
+    //  Test data is imported from net.onrc.onos.packet.EthernetTest
     @Test
     public void testToLong() {
         assertEquals(
diff --git a/src/test/java/net/floodlightcontroller/packet/BSNTest.java b/src/test/java/net/onrc/onos/packet/BSNTest.java
similarity index 94%
rename from src/test/java/net/floodlightcontroller/packet/BSNTest.java
rename to src/test/java/net/onrc/onos/packet/BSNTest.java
index d672fdf..a72caef 100644
--- a/src/test/java/net/floodlightcontroller/packet/BSNTest.java
+++ b/src/test/java/net/onrc/onos/packet/BSNTest.java
@@ -18,13 +18,17 @@
 /**
  *
  */
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
 
+import net.onrc.onos.packet.BSN;
+import net.onrc.onos.packet.BSNPROBE;
+import net.onrc.onos.packet.Ethernet;
+
 import org.junit.Test;
 
 /**
diff --git a/src/test/java/net/floodlightcontroller/packet/DHCPTest.java b/src/test/java/net/onrc/onos/packet/DHCPTest.java
similarity index 99%
rename from src/test/java/net/floodlightcontroller/packet/DHCPTest.java
rename to src/test/java/net/onrc/onos/packet/DHCPTest.java
index b83ffa8..cc15bd1 100644
--- a/src/test/java/net/floodlightcontroller/packet/DHCPTest.java
+++ b/src/test/java/net/onrc/onos/packet/DHCPTest.java
@@ -18,13 +18,18 @@
 /**
  * 
  */
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 
 
 import java.util.Arrays;
 import java.util.ListIterator;
 
+import net.onrc.onos.packet.DHCP;
+import net.onrc.onos.packet.DHCPOption;
+import net.onrc.onos.packet.Ethernet;
+import net.onrc.onos.packet.IPv4;
+import net.onrc.onos.packet.UDP;
 import junit.framework.TestCase;
 
 
diff --git a/src/test/java/net/floodlightcontroller/packet/EthernetTest.java b/src/test/java/net/onrc/onos/packet/EthernetTest.java
similarity index 97%
rename from src/test/java/net/floodlightcontroller/packet/EthernetTest.java
rename to src/test/java/net/onrc/onos/packet/EthernetTest.java
index f742f21..b22c779 100644
--- a/src/test/java/net/floodlightcontroller/packet/EthernetTest.java
+++ b/src/test/java/net/onrc/onos/packet/EthernetTest.java
@@ -18,13 +18,15 @@
 /**
  * 
  */
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
 
+import net.onrc.onos.packet.Ethernet;
+
 import org.junit.Test;
 
 /**
diff --git a/src/test/java/net/floodlightcontroller/packet/ICMPTest.java b/src/test/java/net/onrc/onos/packet/ICMPTest.java
similarity index 93%
rename from src/test/java/net/floodlightcontroller/packet/ICMPTest.java
rename to src/test/java/net/onrc/onos/packet/ICMPTest.java
index e554c4e..73e9cff 100644
--- a/src/test/java/net/floodlightcontroller/packet/ICMPTest.java
+++ b/src/test/java/net/onrc/onos/packet/ICMPTest.java
@@ -18,12 +18,17 @@
 /**
  * 
  */
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
 
+import net.onrc.onos.packet.Data;
+import net.onrc.onos.packet.ICMP;
+import net.onrc.onos.packet.IPacket;
+import net.onrc.onos.packet.IPv4;
+
 import org.junit.Test;
 
 /**
diff --git a/src/test/java/net/floodlightcontroller/packet/IPv4Test.java b/src/test/java/net/onrc/onos/packet/IPv4Test.java
similarity index 97%
rename from src/test/java/net/floodlightcontroller/packet/IPv4Test.java
rename to src/test/java/net/onrc/onos/packet/IPv4Test.java
index 928a2de..b81be6f 100644
--- a/src/test/java/net/floodlightcontroller/packet/IPv4Test.java
+++ b/src/test/java/net/onrc/onos/packet/IPv4Test.java
@@ -18,13 +18,15 @@
 /**
  * 
  */
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
 
+import net.onrc.onos.packet.IPv4;
+
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/net/floodlightcontroller/packet/LLDPOrganizationalTLVTest.java b/src/test/java/net/onrc/onos/packet/LLDPOrganizationalTLVTest.java
similarity index 97%
rename from src/test/java/net/floodlightcontroller/packet/LLDPOrganizationalTLVTest.java
rename to src/test/java/net/onrc/onos/packet/LLDPOrganizationalTLVTest.java
index 88fb26f..1a8367c 100644
--- a/src/test/java/net/floodlightcontroller/packet/LLDPOrganizationalTLVTest.java
+++ b/src/test/java/net/onrc/onos/packet/LLDPOrganizationalTLVTest.java
@@ -12,7 +12,9 @@
  *    under the License.
  **/
 
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
+
+import net.onrc.onos.packet.LLDPOrganizationalTLV;
 
 import org.junit.Test;
 
diff --git a/src/test/java/net/floodlightcontroller/packet/LLDPTest.java b/src/test/java/net/onrc/onos/packet/LLDPTest.java
similarity index 93%
rename from src/test/java/net/floodlightcontroller/packet/LLDPTest.java
rename to src/test/java/net/onrc/onos/packet/LLDPTest.java
index 930c66a..c093efb 100755
--- a/src/test/java/net/floodlightcontroller/packet/LLDPTest.java
+++ b/src/test/java/net/onrc/onos/packet/LLDPTest.java
@@ -18,13 +18,18 @@
 /**
  *
  */
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
 
+import net.onrc.onos.packet.Ethernet;
+import net.onrc.onos.packet.IPacket;
+import net.onrc.onos.packet.LLDP;
+import net.onrc.onos.packet.LLDPTLV;
+
 import org.junit.Test;
 
 /**
diff --git a/src/test/java/net/floodlightcontroller/packet/PacketTest.java b/src/test/java/net/onrc/onos/packet/PacketTest.java
similarity index 95%
rename from src/test/java/net/floodlightcontroller/packet/PacketTest.java
rename to src/test/java/net/onrc/onos/packet/PacketTest.java
index 67bed71..f30c12b 100644
--- a/src/test/java/net/floodlightcontroller/packet/PacketTest.java
+++ b/src/test/java/net/onrc/onos/packet/PacketTest.java
@@ -1,6 +1,13 @@
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import static org.junit.Assert.*;
+import net.onrc.onos.packet.ARP;
+import net.onrc.onos.packet.Data;
+import net.onrc.onos.packet.Ethernet;
+import net.onrc.onos.packet.IPacket;
+import net.onrc.onos.packet.IPv4;
+import net.onrc.onos.packet.UDP;
+
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/src/test/java/net/floodlightcontroller/packet/TCPTest.java b/src/test/java/net/onrc/onos/packet/TCPTest.java
similarity index 94%
rename from src/test/java/net/floodlightcontroller/packet/TCPTest.java
rename to src/test/java/net/onrc/onos/packet/TCPTest.java
index fcd5422..03ef8b6 100644
--- a/src/test/java/net/floodlightcontroller/packet/TCPTest.java
+++ b/src/test/java/net/onrc/onos/packet/TCPTest.java
@@ -18,12 +18,16 @@
 /**
  * 
  */
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
 
+import net.onrc.onos.packet.IPacket;
+import net.onrc.onos.packet.IPv4;
+import net.onrc.onos.packet.TCP;
+
 import org.junit.Test;
 
 /**
diff --git a/src/test/java/net/floodlightcontroller/packet/UDPTest.java b/src/test/java/net/onrc/onos/packet/UDPTest.java
similarity index 91%
rename from src/test/java/net/floodlightcontroller/packet/UDPTest.java
rename to src/test/java/net/onrc/onos/packet/UDPTest.java
index bed42a2..c9081e8 100644
--- a/src/test/java/net/floodlightcontroller/packet/UDPTest.java
+++ b/src/test/java/net/onrc/onos/packet/UDPTest.java
@@ -18,12 +18,17 @@
 /**
  * 
  */
-package net.floodlightcontroller.packet;
+package net.onrc.onos.packet;
 
 import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
 
+import net.onrc.onos.packet.Data;
+import net.onrc.onos.packet.IPacket;
+import net.onrc.onos.packet.IPv4;
+import net.onrc.onos.packet.UDP;
+
 import org.junit.Test;
 
 /**