diff --git a/core/store/dist/src/main/java/org/onosproject/store/app/GossipApplicationStore.java b/core/store/dist/src/main/java/org/onosproject/store/app/GossipApplicationStore.java
index 30a7c31..0a5f8e7 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/app/GossipApplicationStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/app/GossipApplicationStore.java
@@ -18,7 +18,6 @@
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
-
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
@@ -43,10 +42,10 @@
 import org.onosproject.store.cluster.messaging.ClusterMessage;
 import org.onosproject.store.cluster.messaging.ClusterMessageHandler;
 import org.onosproject.store.cluster.messaging.MessageSubject;
-import org.onosproject.store.impl.EventuallyConsistentMap;
-import org.onosproject.store.impl.EventuallyConsistentMapEvent;
-import org.onosproject.store.impl.EventuallyConsistentMapImpl;
-import org.onosproject.store.impl.EventuallyConsistentMapListener;
+import org.onosproject.store.ecmap.EventuallyConsistentMap;
+import org.onosproject.store.ecmap.EventuallyConsistentMapEvent;
+import org.onosproject.store.ecmap.EventuallyConsistentMapImpl;
+import org.onosproject.store.ecmap.EventuallyConsistentMapListener;
 import org.onosproject.store.impl.WallclockClockManager;
 import org.onosproject.store.serializers.KryoNamespaces;
 import org.slf4j.Logger;
@@ -63,9 +62,11 @@
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.onlab.util.Tools.namedThreads;
 import static org.onosproject.app.ApplicationEvent.Type.*;
