Renaming all Simple*Manager to just *Manager.
diff --git a/core/trivial/src/main/java/org/onlab/onos/impl/GreetManager.java b/core/trivial/src/main/java/org/onlab/onos/impl/GreetManager.java
deleted file mode 100644
index e5baf0e..0000000
--- a/core/trivial/src/main/java/org/onlab/onos/impl/GreetManager.java
+++ /dev/null
@@ -1,52 +0,0 @@
-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.GreetService;
-import org.slf4j.Logger;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.slf4j.LoggerFactory.getLogger;
-
-/**
- * Trivial implementation of the seed service to demonstrate component and
- * service annotations.
- */
-@Component(immediate = true)
-@Service
-public class GreetManager implements GreetService {
-
- private final Logger log = getLogger(getClass());
-
- private final Set<String> names = new HashSet<>();
-
- @Override
- public synchronized String yo(String name) {
- checkNotNull(name, "Name cannot be null");
- names.add(name);
- log.info("Greeted '{}'", name);
- return "Whazup " + name + "?";
- }
-
- @Override
- public synchronized Iterable<String> names() {
- return ImmutableSet.copyOf(names);
- }
-
- @Activate
- public void activate() {
- log.info("SeedManager started");
- }
-
- @Deactivate
- public void deactivate() {
- log.info("SeedManager stopped");
- }
-
-}
diff --git a/core/trivial/src/main/java/org/onlab/onos/impl/SomeOtherComponent.java b/core/trivial/src/main/java/org/onlab/onos/impl/SomeOtherComponent.java
deleted file mode 100644
index 627573f..0000000
--- a/core/trivial/src/main/java/org/onlab/onos/impl/SomeOtherComponent.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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.GreetService;
-import org.slf4j.Logger;
-
-import static org.slf4j.LoggerFactory.getLogger;
-
-/**
- * Example of a component that does not provide any service, but consumes one.
- */
-@Component(immediate = true)
-public class SomeOtherComponent {
-
- private final Logger log = getLogger(getClass());
-
- @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected GreetService service;
- // protected to allow injection for testing;
- // alternative is to write bindSeedService and unbindSeedService, which is more code
-
- @Activate
- public void activate() {
- log.info("SomeOtherComponent started");
- service.yo("neighbour");
- }
-
- @Deactivate
- public void deactivate() {
- log.info("SomeOtherComponent stopped");
- }
-
-}
diff --git a/core/trivial/src/main/java/org/onlab/onos/impl/package-info.java b/core/trivial/src/main/java/org/onlab/onos/impl/package-info.java
deleted file mode 100644
index a13db9d..0000000
--- a/core/trivial/src/main/java/org/onlab/onos/impl/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Core infrastructure implementations.
- */
-package org.onlab.onos.impl;
diff --git a/core/trivial/src/main/java/org/onlab/onos/net/trivial/device/impl/package-info.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/device/impl/package-info.java
deleted file mode 100644
index bb18f3a..0000000
--- a/core/trivial/src/main/java/org/onlab/onos/net/trivial/device/impl/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Core subsystem for tracking global inventory of infrastructure devices.
- */
-package org.onlab.onos.net.trivial.device.impl;
diff --git a/core/trivial/src/main/java/org/onlab/onos/net/trivial/topology/impl/DefaultTopology.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/DefaultTopology.java
similarity index 99%
rename from core/trivial/src/main/java/org/onlab/onos/net/trivial/topology/impl/DefaultTopology.java
rename to core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/DefaultTopology.java
index 7a56218..e65ad08 100644
--- a/core/trivial/src/main/java/org/onlab/onos/net/trivial/topology/impl/DefaultTopology.java
+++ b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/DefaultTopology.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.net.trivial.topology.impl;
+package org.onlab.onos.net.trivial.impl;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
diff --git a/core/trivial/src/main/java/org/onlab/onos/net/trivial/topology/impl/DefaultTopologyGraph.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/DefaultTopologyGraph.java
similarity index 93%
rename from core/trivial/src/main/java/org/onlab/onos/net/trivial/topology/impl/DefaultTopologyGraph.java
rename to core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/DefaultTopologyGraph.java
index 22681b7..401dfd2 100644
--- a/core/trivial/src/main/java/org/onlab/onos/net/trivial/topology/impl/DefaultTopologyGraph.java
+++ b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/DefaultTopologyGraph.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.net.trivial.topology.impl;
+package org.onlab.onos.net.trivial.impl;
import org.onlab.graph.AdjacencyListsGraph;
import org.onlab.onos.net.topology.TopologyEdge;
diff --git a/core/trivial/src/main/java/org/onlab/onos/net/trivial/topology/impl/PathKey.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/PathKey.java
similarity index 94%
rename from core/trivial/src/main/java/org/onlab/onos/net/trivial/topology/impl/PathKey.java
rename to core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/PathKey.java
index ea993a4..8030823 100644
--- a/core/trivial/src/main/java/org/onlab/onos/net/trivial/topology/impl/PathKey.java
+++ b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/PathKey.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.net.trivial.topology.impl;
+package org.onlab.onos.net.trivial.impl;
import org.onlab.onos.net.DeviceId;
diff --git a/core/trivial/src/main/java/org/onlab/onos/net/trivial/device/impl/SimpleDeviceStore.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceStore.java
similarity index 99%
rename from core/trivial/src/main/java/org/onlab/onos/net/trivial/device/impl/SimpleDeviceStore.java
rename to core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceStore.java
index 30c506ff..5441c6d 100644
--- a/core/trivial/src/main/java/org/onlab/onos/net/trivial/device/impl/SimpleDeviceStore.java
+++ b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceStore.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.net.trivial.device.impl;
+package org.onlab.onos.net.trivial.impl;
import com.google.common.collect.ImmutableList;
import org.apache.felix.scr.annotations.Activate;
diff --git a/core/trivial/src/main/java/org/onlab/onos/net/trivial/flow/impl/SimpleFlowRuleStore.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleFlowRuleStore.java
similarity index 97%
rename from core/trivial/src/main/java/org/onlab/onos/net/trivial/flow/impl/SimpleFlowRuleStore.java
rename to core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleFlowRuleStore.java
index 8ea00e7..286e6e0 100644
--- a/core/trivial/src/main/java/org/onlab/onos/net/trivial/flow/impl/SimpleFlowRuleStore.java
+++ b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleFlowRuleStore.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.net.trivial.flow.impl;
+package org.onlab.onos.net.trivial.impl;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.ImmutableSet;
diff --git a/core/trivial/src/main/java/org/onlab/onos/net/trivial/host/impl/SimpleHostStore.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleHostStore.java
similarity index 98%
rename from core/trivial/src/main/java/org/onlab/onos/net/trivial/host/impl/SimpleHostStore.java
rename to core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleHostStore.java
index d540afb..4a4d6d3 100644
--- a/core/trivial/src/main/java/org/onlab/onos/net/trivial/host/impl/SimpleHostStore.java
+++ b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleHostStore.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.net.trivial.host.impl;
+package org.onlab.onos.net.trivial.impl;
import static org.onlab.onos.net.host.HostEvent.Type.HOST_ADDED;
import static org.onlab.onos.net.host.HostEvent.Type.HOST_MOVED;
diff --git a/core/trivial/src/main/java/org/onlab/onos/net/trivial/link/impl/SimpleLinkStore.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleLinkStore.java
similarity index 98%
rename from core/trivial/src/main/java/org/onlab/onos/net/trivial/link/impl/SimpleLinkStore.java
rename to core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleLinkStore.java
index 935e5dc..3792fd6 100644
--- a/core/trivial/src/main/java/org/onlab/onos/net/trivial/link/impl/SimpleLinkStore.java
+++ b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleLinkStore.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.net.trivial.link.impl;
+package org.onlab.onos.net.trivial.impl;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.ImmutableSet;
diff --git a/core/trivial/src/main/java/org/onlab/onos/net/trivial/topology/impl/SimpleTopologyStore.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleTopologyStore.java
similarity index 98%
rename from core/trivial/src/main/java/org/onlab/onos/net/trivial/topology/impl/SimpleTopologyStore.java
rename to core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleTopologyStore.java
index c837eb7..5d9c8de 100644
--- a/core/trivial/src/main/java/org/onlab/onos/net/trivial/topology/impl/SimpleTopologyStore.java
+++ b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleTopologyStore.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.net.trivial.topology.impl;
+package org.onlab.onos.net.trivial.impl;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
diff --git a/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/package-info.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/package-info.java
new file mode 100644
index 0000000..fcefd6c
--- /dev/null
+++ b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Implementations of in-memory stores suitable for unit testing and
+ * experimentation; not for production use.
+ */
+package org.onlab.onos.net.trivial.impl;
\ No newline at end of file
diff --git a/core/trivial/src/main/java/org/onlab/onos/net/trivial/link/impl/package-info.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/link/impl/package-info.java
deleted file mode 100644
index a3a2031..0000000
--- a/core/trivial/src/main/java/org/onlab/onos/net/trivial/link/impl/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Core subsystem for tracking global inventory of infrastructure links.
- */
-package org.onlab.onos.net.trivial.link.impl;