diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/key/impl/DeviceKeyManager.java b/core/net/src/main/java/org/onosproject/net/key/impl/DeviceKeyManager.java
similarity index 98%
rename from incubator/net/src/main/java/org/onosproject/incubator/net/key/impl/DeviceKeyManager.java
rename to core/net/src/main/java/org/onosproject/net/key/impl/DeviceKeyManager.java
index 65c3eb9..3bff95f 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/key/impl/DeviceKeyManager.java
+++ b/core/net/src/main/java/org/onosproject/net/key/impl/DeviceKeyManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.incubator.net.key.impl;
+package org.onosproject.net.key.impl;
 
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/key/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/key/impl/package-info.java
similarity index 92%
rename from incubator/net/src/main/java/org/onosproject/incubator/net/key/impl/package-info.java
rename to core/net/src/main/java/org/onosproject/net/key/impl/package-info.java
index 261176c..388a494 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/key/impl/package-info.java
+++ b/core/net/src/main/java/org/onosproject/net/key/impl/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Implementation of device key subsystem.
  */
-package org.onosproject.incubator.net.key.impl;
+package org.onosproject.net.key.impl;
diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/key/impl/DeviceKeyManagerTest.java b/core/net/src/test/java/org/onosproject/net/key/impl/DeviceKeyManagerTest.java
similarity index 98%
rename from incubator/net/src/test/java/org/onosproject/incubator/net/key/impl/DeviceKeyManagerTest.java
rename to core/net/src/test/java/org/onosproject/net/key/impl/DeviceKeyManagerTest.java
index 215030d..2ad5add 100644
--- a/incubator/net/src/test/java/org/onosproject/incubator/net/key/impl/DeviceKeyManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/key/impl/DeviceKeyManagerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.incubator.net.key.impl;
+package org.onosproject.net.key.impl;
 
 import com.google.common.collect.Lists;
 import org.junit.After;
@@ -29,7 +29,7 @@
 import org.onosproject.net.key.DeviceKeyId;
 import org.onosproject.net.key.DeviceKeyListener;
 import org.onosproject.net.key.DeviceKeyService;
-import org.onosproject.incubator.store.key.impl.DistributedDeviceKeyStore;
+import org.onosproject.store.key.impl.DistributedDeviceKeyStore;
 import org.onosproject.net.NetTestTools;
 import org.onosproject.store.service.TestStorageService;
 
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/key/impl/DistributedDeviceKeyStore.java b/core/store/dist/src/main/java/org/onosproject/store/key/impl/DistributedDeviceKeyStore.java
similarity index 98%
rename from incubator/store/src/main/java/org/onosproject/incubator/store/key/impl/DistributedDeviceKeyStore.java
rename to core/store/dist/src/main/java/org/onosproject/store/key/impl/DistributedDeviceKeyStore.java
index 83dc534..003d919 100644
--- a/incubator/store/src/main/java/org/onosproject/incubator/store/key/impl/DistributedDeviceKeyStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/key/impl/DistributedDeviceKeyStore.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.incubator.store.key.impl;
+package org.onosproject.store.key.impl;
 
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/key/impl/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/key/impl/package-info.java
similarity index 93%
rename from incubator/store/src/main/java/org/onosproject/incubator/store/key/impl/package-info.java
rename to core/store/dist/src/main/java/org/onosproject/store/key/impl/package-info.java
index e7ce4ca..550e8ce 100644
--- a/incubator/store/src/main/java/org/onosproject/incubator/store/key/impl/package-info.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/key/impl/package-info.java
@@ -18,4 +18,4 @@
  * A distributed device key store implementation that stores device key
  * data consistently across the cluster.
  */
-package org.onosproject.incubator.store.key.impl;
\ No newline at end of file
+package org.onosproject.store.key.impl;
\ No newline at end of file
diff --git a/incubator/store/src/test/java/org/onosproject/incubator/store/key/impl/DistributedDeviceKeyStoreTest.java b/core/store/dist/src/test/java/org/onosproject/store/key/impl/DistributedDeviceKeyStoreTest.java
similarity index 98%
rename from incubator/store/src/test/java/org/onosproject/incubator/store/key/impl/DistributedDeviceKeyStoreTest.java
rename to core/store/dist/src/test/java/org/onosproject/store/key/impl/DistributedDeviceKeyStoreTest.java
index 2ab2d87..077228a 100644
--- a/incubator/store/src/test/java/org/onosproject/incubator/store/key/impl/DistributedDeviceKeyStoreTest.java
+++ b/core/store/dist/src/test/java/org/onosproject/store/key/impl/DistributedDeviceKeyStoreTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.incubator.store.key.impl;
+package org.onosproject.store.key.impl;
 
 import org.junit.After;
 import org.junit.Before;