diff --git a/web/api/src/main/java/org/onosproject/codec/impl/AnnotatedCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/AnnotatedCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/AnnotatedCodec.java
rename to core/common/src/main/java/org/onosproject/codec/impl/AnnotatedCodec.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/AnnotationsCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/AnnotationsCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/AnnotationsCodec.java
rename to core/common/src/main/java/org/onosproject/codec/impl/AnnotationsCodec.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/ApplicationCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/ApplicationCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/ApplicationCodec.java
rename to core/common/src/main/java/org/onosproject/codec/impl/ApplicationCodec.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/CodecManager.java b/core/common/src/main/java/org/onosproject/codec/impl/CodecManager.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/CodecManager.java
rename to core/common/src/main/java/org/onosproject/codec/impl/CodecManager.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/ConnectPointCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/ConnectPointCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/ConnectPointCodec.java
rename to core/common/src/main/java/org/onosproject/codec/impl/ConnectPointCodec.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/ConnectivityIntentCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/ConnectivityIntentCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/ConnectivityIntentCodec.java
rename to core/common/src/main/java/org/onosproject/codec/impl/ConnectivityIntentCodec.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/ConstraintCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/ConstraintCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/ConstraintCodec.java
rename to core/common/src/main/java/org/onosproject/codec/impl/ConstraintCodec.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/CriterionCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/CriterionCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/CriterionCodec.java
rename to core/common/src/main/java/org/onosproject/codec/impl/CriterionCodec.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/DeviceCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/DeviceCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/DeviceCodec.java
rename to core/common/src/main/java/org/onosproject/codec/impl/DeviceCodec.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/EthernetCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/EthernetCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/EthernetCodec.java
rename to core/common/src/main/java/org/onosproject/codec/impl/EthernetCodec.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/FlowEntryCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/FlowEntryCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/FlowEntryCodec.java
rename to core/common/src/main/java/org/onosproject/codec/impl/FlowEntryCodec.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/HostCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/HostCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/HostCodec.java
rename to core/common/src/main/java/org/onosproject/codec/impl/HostCodec.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/HostLocationCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/HostLocationCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/HostLocationCodec.java
rename to core/common/src/main/java/org/onosproject/codec/impl/HostLocationCodec.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/HostToHostIntentCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/HostToHostIntentCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/HostToHostIntentCodec.java
rename to core/common/src/main/java/org/onosproject/codec/impl/HostToHostIntentCodec.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/InstructionCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/InstructionCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/InstructionCodec.java
rename to core/common/src/main/java/org/onosproject/codec/impl/InstructionCodec.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/IntentCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/IntentCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/IntentCodec.java
rename to core/common/src/main/java/org/onosproject/codec/impl/IntentCodec.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/LinkCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/LinkCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/LinkCodec.java
rename to core/common/src/main/java/org/onosproject/codec/impl/LinkCodec.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/PathCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/PathCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/PathCodec.java
rename to core/common/src/main/java/org/onosproject/codec/impl/PathCodec.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/PointToPointIntentCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/PointToPointIntentCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/PointToPointIntentCodec.java
rename to core/common/src/main/java/org/onosproject/codec/impl/PointToPointIntentCodec.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/PortCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/PortCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/PortCodec.java
rename to core/common/src/main/java/org/onosproject/codec/impl/PortCodec.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/TopologyClusterCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/TopologyClusterCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/TopologyClusterCodec.java
rename to core/common/src/main/java/org/onosproject/codec/impl/TopologyClusterCodec.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/TopologyCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/TopologyCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/TopologyCodec.java
rename to core/common/src/main/java/org/onosproject/codec/impl/TopologyCodec.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/TrafficSelectorCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/TrafficSelectorCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/TrafficSelectorCodec.java
rename to core/common/src/main/java/org/onosproject/codec/impl/TrafficSelectorCodec.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/TrafficTreatmentCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/TrafficTreatmentCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/TrafficTreatmentCodec.java
rename to core/common/src/main/java/org/onosproject/codec/impl/TrafficTreatmentCodec.java
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/package-info.java b/core/common/src/main/java/org/onosproject/codec/impl/package-info.java
similarity index 100%
rename from web/api/src/main/java/org/onosproject/codec/impl/package-info.java
rename to core/common/src/main/java/org/onosproject/codec/impl/package-info.java
diff --git a/web/api/src/test/java/org/onosproject/codec/impl/ConnectPointJsonMatcher.java b/core/common/src/test/java/org/onosproject/codec/impl/ConnectPointJsonMatcher.java
similarity index 100%
rename from web/api/src/test/java/org/onosproject/codec/impl/ConnectPointJsonMatcher.java
rename to core/common/src/test/java/org/onosproject/codec/impl/ConnectPointJsonMatcher.java
diff --git a/web/api/src/test/java/org/onosproject/codec/impl/CriterionCodecTest.java b/core/common/src/test/java/org/onosproject/codec/impl/CriterionCodecTest.java
similarity index 100%
rename from web/api/src/test/java/org/onosproject/codec/impl/CriterionCodecTest.java
rename to core/common/src/test/java/org/onosproject/codec/impl/CriterionCodecTest.java
diff --git a/web/api/src/test/java/org/onosproject/codec/impl/CriterionJsonMatcher.java b/core/common/src/test/java/org/onosproject/codec/impl/CriterionJsonMatcher.java
similarity index 100%
rename from web/api/src/test/java/org/onosproject/codec/impl/CriterionJsonMatcher.java
rename to core/common/src/test/java/org/onosproject/codec/impl/CriterionJsonMatcher.java
diff --git a/web/api/src/test/java/org/onosproject/codec/impl/EthernetCodecTest.java b/core/common/src/test/java/org/onosproject/codec/impl/EthernetCodecTest.java
similarity index 100%
rename from web/api/src/test/java/org/onosproject/codec/impl/EthernetCodecTest.java
rename to core/common/src/test/java/org/onosproject/codec/impl/EthernetCodecTest.java
diff --git a/web/api/src/test/java/org/onosproject/codec/impl/EthernetJsonMatcher.java b/core/common/src/test/java/org/onosproject/codec/impl/EthernetJsonMatcher.java
similarity index 100%
rename from web/api/src/test/java/org/onosproject/codec/impl/EthernetJsonMatcher.java
rename to core/common/src/test/java/org/onosproject/codec/impl/EthernetJsonMatcher.java
diff --git a/web/api/src/test/java/org/onosproject/codec/impl/ImmutableCodecsTest.java b/core/common/src/test/java/org/onosproject/codec/impl/ImmutableCodecsTest.java
similarity index 100%
rename from web/api/src/test/java/org/onosproject/codec/impl/ImmutableCodecsTest.java
rename to core/common/src/test/java/org/onosproject/codec/impl/ImmutableCodecsTest.java
diff --git a/web/api/src/test/java/org/onosproject/codec/impl/InstructionCodecTest.java b/core/common/src/test/java/org/onosproject/codec/impl/InstructionCodecTest.java
similarity index 100%
rename from web/api/src/test/java/org/onosproject/codec/impl/InstructionCodecTest.java
rename to core/common/src/test/java/org/onosproject/codec/impl/InstructionCodecTest.java
diff --git a/web/api/src/test/java/org/onosproject/codec/impl/InstructionJsonMatcher.java b/core/common/src/test/java/org/onosproject/codec/impl/InstructionJsonMatcher.java
similarity index 100%
rename from web/api/src/test/java/org/onosproject/codec/impl/InstructionJsonMatcher.java
rename to core/common/src/test/java/org/onosproject/codec/impl/InstructionJsonMatcher.java
diff --git a/web/api/src/test/java/org/onosproject/codec/impl/IntentCodecTest.java b/core/common/src/test/java/org/onosproject/codec/impl/IntentCodecTest.java
similarity index 100%
rename from web/api/src/test/java/org/onosproject/codec/impl/IntentCodecTest.java
rename to core/common/src/test/java/org/onosproject/codec/impl/IntentCodecTest.java
diff --git a/web/api/src/test/java/org/onosproject/codec/impl/IntentJsonMatcher.java b/core/common/src/test/java/org/onosproject/codec/impl/IntentJsonMatcher.java
similarity index 100%
rename from web/api/src/test/java/org/onosproject/codec/impl/IntentJsonMatcher.java
rename to core/common/src/test/java/org/onosproject/codec/impl/IntentJsonMatcher.java
diff --git a/web/api/src/test/java/org/onosproject/codec/impl/MockCodecContext.java b/core/common/src/test/java/org/onosproject/codec/impl/MockCodecContext.java
similarity index 100%
rename from web/api/src/test/java/org/onosproject/codec/impl/MockCodecContext.java
rename to core/common/src/test/java/org/onosproject/codec/impl/MockCodecContext.java
diff --git a/pom.xml b/pom.xml
index 3005cea..35439d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -335,6 +335,13 @@
                 <artifactId>onos-core-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.onosproject</groupId>
+                <artifactId>onos-core-common</artifactId>
+                <version>${project.version}</version>
+                <classifier>tests</classifier>
+                <scope>test</scope>
+            </dependency>
 
             <dependency>
                 <groupId>org.onosproject</groupId>
diff --git a/web/api/pom.xml b/web/api/pom.xml
index d88db12..a97e543 100644
--- a/web/api/pom.xml
+++ b/web/api/pom.xml
@@ -34,8 +34,12 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-core-trivial</artifactId>
-            <version>${project.version}</version>
+            <artifactId>onos-core-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-core-common</artifactId>
+            <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -46,7 +50,6 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-api</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
             <classifier>tests</classifier>
         </dependency>