diff --git a/core/store/primitives/src/main/java/org/onosproject/store/cluster/impl/AtomixClusterStore.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/cluster/impl/AtomixClusterStore.java
similarity index 98%
rename from core/store/primitives/src/main/java/org/onosproject/store/cluster/impl/AtomixClusterStore.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/cluster/impl/AtomixClusterStore.java
index 0afc462..a1b7f16 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/cluster/impl/AtomixClusterStore.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/cluster/impl/AtomixClusterStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.cluster.impl;
+package org.onosproject.store.atomix.cluster.impl;
 
 import java.time.Instant;
 import java.util.Map;
@@ -43,7 +43,7 @@
 import org.onosproject.core.Version;
 import org.onosproject.core.VersionService;
 import org.onosproject.store.AbstractStore;
-import org.onosproject.store.impl.AtomixManager;
+import org.onosproject.store.atomix.impl.AtomixManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/cluster/impl/package-info.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/cluster/impl/package-info.java
similarity index 92%
rename from core/store/primitives/src/main/java/org/onosproject/store/cluster/impl/package-info.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/cluster/impl/package-info.java
index 23bd9c4..cc8fb9e 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/cluster/impl/package-info.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/cluster/impl/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Implementation classes for cluster stores.
  */
-package org.onosproject.store.cluster.impl;
\ No newline at end of file
+package org.onosproject.store.atomix.cluster.impl;
\ No newline at end of file
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/cluster/messaging/impl/AtomixMessagingManager.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/cluster/messaging/impl/AtomixMessagingManager.java
similarity index 96%
rename from core/store/primitives/src/main/java/org/onosproject/store/cluster/messaging/impl/AtomixMessagingManager.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/cluster/messaging/impl/AtomixMessagingManager.java
index 46b27bf..5a5e9af 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/cluster/messaging/impl/AtomixMessagingManager.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/cluster/messaging/impl/AtomixMessagingManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.cluster.messaging.impl;
+package org.onosproject.store.atomix.cluster.messaging.impl;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
@@ -30,7 +30,7 @@
 import org.onlab.packet.IpAddress;
 import org.onosproject.store.cluster.messaging.Endpoint;
 import org.onosproject.store.cluster.messaging.MessagingService;
-import org.onosproject.store.impl.AtomixManager;
+import org.onosproject.store.atomix.impl.AtomixManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/cluster/messaging/impl/package-info.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/cluster/messaging/impl/package-info.java
similarity index 91%
rename from core/store/primitives/src/main/java/org/onosproject/store/cluster/messaging/impl/package-info.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/cluster/messaging/impl/package-info.java
index b88387a..aeabe16 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/cluster/messaging/impl/package-info.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/cluster/messaging/impl/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Implementation classes for cluster messaging.
  */
-package org.onosproject.store.cluster.messaging.impl;
\ No newline at end of file
+package org.onosproject.store.atomix.cluster.messaging.impl;
\ No newline at end of file
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/impl/AtomixManager.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/impl/AtomixManager.java
similarity index 98%
rename from core/store/primitives/src/main/java/org/onosproject/store/impl/AtomixManager.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/impl/AtomixManager.java
index 43cde78..24b86f5 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/impl/AtomixManager.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/impl/AtomixManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.impl;
+package org.onosproject.store.atomix.impl;
 
 import java.util.stream.Collectors;
 
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/impl/package-info.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/impl/package-info.java
similarity index 94%
rename from core/store/primitives/src/main/java/org/onosproject/store/impl/package-info.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/impl/package-info.java
index 6f34a50..00764a5 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/impl/package-info.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/impl/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Implementation classes for various Distributed primitives.
  */
