Moved the samples to a separate package.
diff --git a/web/api/src/main/java/org/onlab/onos/rest/GreetResource.java b/web/api/src/main/java/org/onlab/onos/rest/GreetResource.java
index a379c62..ca099ac 100644
--- a/web/api/src/main/java/org/onlab/onos/rest/GreetResource.java
+++ b/web/api/src/main/java/org/onlab/onos/rest/GreetResource.java
@@ -2,7 +2,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.onlab.onos.net.GreetService;
+import org.onlab.onos.GreetService;
import org.onlab.rest.BaseResource;
import javax.ws.rs.DefaultValue;
diff --git a/web/api/src/test/java/org/onlab/onos/rest/GreetResourceTest.java b/web/api/src/test/java/org/onlab/onos/rest/GreetResourceTest.java
index 24b9925..fcdb606 100644
--- a/web/api/src/test/java/org/onlab/onos/rest/GreetResourceTest.java
+++ b/web/api/src/test/java/org/onlab/onos/rest/GreetResourceTest.java
@@ -4,8 +4,8 @@
import com.sun.jersey.test.framework.JerseyTest;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.onlab.onos.net.GreetService;
-import org.onlab.onos.net.trivial.impl.GreetManager;
+import org.onlab.onos.GreetService;
+import org.onlab.onos.impl.GreetManager;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
diff --git a/web/gui/src/main/java/org/onlab/onos/gui/GreetResource.java b/web/gui/src/main/java/org/onlab/onos/gui/GreetResource.java
index 7e1e7d4..f184efd 100644
--- a/web/gui/src/main/java/org/onlab/onos/gui/GreetResource.java
+++ b/web/gui/src/main/java/org/onlab/onos/gui/GreetResource.java
@@ -1,6 +1,6 @@
package org.onlab.onos.gui;
-import org.onlab.onos.net.GreetService;
+import org.onlab.onos.GreetService;
import org.onlab.rest.BaseResource;
import javax.ws.rs.DefaultValue;
diff --git a/web/pom.xml b/web/pom.xml
index 33dac46..5eb67bb 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -100,9 +100,8 @@
com.sun.jersey.server.impl.container.servlet,
com.fasterxml.jackson.databind,
com.fasterxml.jackson.databind.node,
- org.onlab.osgi.*,
org.onlab.rest.*,
- org.onlab.onos.net.*
+ org.onlab.onos.*
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
</instructions>