diff --git a/core/api/src/main/java/org/onosproject/net/tunnel/OchSignalType.java b/core/api/src/main/java/org/onosproject/net/OchSignalType.java
similarity index 95%
rename from core/api/src/main/java/org/onosproject/net/tunnel/OchSignalType.java
rename to core/api/src/main/java/org/onosproject/net/OchSignalType.java
index af27e77..d9dd786 100644
--- a/core/api/src/main/java/org/onosproject/net/tunnel/OchSignalType.java
+++ b/core/api/src/main/java/org/onosproject/net/OchSignalType.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.net.tunnel;
+package org.onosproject.net;
 
 /**
  * Represents OCh (Optical Channel) signal type defined in
diff --git a/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java b/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java
index bafd655..33f30ef 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java
@@ -25,7 +25,7 @@
 import org.onlab.packet.MacAddress;
 import org.onlab.packet.MplsLabel;
 import org.onlab.packet.VlanId;
-import org.onosproject.net.tunnel.OchSignalType;
+import org.onosproject.net.OchSignalType;
 
 /**
  * Factory class to create various traffic selection criteria.
diff --git a/core/api/src/main/java/org/onosproject/net/flow/criteria/OchSignalTypeCriterion.java b/core/api/src/main/java/org/onosproject/net/flow/criteria/OchSignalTypeCriterion.java
index 551fe24..94d1f58 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/criteria/OchSignalTypeCriterion.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/criteria/OchSignalTypeCriterion.java
@@ -16,7 +16,7 @@
 package org.onosproject.net.flow.criteria;
 
 import com.google.common.base.MoreObjects;
-import org.onosproject.net.tunnel.OchSignalType;
+import org.onosproject.net.OchSignalType;
 
 import java.util.Objects;
 
diff --git a/core/api/src/test/java/org/onosproject/net/flow/criteria/CriteriaTest.java b/core/api/src/test/java/org/onosproject/net/flow/criteria/CriteriaTest.java
index 0098d9c..a705e12 100644
--- a/core/api/src/test/java/org/onosproject/net/flow/criteria/CriteriaTest.java
+++ b/core/api/src/test/java/org/onosproject/net/flow/criteria/CriteriaTest.java
@@ -27,7 +27,7 @@
 import org.onlab.packet.VlanId;
 
 import com.google.common.testing.EqualsTester;
-import org.onosproject.net.tunnel.OchSignalType;
+import org.onosproject.net.OchSignalType;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;