-package org.onosproject.store.impl;
\ No newline at end of file
+package org.onosproject.store.atomix.impl;
\ No newline at end of file
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AntiEntropyAdvertisement.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AntiEntropyAdvertisement.java
similarity index 94%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AntiEntropyAdvertisement.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AntiEntropyAdvertisement.java
index 0004fe1..2ad85f6 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AntiEntropyAdvertisement.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AntiEntropyAdvertisement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import java.util.Map;
 
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AntiEntropyResponse.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AntiEntropyResponse.java
similarity index 90%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AntiEntropyResponse.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AntiEntropyResponse.java
index 4a06ff0..062d92a 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AntiEntropyResponse.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AntiEntropyResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 /**
  * Status of anti-entropy exchange, returned by the receiver.
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicCounter.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicCounter.java
similarity index 97%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicCounter.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicCounter.java
index ce5c248..4711936 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicCounter.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicCounter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import java.util.concurrent.CompletableFuture;
 
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicCounterBuilder.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicCounterBuilder.java
similarity index 96%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicCounterBuilder.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicCounterBuilder.java
index b18c128..8dbdfb3 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicCounterBuilder.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicCounterBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import io.atomix.core.Atomix;
 import io.atomix.primitive.Recovery;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicCounterMap.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicCounterMap.java
similarity index 97%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicCounterMap.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicCounterMap.java
index fc0aca1..bd15261 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicCounterMap.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicCounterMap.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import java.util.concurrent.CompletableFuture;
 
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicCounterMapBuilder.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicCounterMapBuilder.java
similarity index 97%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicCounterMapBuilder.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicCounterMapBuilder.java
index 03177bf..857153f2 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicCounterMapBuilder.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicCounterMapBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import io.atomix.core.Atomix;
 import io.atomix.primitive.Recovery;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicIdGenerator.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicIdGenerator.java
similarity index 95%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicIdGenerator.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicIdGenerator.java
index 2bafa0b..97d0268 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicIdGenerator.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicIdGenerator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import java.util.concurrent.CompletableFuture;
 
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicIdGeneratorBuilder.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicIdGeneratorBuilder.java
similarity index 96%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicIdGeneratorBuilder.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicIdGeneratorBuilder.java
index 2b7bd85..b004393 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicIdGeneratorBuilder.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicIdGeneratorBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import io.atomix.core.Atomix;
 import io.atomix.primitive.Recovery;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicValue.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicValue.java
similarity index 97%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicValue.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicValue.java
index 977b206..e4ad32f 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicValue.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicValue.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicValueBuilder.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicValueBuilder.java
similarity index 96%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicValueBuilder.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicValueBuilder.java
index 6b2e5df..d940979 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixAtomicValueBuilder.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixAtomicValueBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import io.atomix.core.Atomix;
 import io.atomix.primitive.Recovery;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixConsistentMap.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixConsistentMap.java
similarity index 99%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixConsistentMap.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixConsistentMap.java
index d1a601d..ec93df3 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixConsistentMap.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixConsistentMap.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixConsistentMapBuilder.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixConsistentMapBuilder.java
similarity index 94%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixConsistentMapBuilder.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixConsistentMapBuilder.java
index 0eadcde..8340425 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixConsistentMapBuilder.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixConsistentMapBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import io.atomix.core.Atomix;
 import io.atomix.primitive.Recovery;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixConsistentMultimap.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixConsistentMultimap.java
similarity index 98%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixConsistentMultimap.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixConsistentMultimap.java
index 6627a81..843d1d8 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixConsistentMultimap.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixConsistentMultimap.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixConsistentMultimapBuilder.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixConsistentMultimapBuilder.java
similarity index 97%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixConsistentMultimapBuilder.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixConsistentMultimapBuilder.java
index 88f6bd2..40a8b93 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixConsistentMultimapBuilder.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixConsistentMultimapBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import io.atomix.core.Atomix;
 import io.atomix.primitive.Recovery;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixConsistentTreeMap.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixConsistentTreeMap.java
similarity index 99%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixConsistentTreeMap.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixConsistentTreeMap.java
index a7bedbb..7b70659 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixConsistentTreeMap.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixConsistentTreeMap.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixConsistentTreeMapBuilder.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixConsistentTreeMapBuilder.java
similarity index 97%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixConsistentTreeMapBuilder.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixConsistentTreeMapBuilder.java
index 14178fd..3fd29e6 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixConsistentTreeMapBuilder.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixConsistentTreeMapBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import io.atomix.core.Atomix;
 import io.atomix.primitive.Recovery;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDistributedLock.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDistributedLock.java
similarity index 97%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDistributedLock.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDistributedLock.java
index ef2f502..a4e0f27 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDistributedLock.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDistributedLock.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import java.time.Duration;
 import java.util.Optional;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDistributedLockBuilder.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDistributedLockBuilder.java
similarity index 96%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDistributedLockBuilder.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDistributedLockBuilder.java
index e16a610..797847e 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDistributedLockBuilder.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDistributedLockBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import io.atomix.core.Atomix;
 import io.atomix.primitive.Recovery;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDistributedSet.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDistributedSet.java
similarity index 98%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDistributedSet.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDistributedSet.java
index e1aadb3..5add8b4 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDistributedSet.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDistributedSet.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDistributedSetBuilder.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDistributedSetBuilder.java
similarity index 96%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDistributedSetBuilder.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDistributedSetBuilder.java
index 73c6f9d..cfc8681 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDistributedSetBuilder.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDistributedSetBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import io.atomix.core.Atomix;
 import io.atomix.primitive.Recovery;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDistributedTopic.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDistributedTopic.java
similarity index 95%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDistributedTopic.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDistributedTopic.java
index 01b7da8..29203a2 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDistributedTopic.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDistributedTopic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDistributedTopicBuilder.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDistributedTopicBuilder.java
similarity index 96%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDistributedTopicBuilder.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDistributedTopicBuilder.java
index 34dda44..bb47c39 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDistributedTopicBuilder.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDistributedTopicBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import io.atomix.core.Atomix;
 import io.atomix.primitive.Recovery;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDocumentTree.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDocumentTree.java
similarity index 98%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDocumentTree.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDocumentTree.java
index 4bbc822..1b5974d 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDocumentTree.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDocumentTree.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDocumentTreeBuilder.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDocumentTreeBuilder.java
similarity index 97%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDocumentTreeBuilder.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDocumentTreeBuilder.java
index 91dea85..ee8f30d 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDocumentTreeBuilder.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDocumentTreeBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import io.atomix.core.Atomix;
 import io.atomix.primitive.Recovery;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixIterator.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixIterator.java
similarity index 95%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixIterator.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixIterator.java
index c3288d3..45c9e96 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixIterator.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixIterator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import java.util.concurrent.CompletableFuture;
 
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixLeaderElector.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixLeaderElector.java
similarity index 98%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixLeaderElector.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixLeaderElector.java
index 1098981..a421465 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixLeaderElector.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixLeaderElector.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixLeaderElectorBuilder.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixLeaderElectorBuilder.java
similarity index 97%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixLeaderElectorBuilder.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixLeaderElectorBuilder.java
index feb8127..8fd3927 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixLeaderElectorBuilder.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixLeaderElectorBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import io.atomix.core.Atomix;
 import io.atomix.primitive.Recovery;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixSerializerAdapter.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixSerializerAdapter.java
similarity index 95%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixSerializerAdapter.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixSerializerAdapter.java
index 46ca0b8..78a9b1e 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixSerializerAdapter.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixSerializerAdapter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import org.onosproject.store.service.Serializer;
 
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixTransactionContext.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixTransactionContext.java
similarity index 98%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixTransactionContext.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixTransactionContext.java
index 9260591..6be5be0 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixTransactionContext.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixTransactionContext.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixTransactionContextBuilder.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixTransactionContextBuilder.java
similarity index 96%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixTransactionContextBuilder.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixTransactionContextBuilder.java
index 70ef628..3194a54 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixTransactionContextBuilder.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixTransactionContextBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import io.atomix.core.Atomix;
 import io.atomix.core.transaction.Isolation;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixTransactionalMap.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixTransactionalMap.java
similarity index 96%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixTransactionalMap.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixTransactionalMap.java
index 8577a84..a73a580 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixTransactionalMap.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixTransactionalMap.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import org.onosproject.store.service.TransactionalMap;
 
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixWorkQueue.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixWorkQueue.java
similarity index 97%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixWorkQueue.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixWorkQueue.java
index d3b9907..8382851 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixWorkQueue.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixWorkQueue.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixWorkQueueBuilder.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixWorkQueueBuilder.java
similarity index 96%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixWorkQueueBuilder.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixWorkQueueBuilder.java
index 9c65106..d0e4c8b 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixWorkQueueBuilder.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixWorkQueueBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import io.atomix.core.Atomix;
 import io.atomix.primitive.Recovery;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/CoordinationManager.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/CoordinationManager.java
similarity index 97%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/CoordinationManager.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/CoordinationManager.java
index aa9a78ef..900b678 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/CoordinationManager.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/CoordinationManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import java.util.List;
 import java.util.function.Supplier;
@@ -32,7 +32,7 @@
 import org.onosproject.cluster.NodeId;
 import org.onosproject.persistence.PersistenceService;
 import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
-import org.onosproject.store.impl.AtomixManager;
+import org.onosproject.store.atomix.impl.AtomixManager;
 import org.onosproject.store.service.AsyncConsistentMultimap;
 import org.onosproject.store.service.AsyncConsistentTreeMap;
 import org.onosproject.store.service.AsyncDocumentTree;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/EventuallyConsistentMapBuilderImpl.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/EventuallyConsistentMapBuilderImpl.java
similarity index 98%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/EventuallyConsistentMapBuilderImpl.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/EventuallyConsistentMapBuilderImpl.java
index da00555..0249bec 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/EventuallyConsistentMapBuilderImpl.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/EventuallyConsistentMapBuilderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/EventuallyConsistentMapImpl.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/EventuallyConsistentMapImpl.java
similarity index 99%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/EventuallyConsistentMapImpl.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/EventuallyConsistentMapImpl.java
index 762689c..93e59cd 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/EventuallyConsistentMapImpl.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/EventuallyConsistentMapImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/MapValue.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/MapValue.java
similarity index 98%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/MapValue.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/MapValue.java
index 3175963..f453a6e 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/MapValue.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/MapValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/PartitionManager.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/PartitionManager.java
similarity index 96%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/PartitionManager.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/PartitionManager.java
index f9a8ec0..5deb8d0 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/PartitionManager.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/PartitionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import java.util.List;
 import java.util.Set;
@@ -32,7 +32,7 @@
 import org.onosproject.cluster.NodeId;
 import org.onosproject.cluster.PartitionId;
 import org.onosproject.event.AbstractListenerManager;
-import org.onosproject.store.impl.AtomixManager;
+import org.onosproject.store.atomix.impl.AtomixManager;
 import org.onosproject.store.primitives.DistributedPrimitiveCreator;
 import org.onosproject.store.primitives.PartitionAdminService;
 import org.onosproject.store.primitives.PartitionEvent;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StorageManager.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/StorageManager.java
similarity index 98%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StorageManager.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/StorageManager.java
index dd71e38..a59f4f9 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StorageManager.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/StorageManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import java.util.Collection;
 import java.util.List;
@@ -42,7 +42,7 @@
 import org.onosproject.cluster.NodeId;
 import org.onosproject.persistence.PersistenceService;
 import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
-import org.onosproject.store.impl.AtomixManager;
+import org.onosproject.store.atomix.impl.AtomixManager;
 import org.onosproject.store.primitives.PartitionAdminService;
 import org.onosproject.store.primitives.TransactionId;
 import org.onosproject.store.serializers.KryoNamespaces;
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/UpdateEntry.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/UpdateEntry.java
similarity index 94%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/UpdateEntry.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/UpdateEntry.java
index 680795c..1e2536a 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/UpdateEntry.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/UpdateEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import com.google.common.base.MoreObjects;
 
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/UpdateRequest.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/UpdateRequest.java
similarity index 94%
rename from core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/UpdateRequest.java
rename to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/UpdateRequest.java
index cb3db2f..9f2b459 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/UpdateRequest.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/UpdateRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import java.util.Set;
 
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/impl/package-info.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/package-info.java
similarity index 86%
copy from core/store/primitives/src/main/java/org/onosproject/store/impl/package-info.java
copy to core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/package-info.java
index 6f34a50..f6e0d8d 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/impl/package-info.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/package-info.java
@@ -15,6 +15,6 @@
  */
 
 /**
- * Implementation classes for various Distributed primitives.
+ * Implementation classes for store utilities.
  */