-import static org.onosproject.store.app.GossipApplicationStore.InternalState.*;
-import static org.onosproject.store.impl.EventuallyConsistentMapEvent.Type.PUT;
-import static org.onosproject.store.impl.EventuallyConsistentMapEvent.Type.REMOVE;
+import static org.onosproject.store.app.GossipApplicationStore.InternalState.ACTIVATED;
+import static org.onosproject.store.app.GossipApplicationStore.InternalState.DEACTIVATED;
+import static org.onosproject.store.app.GossipApplicationStore.InternalState.INSTALLED;
+import static org.onosproject.store.ecmap.EventuallyConsistentMapEvent.Type.PUT;
+import static org.onosproject.store.ecmap.EventuallyConsistentMapEvent.Type.REMOVE;
 import static org.slf4j.LoggerFactory.getLogger;
 
 /**
diff --git a/core/store/dist/src/main/java/org/onosproject/store/impl/AntiEntropyAdvertisement.java b/core/store/dist/src/main/java/org/onosproject/store/ecmap/AntiEntropyAdvertisement.java
similarity index 98%
rename from core/store/dist/src/main/java/org/onosproject/store/impl/AntiEntropyAdvertisement.java
rename to core/store/dist/src/main/java/org/onosproject/store/ecmap/AntiEntropyAdvertisement.java
index abba052..446f96b 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/impl/AntiEntropyAdvertisement.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/ecmap/AntiEntropyAdvertisement.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.ecmap;
 
 import org.onosproject.cluster.NodeId;
 import org.onosproject.store.Timestamp;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/impl/EventuallyConsistentMap.java b/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMap.java
similarity index 94%
rename from core/store/dist/src/main/java/org/onosproject/store/impl/EventuallyConsistentMap.java
rename to core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMap.java
index 7cfcd8f..8cda45d 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/impl/EventuallyConsistentMap.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMap.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.ecmap;
 
 import java.util.Collection;
 import java.util.Map;
@@ -32,7 +32,7 @@
  * API).
  * </p><p>
  * Clients are expected to register an
- * {@link org.onosproject.store.impl.EventuallyConsistentMapListener} if they
+ * {@link EventuallyConsistentMapListener} if they
  * are interested in receiving notifications of update to the map.
  * </p><p>
  * Null values are not allowed in this map.
@@ -85,7 +85,7 @@
      * Note: this differs from the specification of {@link java.util.Map}
      * because it does not return the previous value associated with the key.
      * Clients are expected to register an
-     * {@link org.onosproject.store.impl.EventuallyConsistentMapListener} if
+     * {@link EventuallyConsistentMapListener} if
      * they are interested in receiving notification of updates to the map.
      * </p><p>
      * Null values are not allowed in the map.
@@ -102,7 +102,7 @@
      * Note: this differs from the specification of {@link java.util.Map}
      * because it does not return the previous value associated with the key.
      * Clients are expected to register an
-     * {@link org.onosproject.store.impl.EventuallyConsistentMapListener} if
+     * {@link EventuallyConsistentMapListener} if
      * they are interested in receiving notification of updates to the map.
      * </p>
      *
@@ -122,7 +122,7 @@
      * Note: this differs from the specification of {@link java.util.Map}
      * because it does not return a boolean indication whether a value was removed.
      * Clients are expected to register an
-     * {@link org.onosproject.store.impl.EventuallyConsistentMapListener} if
+     * {@link EventuallyConsistentMapListener} if
      * they are interested in receiving notification of updates to the map.
      * </p>
      *
diff --git a/core/store/dist/src/main/java/org/onosproject/store/impl/EventuallyConsistentMapEvent.java b/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapEvent.java
similarity index 98%
rename from core/store/dist/src/main/java/org/onosproject/store/impl/EventuallyConsistentMapEvent.java
rename to core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapEvent.java
index 0473abf..ee7d42e 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/impl/EventuallyConsistentMapEvent.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapEvent.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.ecmap;
 
 import com.google.common.base.MoreObjects;
 
diff --git a/core/store/dist/src/main/java/org/onosproject/store/impl/EventuallyConsistentMapImpl.java b/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapImpl.java
similarity index 99%
rename from core/store/dist/src/main/java/org/onosproject/store/impl/EventuallyConsistentMapImpl.java
rename to core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapImpl.java
index 66e85bd..b74d3fd 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/impl/EventuallyConsistentMapImpl.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapImpl.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.ecmap;
 
 import org.apache.commons.lang3.RandomUtils;
 import org.apache.commons.lang3.tuple.Pair;
@@ -26,6 +26,9 @@
 import org.onosproject.store.cluster.messaging.ClusterMessage;
 import org.onosproject.store.cluster.messaging.ClusterMessageHandler;
 import org.onosproject.store.cluster.messaging.MessageSubject;
+import org.onosproject.store.impl.ClockService;
+import org.onosproject.store.impl.Timestamped;
+import org.onosproject.store.impl.WallClockTimestamp;
 import org.onosproject.store.serializers.KryoSerializer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/impl/EventuallyConsistentMapListener.java b/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapListener.java
similarity index 95%
rename from core/store/dist/src/main/java/org/onosproject/store/impl/EventuallyConsistentMapListener.java
rename to core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapListener.java
index d77445a..52642a1 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/impl/EventuallyConsistentMapListener.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapListener.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.ecmap;
 
 /**
  * Listener interested in receiving modification events for an
diff --git a/core/store/dist/src/main/java/org/onosproject/store/impl/InternalPutEvent.java b/core/store/dist/src/main/java/org/onosproject/store/ecmap/InternalPutEvent.java
similarity index 97%
rename from core/store/dist/src/main/java/org/onosproject/store/impl/InternalPutEvent.java
rename to core/store/dist/src/main/java/org/onosproject/store/ecmap/InternalPutEvent.java
index 02a93ce..950d320 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/impl/InternalPutEvent.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/ecmap/InternalPutEvent.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.ecmap;
 
 import com.google.common.collect.ImmutableList;
 import org.onosproject.store.Timestamp;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/impl/InternalRemoveEvent.java b/core/store/dist/src/main/java/org/onosproject/store/ecmap/InternalRemoveEvent.java
similarity index 97%
rename from core/store/dist/src/main/java/org/onosproject/store/impl/InternalRemoveEvent.java
rename to core/store/dist/src/main/java/org/onosproject/store/ecmap/InternalRemoveEvent.java
index 720527b..aa9a78e1 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/impl/InternalRemoveEvent.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/ecmap/InternalRemoveEvent.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.ecmap;
 
 import com.google.common.collect.ImmutableList;
 import org.onosproject.store.Timestamp;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/impl/PutEntry.java b/core/store/dist/src/main/java/org/onosproject/store/ecmap/PutEntry.java
similarity index 98%
rename from core/store/dist/src/main/java/org/onosproject/store/impl/PutEntry.java
rename to core/store/dist/src/main/java/org/onosproject/store/ecmap/PutEntry.java
index ae1ddbf..bb86961 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/impl/PutEntry.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/ecmap/PutEntry.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.ecmap;
 
 import com.google.common.base.MoreObjects;
 import org.onosproject.store.Timestamp;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/impl/RemoveEntry.java b/core/store/dist/src/main/java/org/onosproject/store/ecmap/RemoveEntry.java
similarity index 97%
rename from core/store/dist/src/main/java/org/onosproject/store/impl/RemoveEntry.java
rename to core/store/dist/src/main/java/org/onosproject/store/ecmap/RemoveEntry.java
index 716237b..7d34796 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/impl/RemoveEntry.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/ecmap/RemoveEntry.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.ecmap;
 
 import com.google.common.base.MoreObjects;
 import org.onosproject.store.Timestamp;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
index 6ddf58f..cb4e947 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
@@ -32,12 +32,12 @@
 import org.onosproject.net.intent.Key;
 import org.onosproject.store.AbstractStore;
 import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
-import org.onosproject.store.impl.EventuallyConsistentMap;
-import org.onosproject.store.impl.EventuallyConsistentMapEvent;
-import org.onosproject.store.impl.EventuallyConsistentMapImpl;
-import org.onosproject.store.impl.EventuallyConsistentMapListener;
 import org.onosproject.store.impl.MultiValuedTimestamp;
 import org.onosproject.store.impl.SystemClockTimestamp;
+import org.onosproject.store.ecmap.EventuallyConsistentMap;
+import org.onosproject.store.ecmap.EventuallyConsistentMapEvent;
+import org.onosproject.store.ecmap.EventuallyConsistentMapImpl;
+import org.onosproject.store.ecmap.EventuallyConsistentMapListener;
 import org.onosproject.store.serializers.KryoNamespaces;
 import org.slf4j.Logger;