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;
 
 /**