-package org.onosproject.store.impl;
\ No newline at end of file
+package org.onosproject.store.atomix.primitives.impl;
\ No newline at end of file
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/package-info.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/package-info.java
deleted file mode 100644
index e151e54..0000000
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2016-present Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Implementation classes for store utilities.
- */
-package org.onosproject.store.primitives.impl;
\ No newline at end of file
diff --git a/core/store/primitives/src/test/java/org/onosproject/store/primitives/impl/EventuallyConsistentMapImplTest.java b/core/store/primitives/src/test/java/org/onosproject/store/atomix/primitives/impl/EventuallyConsistentMapImplTest.java
similarity index 99%
rename from core/store/primitives/src/test/java/org/onosproject/store/primitives/impl/EventuallyConsistentMapImplTest.java
rename to core/store/primitives/src/test/java/org/onosproject/store/atomix/primitives/impl/EventuallyConsistentMapImplTest.java
index 0997261..b788050 100644
--- a/core/store/primitives/src/test/java/org/onosproject/store/primitives/impl/EventuallyConsistentMapImplTest.java
+++ b/core/store/primitives/src/test/java/org/onosproject/store/atomix/primitives/impl/EventuallyConsistentMapImplTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static junit.framework.TestCase.assertFalse;
diff --git a/core/store/primitives/src/test/java/org/onosproject/store/primitives/impl/MapValueTest.java b/core/store/primitives/src/test/java/org/onosproject/store/atomix/primitives/impl/MapValueTest.java
similarity index 93%
rename from core/store/primitives/src/test/java/org/onosproject/store/primitives/impl/MapValueTest.java
rename to core/store/primitives/src/test/java/org/onosproject/store/atomix/primitives/impl/MapValueTest.java
index cfad4e4..9f1d5cf 100644
--- a/core/store/primitives/src/test/java/org/onosproject/store/primitives/impl/MapValueTest.java
+++ b/core/store/primitives/src/test/java/org/onosproject/store/atomix/primitives/impl/MapValueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2018-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.store.primitives.impl;
+package org.onosproject.store.atomix.primitives.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -23,7 +23,7 @@
 import org.junit.Test;
 import org.onosproject.store.LogicalTimestamp;
 import org.onosproject.store.Timestamp;
-import org.onosproject.store.primitives.impl.MapValue.Digest;
+import org.onosproject.store.atomix.primitives.impl.MapValue.Digest;
 
 /**
  * Unit tests for MapValue.