Moved the samples to a separate package.
diff --git a/cli/src/main/java/org/onlab/onos/cli/GreetCommand.java b/cli/src/main/java/org/onlab/onos/cli/GreetCommand.java
index dd8ae81..46d4b2c 100644
--- a/cli/src/main/java/org/onlab/onos/cli/GreetCommand.java
+++ b/cli/src/main/java/org/onlab/onos/cli/GreetCommand.java
@@ -3,7 +3,7 @@
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.console.OsgiCommandSupport;
-import org.onlab.onos.net.GreetService;
+import org.onlab.onos.GreetService;
/**
* Simple command example to demonstrate use of Karaf shell extensions; shows
diff --git a/cli/src/main/java/org/onlab/onos/cli/NameCompleter.java b/cli/src/main/java/org/onlab/onos/cli/NameCompleter.java
index bdf3f72..bcf0707 100644
--- a/cli/src/main/java/org/onlab/onos/cli/NameCompleter.java
+++ b/cli/src/main/java/org/onlab/onos/cli/NameCompleter.java
@@ -2,7 +2,7 @@
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
-import org.onlab.onos.net.GreetService;
+import org.onlab.onos.GreetService;
import java.util.Iterator;
import java.util.List;
diff --git a/net/api/src/main/java/org/onlab/onos/net/GreetService.java b/net/api/src/main/java/org/onlab/onos/GreetService.java
similarity index 93%
rename from net/api/src/main/java/org/onlab/onos/net/GreetService.java
rename to net/api/src/main/java/org/onlab/onos/GreetService.java
index 09f0d96..c196147 100644
--- a/net/api/src/main/java/org/onlab/onos/net/GreetService.java
+++ b/net/api/src/main/java/org/onlab/onos/GreetService.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.net;
+package org.onlab.onos;
/**
* Example of a simple service that provides greetings and it
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;
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>