diff --git a/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/GreetManager.java b/net/core/trivial/src/main/java/org/onlab/onos/impl/GreetManager.java
similarity index 93%
rename from net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/GreetManager.java
rename to net/core/trivial/src/main/java/org/onlab/onos/impl/GreetManager.java
index 2b01396..4f4ba68 100644
--- a/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/GreetManager.java
+++ b/net/core/trivial/src/main/java/org/onlab/onos/impl/GreetManager.java
@@ -1,11 +1,11 @@
-package org.onlab.onos.net.trivial.impl;
+package org.onlab.onos.impl;
 
 import com.google.common.collect.ImmutableSet;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.net.GreetService;
+import org.onlab.onos.GreetService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SomeOtherComponent.java b/net/core/trivial/src/main/java/org/onlab/onos/impl/SomeOtherComponent.java
similarity index 92%
rename from net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SomeOtherComponent.java
rename to net/core/trivial/src/main/java/org/onlab/onos/impl/SomeOtherComponent.java
index e040643..6cb0bfe 100644
--- a/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SomeOtherComponent.java
+++ b/net/core/trivial/src/main/java/org/onlab/onos/impl/SomeOtherComponent.java
@@ -1,11 +1,11 @@
-package org.onlab.onos.net.trivial.impl;
+package org.onlab.onos.impl;
 
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.onlab.onos.net.GreetService;
+import org.onlab.onos.GreetService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/net/core/trivial/src/test/java/org/onlab/onos/net/trivial/impl/GreetManagerTest.java b/net/core/trivial/src/test/java/org/onlab/onos/impl/GreetManagerTest.java
similarity index 89%
rename from net/core/trivial/src/test/java/org/onlab/onos/net/trivial/impl/GreetManagerTest.java
rename to net/core/trivial/src/test/java/org/onlab/onos/impl/GreetManagerTest.java
index 3bbffde..c498660 100644
--- a/net/core/trivial/src/test/java/org/onlab/onos/net/trivial/impl/GreetManagerTest.java
+++ b/net/core/trivial/src/test/java/org/onlab/onos/impl/GreetManagerTest.java
@@ -1,7 +1,7 @@
-package org.onlab.onos.net.trivial.impl;
+package org.onlab.onos.impl;
 
 import org.junit.Test;
-import org.onlab.onos.net.GreetService;
+import org.onlab.onos.GreetService;
 
 import java.util.Iterator;